diff --git a/.gitignore b/.gitignore
index e4ad18d5203458562454f354ba43a78bcf0fc70a..8dc0920da275e8878b73a375aa7c35587d5a9065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,7 @@ src/config/start.tw
# eslint
.eslintrc.js
+.eslintrc.json
node_modules
package-lock.json
package.json
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 30cd54b3c64e85470c0174c02d46f17a907377f8..05d56cfe7004ebbecbc0a58f2b767dea6ccd4d2e 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -9,6 +9,8 @@ Pregmod
-easier to passively gain slaving skill
-added overalls outfit
-UI changes
+ -slave data structural changes
+ -tanning and skin color tweaks
-fixes
-code cleaning
diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index ddf1b25561a2705ef105aa96a5e21e63d645e6e6..441e5eb416c3b1c1ea56acdec8cd068c75e032a9 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -18,7 +18,6 @@ hr {
opacity: 1 !important;
}
-
/* default is 54em */
#passages {
max-width: 100%;
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index e838f56558a9774e4a59bd8a70b09108dcb478ab..fabe9f727c8c985d3639b5176b95d59e88b1715d 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -68,6 +68,20 @@ Do you know you are pregnant (currently unused due to lack of menstrual cycle)
0 - no
1 - yes
+fertKnown:
+
+Menstrual cycle known variable. To be used for fert cycle discover and things like pregnancy without a first period
+
+0 - no
+1 - yes
+
+fertPeak:
+
+Menstrual cycle control variable.
+
+ 0 - Danger week
+1+ - safe week
+
belly:
(uncommon in events)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 366d8c51ed5f264502422aae033d07b20cd1406d..3d7aa55b0e077d5ba2fa79ff22549f56d61c92cc 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1098,21 +1098,24 @@ skin color
accepts string
"pure white"
+"ivory"
+"white"
"extremely pale"
+"very pale"
"pale"
"extremely fair"
"very fair"
"fair"
-"white"
"light"
-"lightened"
"light olive"
+"tan"
"olive"
-"natural"
-"tanned"
-"bronzed"
+"bronze"
"dark olive"
"dark"
+"light beige"
+"beige"
+"dark beige"
"light brown"
"brown"
"dark brown"
@@ -1878,6 +1881,20 @@ readyOva:
Number of ready to be impregnated ova (override normal cases), default - 0. For delayed impregnations with multiples. Used onetime on next call of the SetPregType widget. After SetPregType use it to override .pregType, it set back to 0 automatically.
+fertKnown:
+
+Menstrual cycle known variable. To be used for fert cycle discover and things like pregnancy without a first period
+
+0 - no
+1 - yes
+
+fertPeak:
+
+Menstrual cycle control variable.
+
+ 0 - Danger week
+1+ - safe week
+
ovaImplant:
Ovary implant type.
@@ -2280,7 +2297,10 @@ takes one of the following strings or 0
"Possessive"
"Paternalist"
-vaginalSkill:
+skill:
+
+Encapsulates all the skills
+skill.vaginal:
0-10 - unskilled
11-30 - basic
@@ -2288,7 +2308,7 @@ vaginalSkill:
61-99 - expert
100+ - master
-oralSkill:
+skill.oral:
0-10 - unskilled
11-30 - basic
@@ -2296,7 +2316,7 @@ oralSkill:
61-99 - expert
100+ - master
-analSkill:
+skill.anal:
0-10 - unskilled
11-30 - basic
@@ -2304,7 +2324,7 @@ analSkill:
61-99 - expert
100+ - master
-whoreSkill:
+skillwhore:
0-10 - unskilled
11-30 - basic
@@ -2312,7 +2332,7 @@ whoreSkill:
61-99 - expert
100+ - master
-entertainSkill:
+skill.entertainment:
0-10 - unskilled
11-30 - basic
@@ -2320,11 +2340,103 @@ entertainSkill:
61-99 - expert
100+ - master
-combatSkill:
+skill.combat:
0 - unskilled
1 - skilled
+skill.headGirl:
+
+Her skill as a Head Girl
+accepts int
+default cap is 200
+
+skill.recruiter:
+
+Her skill as a recruiter
+accepts int
+default cap is 200
+
+skill.bodyguard:
+
+Her skill as a bodyguard
+accepts int
+default cap is 200
+
+skill.madam:
+
+Her skill as a brothel madam
+accepts int
+default cap is 200
+
+skillDJ:
+
+Her skill as a DJ
+accepts int
+default cap is 200
+
+skill.nurse:
+
+Her skill as a nurse
+accepts int
+default cap is 200
+
+skill.teacher:
+
+Her skill as a teacher
+accepts int
+default cap is 200
+
+skill.attendant:
+
+Her skill as an attendant
+accepts int
+default cap is 200
+
+skill.matron:
+
+Her skill as a matron
+accepts int
+default cap is 200
+
+skill.stewardess:
+
+Her skill as a stewardess
+accepts int
+default cap is 200
+
+skill.milkmaid:
+
+Her skill as a milk maid
+accepts int
+default cap is 200
+
+skill.farmer:
+
+Her skill as a farmer
+accepts int
+default cap is 200
+
+skill.wardeness:
+Her skill as a wardeness
+accepts int
+default cap is 200
+
+skill.servant:
+Her skill as a servant.
+accepts int
+default cap is 200
+
+skill.entertainer:
+Her skill as an entertainer.
+accepts int
+default cap is 200
+
+skill.whore:
+Her skill as a whore.
+accepts int
+default cap is 200
+
livingRules:
"spare"
@@ -3459,98 +3571,6 @@ Used to tell if the slave is from this game or a previous.
0 - no
1 - yes
-skillHG:
-
-Her skill as a Head Girl
-accepts int
-default cap is 200
-
-skillRC:
-
-Her skill as a recruiter
-accepts int
-default cap is 200
-
-skillBG:
-
-Her skill as a bodyguard
-accepts int
-default cap is 200
-
-skillMD:
-
-Her skill as a brothel madam
-accepts int
-default cap is 200
-
-skillDJ:
-
-Her skill as a DJ
-accepts int
-default cap is 200
-
-skillNU:
-
-Her skill as a nurse
-accepts int
-default cap is 200
-
-skillTE:
-
-Her skill as a teacher
-accepts int
-default cap is 200
-
-skillAT:
-
-Her skill as an attendant
-accepts int
-default cap is 200
-
-skillMT:
-
-Her skill as a matron
-accepts int
-default cap is 200
-
-skillST:
-
-Her skill as a stewardess
-accepts int
-default cap is 200
-
-skillMM:
-
-Her skill as a milk maid
-accepts int
-default cap is 200
-
-skillFA:
-
-Her skill as a farmer
-accepts int
-default cap is 200
-
-skillWA:
-Her skill as a wardeness
-accepts int
-default cap is 200
-
-skillS:
-Her skill as a servant.
-accepts int
-default cap is 200
-
-skillE:
-Her skill as an entertainer.
-accepts int
-default cap is 200
-
-skillW:
-Her skill as a whore.
-accepts int
-default cap is 200
-
tankBaby:
Whether she was put in the incubator at birth
accepts int
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index df87defe51f01341cbeb3d75cc17ceee9c6dde08..e6f679132fcca15f96c063d5ab0ce69a6b7594b3 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -284,7 +284,7 @@
<<set _tacChance -= 0.15>>
<</if>>
/* does she get wounded? */
- <<if $Bodyguard.combatSkill == 1>>
+ <<if $Bodyguard.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
<<if $Bodyguard.amp >= -4>>
@@ -350,10 +350,10 @@
<</if>>
<</if>>
/* 60% chance of getting combat skill if not already have it */
- <<if $Bodyguard.combatSkill == 0 && random(1,100) <= 60>>
+ <<if $Bodyguard.skill.combat == 0 && random(1,100) <= 60>>
<<set $gainedCombat = 1>>
<<set _i = $slaveIndices[$Bodyguard.ID]>>
- <<set $slaves[_i].combatSkill = 1>>
+ <<set $slaves[_i].skill.combat = 1>>
<</if>>
<<elseif $leadingTroops == "headGirl">>
<<if $HeadGirl.devotion < -20>>
@@ -412,7 +412,7 @@
<<set _tacChance -= 0.15>>
<</if>>
/* does she get wounded? */
- <<if $HeadGirl.combatSkill == 1>>
+ <<if $HeadGirl.skill.combat == 1>>
<<set _woundChance -= 3>>
<</if>>
<<if $HeadGirl.amp >= -4>>
@@ -478,10 +478,10 @@
<</if>>
<</if>>
/* 60% chance of getting combat skill if not already have it */
- <<if $HeadGirl.combatSkill == 0 && random(1,100) <= 60>>
+ <<if $HeadGirl.skill.combat == 0 && random(1,100) <= 60>>
<<set $gainedCombat = 1>>
<<set _i = $slaveIndices[$HeadGirl.ID]>>
- <<set $slaves[_i].combatSkill = 1>>
+ <<set $slaves[_i].skill.combat = 1>>
<</if>>
<<elseif $leadingTroops == "citizen">>
<<if $arcologies[0].FSDegradationist == "unset" && $arcologies[0].FSPaternalist == "unset">>
@@ -1247,4 +1247,4 @@
<<goto "attackReport">>
<</if>>
-<</if>> /* closes check for bribery */
\ No newline at end of file
+<</if>> /* closes check for bribery */
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 964ee58c50b476dfbcd4a63a1485e00db5a94f00..8b004584037582cd28314291ec18542eb8433e53 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -615,7 +615,7 @@
<<if $Concubine != 0>>
<<setLocalPronouns $Concubine>>
<<set _woundChance = 0>>
- <<if $Concubine.combatSkill == 1>>
+ <<if $Concubine.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
<<if $Concubine.amp >= -4>>
@@ -678,7 +678,7 @@
<</if>>
<</if>>
<<set _woundChance = 0>>
- <<if $Bodyguard.combatSkill == 1>>
+ <<if $Bodyguard.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
<<if $Bodyguard.amp >= -4>>
@@ -787,7 +787,7 @@
<<if $Concubine != 0>>
<<setLocalPronouns $Concubine>>
<<set _woundChance = 0>>
- <<if $Concubine.combatSkill == 1>>
+ <<if $Concubine.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
<<if $Concubine.amp >= -4>>
@@ -897,7 +897,7 @@
<<if $Concubine != 0>>
<<setLocalPronouns $Concubine>>
<<set _woundChance = 0>>
- <<if $Concubine.combatSkill == 1>>
+ <<if $Concubine.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
<<if $Concubine.amp >= -4>>
@@ -990,4 +990,4 @@
<</if>>
<<set $slaveRebellion = 0>>
<<set $citizenRebellion = 0>>
-<<set $tension = Math.clamp($tension - random(50,100), 0, 100)>>
\ No newline at end of file
+<<set $tension = Math.clamp($tension - random(50,100), 0, 100)>>
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 28b974c136b2ffecb30bf2f58ec279380ed2b2e6..e0ac349cca066a476d43f977ec5ba9963e3912a8 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -278,11 +278,11 @@
<<set $activeSlave.butt = 3>>
<<set $activeSlave.lips = 15>>
<<set $activeSlave.behavioralFlaw = "odd">>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.birthWeek = random(0,50)>>
<<set $activeSlave.voice = 2>>
<<set $activeSlave.weight = -20>>
@@ -422,4 +422,4 @@
<br>
<<include "New Slave Intro">>
<</if>>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 7db09805e1f0d9dd0ce411c32dbae4a9fd7650e1..ed48735bad97416fc1b9e717b0f9cd04fecf638a 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -1,10 +1,8 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
-//V=SugarCube.State.variables, T=SugarCube.State.temporary;
+// V=SugarCube.State.variables, T=SugarCube.State.temporary;
window.Main = function() {
const V = State.variables;
V.SF = {
- Toggle:V.SF.Toggle,Active:-1,Depravity:0, Size:0, Upgrade:0, Gift:0,
+ Toggle:V.SF.Toggle, Active:-1, Depravity:0, Size:0, Upgrade:0, Gift:0,
UC:{Assign:0, Lock:0, num:0}, ROE:"hold", Target:"recruit", Regs:"strict",
Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""
};
@@ -45,32 +43,32 @@ window.SFInit = function() {
window.SFBC = function() {
function jsDel(input) {
while (input.length > 0) {
- delete input[0]; input.splice(input[0],1);
+ delete input[0]; input.splice(input[0], 1);
}
}
const V = State.variables;
function InitClean() {
- jsDel([V.SFMODToggle,V.securityForceActive,V.securityForceCreate,V.securityForceEventSeen]);
+ jsDel([V.SFMODToggle, V.securityForceActive, V.securityForceCreate, V.securityForceEventSeen]);
}
function MainClean() {
- jsDel([V.securityForceActive,V.securityForceRecruit,V.securityForceTrade,V.securityForceBooty,V.securityForceIncome]);
- jsDel([V.securityForceMissionEfficiency,V.securityForceProfitable,V.TierTwoUnlock,V.securityForceDepravity,V.SFAO]);
- jsDel([V.securityForceUpgradeTokenReset,V.securityForceUpgradeToken,V.securityForceGiftToken,V.securityForceRulesOfEngagement]);
- jsDel([V.securityForceFocus,V.securityForceAccountability,V.securityForceName,V.SubsidyActive]);
+ jsDel([V.securityForceActive, V.securityForceRecruit, V.securityForceTrade, V.securityForceBooty, V.securityForceIncome]);
+ jsDel([V.securityForceMissionEfficiency, V.securityForceProfitable, V.TierTwoUnlock, V.securityForceDepravity, V.SFAO]);
+ jsDel([V.securityForceUpgradeTokenReset, V.securityForceUpgradeToken, V.securityForceGiftToken, V.securityForceRulesOfEngagement]);
+ jsDel([V.securityForceFocus, V.securityForceAccountability, V.securityForceName, V.SubsidyActive]);
}
function ColonelClean() {
- jsDel([V.SubsidyActive,V.ColonelCore,V.securityForceColonelToken,V.securityForceColonelSexed,V.ColonelRelationship]);
+ jsDel([V.SubsidyActive, V.ColonelCore, V.securityForceColonelToken, V.securityForceColonelSexed, V.ColonelRelationship]);
}
function TradeShowClean() {
- jsDel([V.OverallTradeShowAttendance,V.CurrentTradeShowAttendance,V.TradeShowIncome,V.TotalTradeShowIncome]);
- jsDel([V.TradeShowHelots,V.TotalTradeShowHelots]);
+ jsDel([V.OverallTradeShowAttendance, V.CurrentTradeShowAttendance, V.TradeShowIncome, V.TotalTradeShowIncome]);
+ jsDel([V.TradeShowHelots, V.TotalTradeShowHelots]);
}
function UnitsClean() {
- jsDel([V.securityForceInfantryPower,V.securityForceArcologyUpgrades,V.securityForceVehiclePower,V.securityForceDronePower]);
- jsDel([V.securityForceStimulantPower,V.securityForceHeavyBattleTank,V.securityForceAircraftPower,V.securityForceSpacePlanePower]);
- jsDel([V.securityForceAC130,V.securityForceSatellitePower,V.securityForceGiantRobot,V.securityForceMissileSilo,V.securityForceAircraftCarrier]);
- jsDel([V.securityForceSubmarine,V.securityForceHeavyAmphibiousTransport,V.securityForcePersonnel]);
+ jsDel([V.securityForceInfantryPower, V.securityForceArcologyUpgrades, V.securityForceVehiclePower, V.securityForceDronePower]);
+ jsDel([V.securityForceStimulantPower, V.securityForceHeavyBattleTank, V.securityForceAircraftPower, V.securityForceSpacePlanePower]);
+ jsDel([V.securityForceAC130, V.securityForceSatellitePower, V.securityForceGiantRobot, V.securityForceMissileSilo, V.securityForceAircraftCarrier]);
+ jsDel([V.securityForceSubmarine, V.securityForceHeavyAmphibiousTransport, V.securityForcePersonnel]);
}
if (V.SF === undefined) {
@@ -165,7 +163,7 @@ window.SFBC = function() {
if (V.SF.UC === undefined) {
if (V.SF.SpecOps !== undefined && V.SF.SpecOpsLock !== undefined) {
V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock};
- jsDel([V.SF.SpecOps,V.SF.SpecOpsLock]);
+ jsDel([V.SF.SpecOps, V.SF.SpecOpsLock]);
} else if (V.SF.UC === {}) {
V.SF.UC = {Assign:0, Lock:0};
}
@@ -191,7 +189,7 @@ window.SFBC = function() {
if (V.SFUnit !== undefined) {
if (V.SFUnit.AT !== undefined) V.SFUnitTA = 0;
V.SF.Squad.Satellite = V.SF.Squad.Sat;
- jsDel([V.SF.Squad.Sat,V.SatLaunched,V.SFUnit.AT]);
+ jsDel([V.SF.Squad.Sat, V.SatLaunched, V.SFUnit.AT]);
V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
if (V.SFTradeShow !== undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
if (V.SFColonel !== undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
@@ -199,7 +197,7 @@ window.SFBC = function() {
if (V.SF.Squad.Satellite !== undefined && V.SatLaunched === undefined) {
V.SF.Squad.Sat = {lv:0, InOrbit:0};
V.SF.Squad.Satellite = V.SF.Squad.Sat;
- jsDel([V.SF.Squad.Sat,V.SatLaunched,V.SFUnit]);
+ jsDel([V.SF.Squad.Sat, V.SatLaunched, V.SFUnit]);
}
}
if (V.SF.Squad !== undefined && V.SF.Squad.Satellite.lv === undefined) {
@@ -216,21 +214,21 @@ window.SFReport = function() {
const target = 50000, baseLine = 5000; let profit = 0, upkeep = 0, income = 0;
let Multiplier = {action:1, troop:1, unit:1, depravity:1};
let FNG = 10, unitCap = 2500, Trade = 0.025;
- let cost = {a:0.01,b:2.5}, NO = 1+(V.SF.Size/5), N1 = 1+(V.SF.Size/5);
+ let cost = {a:0.01, b:2.5}, NO = 1+(V.SF.Size/5), N1 = 1+(V.SF.Size/5);
V.SF.UC.num = 0; Count(); let r = ``, deaths = 0, SFD = V.SF.Depravity;
if (profit < 1) cost.a = 10; cost.b = 0.1; NO = 1; N1 = 0.1;
if (S.Troops > unitCap) S.Troops = unitCap;
if (S.Troops < 100) {
- S.Troops += Math.ceil(jsRandom(2,5));
+ S.Troops += Math.ceil(jsRandom(2, 5));
} else {
if (V.SF.Target === "recruit") {
- S.Troops -= Math.ceil(jsRandom(1*S.Troops/1000,0));
+ S.Troops -= Math.ceil(jsRandom(1*S.Troops/1000, 0));
} else if (V.SF.Target === "raiding") {
- S.Troops -= Math.ceil(jsRandom(1.15*S.Troops/1000,-1.20*S.Troops/1000));
+ S.Troops -= Math.ceil(jsRandom(1.15*S.Troops/1000, -1.20*S.Troops/1000));
} else {
- S.Troops -= Math.ceil(jsRandom(1.10*S.Troops/1000,-1.15*S.Troops/1000));
+ S.Troops -= Math.ceil(jsRandom(1.10*S.Troops/1000, -1.15*S.Troops/1000));
}
}
if (V.SF.UC.Assign > 0) {
@@ -251,62 +249,62 @@ window.SFReport = function() {
}
if (S.Firebase > 0) {
- FNG += S.Firebase; Trade += 0.5*S.Firebase; Multiplier.unit += 7.5*S.Firebase+2*Math.pow(S.Firebase,2)*cost.a; upkeep += (95*10+S.Firebase)*cost.b;
+ FNG += S.Firebase; Trade += 0.5*S.Firebase; Multiplier.unit += 7.5*S.Firebase+2*Math.pow(S.Firebase, 2)*cost.a; upkeep += (95*10+S.Firebase)*cost.b;
}
if (S.Armoury > 0) {
- FNG += 2*S.Armoury; Trade += 0.25*S.Armoury; Multiplier.unit += 7.5*S.Armoury+2*Math.pow(S.Armoury,2)*cost.a; upkeep += (55*S.Armoury)*cost.b;
+ FNG += 2*S.Armoury; Trade += 0.25*S.Armoury; Multiplier.unit += 7.5*S.Armoury+2*Math.pow(S.Armoury, 2)*cost.a; upkeep += (55*S.Armoury)*cost.b;
}
if (S.Drugs > 0) {
- FNG += S.Drugs; Trade += 0.25*S.Drugs; Multiplier.unit += 7.5*S.Drugs+2*Math.pow(S.Drugs,2)*cost.a; upkeep += (35*S.Drugs)*cost.b;
+ FNG += S.Drugs; Trade += 0.25*S.Drugs; Multiplier.unit += 7.5*S.Drugs+2*Math.pow(S.Drugs, 2)*cost.a; upkeep += (35*S.Drugs)*cost.b;
}
if (S.Firebase >= 1) {
if (S.AV > 0) {
- FNG += S.AV; Trade += 0.25*S.AV; Multiplier.unit += 7.5*S.AV+2*Math.pow(S.AV,2)*cost.a; upkeep += (89*S.AV)*cost.b;
+ FNG += S.AV; Trade += 0.25*S.AV; Multiplier.unit += 7.5*S.AV+2*Math.pow(S.AV, 2)*cost.a; upkeep += (89*S.AV)*cost.b;
}
if (S.TV > 0) {
- FNG += S.TV; Trade += 0.25*S.TV; Multiplier.unit += 7.5*S.TV+2*Math.pow(S.TV,2)*cost.a; upkeep += (89*S.TV)*cost.b;
+ FNG += S.TV; Trade += 0.25*S.TV; Multiplier.unit += 7.5*S.TV+2*Math.pow(S.TV, 2)*cost.a; upkeep += (89*S.TV)*cost.b;
}
if (S.PGT > 0) {
- FNG += S.PGT; Trade += 0.25*S.PGT; Multiplier.unit += 15*S.PGT+3*Math.pow(S.PGT,2)*cost.a; upkeep += (100*S.PGT)*cost.b;
+ FNG += S.PGT; Trade += 0.25*S.PGT; Multiplier.unit += 15*S.PGT+3*Math.pow(S.PGT, 2)*cost.a; upkeep += (100*S.PGT)*cost.b;
}
}
if (S.Firebase >= 2 && S.Drones > 0) {
- FNG += S.Drones; Trade += 0.5*S.Drones; Multiplier.unit += 7.5*S.Drones+2*Math.pow(S.Drones,2)*cost.a; upkeep += (50*S.Drones)*cost.b;
+ FNG += S.Drones; Trade += 0.5*S.Drones; Multiplier.unit += 7.5*S.Drones+2*Math.pow(S.Drones, 2)*cost.a; upkeep += (50*S.Drones)*cost.b;
}
if (S.Firebase >= 4) {
if (S.AA > 0) {
- FNG += S.AA; Trade += 0.25*S.AA; Multiplier.unit += 7.5*S.AA+2*Math.pow(S.AA,2)*cost.a; upkeep += (100*S.AA)*cost.b;
+ FNG += S.AA; Trade += 0.25*S.AA; Multiplier.unit += 7.5*S.AA+2*Math.pow(S.AA, 2)*cost.a; upkeep += (100*S.AA)*cost.b;
}
if (S.TA > 0) {
- FNG += S.TA; Trade += 0.25*S.TA; Multiplier.unit += 7.5*S.TA+2*Math.pow(S.TA,2)*cost.a; upkeep += (100*S.TA)*cost.b;
+ FNG += S.TA; Trade += 0.25*S.TA; Multiplier.unit += 7.5*S.TA+2*Math.pow(S.TA, 2)*cost.a; upkeep += (100*S.TA)*cost.b;
}
if (S.SpacePlane > 0) {
- FNG += S.SpacePlane; Trade += 0.25*S.SpacePlane; Multiplier.unit += 7.5*S.SpacePlane+2*Math.pow(S.SpacePlane,2)*cost.a; upkeep += (100*S.SpacePlane)*cost.b;
+ FNG += S.SpacePlane; Trade += 0.25*S.SpacePlane; Multiplier.unit += 7.5*S.SpacePlane+2*Math.pow(S.SpacePlane, 2)*cost.a; upkeep += (100*S.SpacePlane)*cost.b;
}
if (S.GunS > 0) {
- FNG += S.GunS; Trade += 0.25*S.GunS; Multiplier.unit += 12*S.GunS+3*Math.pow(S.GunS,2)*cost.a; upkeep += 70*S.GunS;
+ FNG += S.GunS; Trade += 0.25*S.GunS; Multiplier.unit += 12*S.GunS+3*Math.pow(S.GunS, 2)*cost.a; upkeep += 70*S.GunS;
}
if (S.Satellite.lv > 0 && S.Satellite.InOrbit > 0) {
- FNG += S.Satellite.lv; Trade += 0.25*S.Satellite.lv; Multiplier.unit += 15*S.Satellite.lv+5*Math.pow(S.Satellite.lv,2)*cost.a; upkeep += (85*S.Satellite.lv)*cost.b;
+ FNG += S.Satellite.lv; Trade += 0.25*S.Satellite.lv; Multiplier.unit += 15*S.Satellite.lv+5*Math.pow(S.Satellite.lv, 2)*cost.a; upkeep += (85*S.Satellite.lv)*cost.b;
}
if (S.GiantRobot > 0) {
- FNG += S.GiantRobot; Trade += 0.25*S.GiantRobot; Multiplier.unit += 15*S.GiantRobot+5*Math.pow(S.GiantRobot,2)*cost.a; upkeep += (95*S.GiantRobot)*cost.b;
+ FNG += S.GiantRobot; Trade += 0.25*S.GiantRobot; Multiplier.unit += 15*S.GiantRobot+5*Math.pow(S.GiantRobot, 2)*cost.a; upkeep += (95*S.GiantRobot)*cost.b;
}
if (S.MissileSilo > 0) {
- FNG += S.MissileSilo; Trade += 0.25*S.MissileSilo; Multiplier.unit += 15*S.MissileSilo+5*Math.pow(S.MissileSilo,2)*cost.a; upkeep += (100*S.MissileSilo)*cost.b;
+ FNG += S.MissileSilo; Trade += 0.25*S.MissileSilo; Multiplier.unit += 15*S.MissileSilo+5*Math.pow(S.MissileSilo, 2)*cost.a; upkeep += (100*S.MissileSilo)*cost.b;
}
}
if (S.AircraftCarrier > 0) {
- FNG += S.AircraftCarrier; Trade += 0.25*S.AircraftCarrier; Multiplier.unit += 9*S.AircraftCarrier+3*Math.pow(S.AircraftCarrier,2)*cost.a; upkeep += (80*S.AircraftCarrier)*cost.b;
+ FNG += S.AircraftCarrier; Trade += 0.25*S.AircraftCarrier; Multiplier.unit += 9*S.AircraftCarrier+3*Math.pow(S.AircraftCarrier, 2)*cost.a; upkeep += (80*S.AircraftCarrier)*cost.b;
}
if (S.Sub > 0) {
- FNG += S.Sub; Trade += 0.25*S.Sub; Multiplier.unit += 7.5*S.Sub+2*Math.pow(S.Sub,2)*cost.a; upkeep += (90*S.Sub)*cost.b;
+ FNG += S.Sub; Trade += 0.25*S.Sub; Multiplier.unit += 7.5*S.Sub+2*Math.pow(S.Sub, 2)*cost.a; upkeep += (90*S.Sub)*cost.b;
}
if (S.HAT > 0) {
- FNG += S.HAT; Trade += 0.25*S.HAT; Multiplier.unit += 7.5*S.HAT+2*Math.pow(S.HAT,2)*cost.a; upkeep += (70*S.HAT)*cost.b;
+ FNG += S.HAT; Trade += 0.25*S.HAT; Multiplier.unit += 7.5*S.HAT+2*Math.pow(S.HAT, 2)*cost.a; upkeep += (70*S.HAT)*cost.b;
}
switch (V.SF.Colonel.Core) {
@@ -315,6 +313,8 @@ window.SFReport = function() {
case "brazen": FNG += 15; Multiplier.unit += 0.5; break;
case "jaded": Trade -= 0.05; SFD += 0.05; break;
case "shell shocked": Trade += 0.05; SFD -= 0.05; Multiplier.unit -= 0.5; break;
+ default:
+ break;
}
if (V.SF.Target === "raiding") {
@@ -354,7 +354,7 @@ window.SFReport = function() {
income += ( (baseLine* (1+Multiplier.troop/NO).toFixed(2) * (1+Multiplier.unit/NO).toFixed(2) * (1+Multiplier.action/NO).toFixed(2) * (1+Multiplier.depravity/NO).toFixed(2) ) - (upkeep*N1).toFixed(2) )/( (V.SF.Size/2+S.Troops/2)*5 );
if (V.SF.Target === "raiding") income *= 1.25; else income *= 1.15;
- if (V.economy < 100) if (V.SF.Target === "raiding") income *= 14.25; else income *= 14.15;//Remove line if hard mode ever gets fixed.
+ if (V.economy < 100) if (V.SF.Target === "raiding") income *= 14.25; else income *= 14.15;// Remove line if hard mode ever gets fixed.
S.Troops += FNG; income = Math.ceil(income);
if (V.debugMode > 0) r += `<br>income:${num(income)}, troop:${num((0.09+Multiplier.troop/NO).toFixed(2))}, unit:${num((0.09+Multiplier.unit/NO).toFixed(2))}, action:${num((0.09+Multiplier.action/NO).toFixed(2))}, depravity:${num((0.09+Multiplier.depravity/NO).toFixed(2))}, upkeep:${num((upkeep*N1).toFixed(2))}`;
@@ -369,7 +369,7 @@ window.SFReport = function() {
} else if (S.Drugs >= 10) {
survivalChance += 5;
}
- if (jsRandom(0,100) > survivalChance) deaths = jsRandom(0,((S.Drugs*2)+4));
+ if (jsRandom(0, 100) > survivalChance) deaths = jsRandom(0, ((S.Drugs*2)+4));
if (deaths > 0) S.Troops -= deaths;
}
if (V.SF.UC.Assign === 1 && V.SF.UC.Lock < 1) V.SF.UC.Assign = 0;
@@ -409,22 +409,22 @@ window.SFReport = function() {
r += ` ${V.SF.Caps} managed to recruit ${FNG} new soldiers this week, and your reputation has <span class='green'>increased through the improvement of trade security</span>.`;
r += `<br>//Your instructions to ${SFC()}://`;
- r += `<br> Deployment focus: `; //The below lines are indented to increase readability.
+ r += `<br> Deployment focus: `; // The below lines are indented to increase readability.
r += `<span id="focus"> <<if $SF.Target == "recruit">>''Recruiting and Training''<<elseif $SF.Target == "secure">>''Securing Trade Routes''<<else>>''Raiding and Slaving''<</if>></span>. `;
r += `<<link "Recruit and Train">> <<set $SF.Target="recruit">> <<replace "#focus">>''Recruiting and Training''<</replace>> <</link>> | <<link "Secure Trade Routes">> <<set $SF.Target="secure">> <<replace "#focus">>''Securing Trade Routes''<</replace>> <</link>> | <<link "Raiding and Slaving">> <<set $SF.Target="raiding">> <<replace "#focus">>''Raiding and Slaving''<</replace>> <</link>>`;
- r += `<br> Rules of Engagement: `; //The below lines are indented to increase readability.
+ r += `<br> Rules of Engagement: `; // The below lines are indented to increase readability.
r += `<span id="roe"> <<if $SF.ROE === "hold">>''Hold Fire''<<elseif $SF.ROE === "limited">>''Limited Fire''<<else>>''Free Fire''<</if>></span>. `;
r += `<<link "Hold Fire">> <<set $SF.ROE="hold">> <<replace "#roe">>''Hold Fire''<</replace>> <</link>> | <<link "Limited Fire">> <<set $SF.ROE="limited">> <<replace "#roe">>''Limited Fire''<</replace>> <</link>> | <<link "Free Fire">> <<set $SF.ROE="free">> <<replace "#roe">>''Free Fire''<</replace>> <</link>>`;
- r += `<br> Accountability: `; //The below lines are indented to increase readability.
+ r += `<br> Accountability: `; // The below lines are indented to increase readability.
r += `<span id="accountability"> <<if $SF.Regs === "strict">>''Strict Accountability''<<elseif $SF.Regs === "some">>''Some Accountability''<<else>>''No Accountability''<</if>></span>. `;
r += `<<link "Strict Accountability">> <<set $SF.Regs="strict">> <<replace "#accountability">>''Strict Accountability''<</replace>> <</link>> | <<link "Some Accountability">> <<set $SF.Regs="some">> <<replace "#accountability">>''Some Accountability''<</replace>> <</link>> | <<link "No Accountability">> <<set $SF.Regs="none">> <<replace "#accountability">>''No Accountability''<</replace>> <</link>>`;
if (V.SF.MercCon.CanAttend === 1) {
V.SF.MercCon.Income = 0; V.SF.MercCon.Menials = 0;
let tradeShowAttendes = 200, menialGiftsPerAttendee = 5, NewMercs = 0;
- let menialGifts = Math.ceil(jsRandom(1,((tradeShowAttendes*menialGiftsPerAttendee)/10)));
+ let menialGifts = Math.ceil(jsRandom(1, ((tradeShowAttendes*menialGiftsPerAttendee)/10)));
let TSProfit = Math.ceil(500000*(1+(V.SF.Size/1000))*(1+(V.arcologies[0].prosperity/1000))*T.Env);
V.SF.MercCon.Menials += menialGifts; V.SF.MercCon.TotalMenials += menialGifts;
@@ -434,7 +434,7 @@ window.SFReport = function() {
if (V.secExp > 0 && V.mercenaries > 0) {
V.SF.MercCon.Mercs = 0;
- NewMercs = jsRandom(1,(tradeShowAttendes/10));
+ NewMercs = jsRandom(1, (tradeShowAttendes/10));
V.mercFreeManpower += NewMercs; V.SF.MercCon.TotalMercs += NewMercs;
V.SF.MercCon.Mercs += NewMercs;
r += `<br>''TradeShow'': During a break, The Colonel managed to sell some generic schematics to the ${tradeShowAttendes} attendees, some of whom decided to also give a few menial slaves as a bonus.<br>`;
@@ -471,7 +471,7 @@ window.Count = function() {
T.LBU = T.SatU+T.MSU; T.LB = S.Satellite.lv+S.MissileSilo;
T.Base = S.Firebase+S.Armoury+S.Drugs+S.Drones+T.H;
T.max = T.FU+T.AU+T.DrugsU+T.DU+T.HU;
- //if (V.SF.Facility.Toggle > 0) T.Base + = 1; T.max + = 1;
+ // if (V.SF.Facility.Toggle > 0) T.Base + = 1; T.max + = 1;
if (V.terrain !== "oceanic" || V.terrain === "marine") {
T.LBU += T.GRU; T.LB += S.GiantRobot; T.Base += T.G; T.max += T.GU;
@@ -503,32 +503,32 @@ window.SFNameCapsCheck = function() {
if (V.SF.Lower !== "the special force") V.SF.Caps = V.SF.Lower.replace("the ", "The ");
};
-window.SFUpgradeCost = function(cost,unit) {
- "use strict"; const V = State.variables,T = State.temporary,S = V.SF.Squad; let value = 0;
+window.SFUpgradeCost = function(cost, unit) {
+ "use strict"; const V = State.variables, T = State.temporary, S = V.SF.Squad; let value = 0;
value = cost*T.Env*(1.15+(V.SF.Size/10))*(1.15+(unit/100));
- if ([S.Sub,S.AircraftCarrier,S.MissileSilo,S.GiantRobot,S.Satellite.lv,S.GunS,S.SpacePlane,S.Drones].includes(unit)) value *= V.HackingSkillMultiplier;
+ if ([S.Sub, S.AircraftCarrier, S.MissileSilo, S.GiantRobot, S.Satellite.lv, S.GunS, S.SpacePlane, S.Drones].includes(unit)) value *= V.HackingSkillMultiplier;
return Math.ceil(value);
};
-window.progress = function(x,max) {
+window.progress = function(x, max) {
"use strict"; let out = `â`, z, i;
if (max === undefined) {
- Math.clamp(x,0,10);
+ Math.clamp(x, 0, 10);
if (State.variables.SF.Size < 30) {
z = 5 - x;
- for (i = 0;i<x;i++) out += `â–ˆâ`;
- for (i = 0;i<z;i++) out += `<span style='opacity: 0;'>â–ˆ</span>â`;
- for (i = 0;i<5;i++) out += `â–‘â`;}
+ for (i = 0; i<x; i++) out += `â–ˆâ`;
+ for (i = 0; i<z; i++) out += `<span style='opacity: 0;'>â–ˆ</span>â`;
+ for (i = 0; i<5; i++) out += `â–‘â`;}
else {
z = 10 - x;
- for (i = 0;i<x;i++) out += `â–ˆâ`;
- for (i = 0;i<z;i++) out += `<span style='opacity: 0;'>â–ˆ</span>â`;}}
+ for (i = 0; i<x; i++) out += `â–ˆâ`;
+ for (i = 0; i<z; i++) out += `<span style='opacity: 0;'>â–ˆ</span>â`;}}
else {
- Math.clamp(x,0,max);
+ Math.clamp(x, 0, max);
x = Math.floor(10*x/max);
z = 10 - x;
- for (i = 0;i<x;i++) out += `â–ˆâ`;
- for (i = 0;i<z;i++) out += `<span style='opacity: 0;'>â–ˆ</span>â`;}
+ for (i = 0; i<x; i++) out += `â–ˆâ`;
+ for (i = 0; i<z; i++) out += `<span style='opacity: 0;'>â–ˆ</span>â`;}
return `${out}`;
};
@@ -537,7 +537,7 @@ window.SFC = function() {
if (V.SF.MercCon.CanAttend === -1) {
return `The Colonel`;
} else {
- /*if (V.SF.Facility.LCActive > 0) {
+ /* if (V.SF.Facility.LCActive > 0) {
* return `Lieutenant Colonel ${SlaveFullName(V.SF.Facility.LC)}`;
}*/
return `a designated soldier`;
@@ -586,11 +586,15 @@ window.Interactions = function() {
};
window.BadOutcome = function() {
- "use strict"; const V = State.variables; let r = ``; V.SF.Active = -2;
+ "use strict";
+ const V = State.variables;
+ let r = ``;
+ V.SF.Active = -2;
+
switch(V.SF.Colonel.Core) {
case "Shell-Shocked":
V.SF.BadOutcome = "lockdown"; V.trinkets.push("${t} explosives detonator");
- r += `Unnerved by your ever-increasing influence over your men and undercutting of her authority, The Colonel uses heavy explosives at Midnight to seal off The Firebase from your access. When you step off of your express elevator, you are met not with two guards, but several armed proximity mines next to an incredibly thick wall of smoking rubble. No doubt there are machine gun nests, anti-tank nests, and lots more proximity mines just waiting for you on the other side, should you somehow get through the wall of debris.`;
+ r += `Unnerved by your ever-increasing influence over your men and undercutting of her authority, The Colonel uses heavy explosives at midnight to seal off The Firebase from your access. When you step off of your express elevator, you are met not with two guards, but several armed proximity mines next to an incredibly thick wall of smoking rubble. No doubt there are machine gun nests, anti-tank nests, and lots more proximity mines just waiting for you on the other side, should you somehow get through the wall of debris.`;
r += `<br>The ${V.SF.Lower} still deploys into the old world to plunder as it pleases, but no longer for you. You receive no money from their exploits, and their total defiance and independence of you is a permanent stain on your reputation. Of course, you'll never have the needed military power to dislodge them, especially with all the redundant fortifications, crossfire envelopes, and myriad traps that paranoid bitch had built around each entrance ever since she went rouge. Trying to sabotage certain support beams from above to make the Firebase facility collapse in on itself could easily cause enough damage to topple other parts of the arcology too, and such a thing would be very difficult to cover up. In other words, you're stuck with them. The Firebase has become a permanent tumor on your Arcology and good name.`;
break;
case "Cruel":
@@ -626,12 +630,15 @@ window.BadOutcome = function() {
r += `<br>When you climb the crates to take it and read it, you see The Colonel's handwritten sentiments about the way things turned out; her gratitude for taking her in when you did, her disappointment in your actions, a detailed account of your failings, her regrets that things had to end this way, and finally, her well wishes for your future endeavors.`;
r += `<br>Disgusted, you pocket the gift card and leave your employees and menials to gather up the valuables here before stalking back to your Penthouse. The former Firebase is returned to being a warehouse facility.`;
break;
+ default:
+ break;
}
+ return r;
};
window.UnitText = function(input) {
"use strict"; const V = State.variables, S = V.SF.Squad;
- //Sorted by case
+ // Sorted by case
let appear = `is currently constructed in a haphazard fashion.`;
let barracks = `Soldiers' cots are mixed in with weapons crates and ammunition.`;
let slave = `Cages for processing slaves lie off to one side,`;
@@ -971,8 +978,10 @@ window.UnitText = function(input) {
return `${text17} An air cushion transport vehicle, or hovercraft ${recom2} is parked on the pier of the Naval Yard, ready to ferry ${tons} tons of soldiers and vehicles. ${guns} ${guns2} ${fans} ${turbines} ${speed} ${skirt} ${armor10} ${ramps} ${HATframe} ${loadout}`;
}
break;
+ default:
+ break;
}
- /*if (V.SF.Facility.Toggle > 0 && V.SF.Facility.Active > 0) { r += `<br><br>''${V.SF.Facility.Caps}:''`;
+ /* if (V.SF.Facility.Toggle > 0 && V.SF.Facility.Active > 0) { r += `<br><br>''${V.SF.Facility.Caps}:''`;
if (passage() === "Firebase") {
r += `<br>[[Enter the building|<<= SFReport()>>][]]`;
}
@@ -982,7 +991,7 @@ window.UnitText = function(input) {
}*/
};
-/*window.FSIntegrationMenu = function() {
+/* window.FSIntegrationMenu = function() {
const V = State.variables;
const UpgradeOptions = ['Slaves','FoodsAndMedia','CommonArea','Barracks', 'SlaveProcessingCages','CommandCenter','Armory','DrugLab','Garage','Hangar', 'DroneBay','PersonalItems','VehicleUpgrades','CommonAreaVendors', 'RoleplayingManadated','ColonelCompilance','ColonelGift'];
const FS_OPTIONS = ['Repopulation','Eugenics','Gender radicalism','Gender traditionalism','Paternalism','Degradationism','Body Purism', 'Transformation Fetishism','Youth Preferentialism','Maturity Preferentialism','Slimness Enthusiasm','Asset Expansionism','Slave Pastoralism','Physical Idealism','Hedonistic Decadence','Chattel Religionism','Roman Revivalism','Aztec Revivalism','Egyptian Revivalism','Edo Revivalism','Arabian Revivalism','Chinese Revivalism','Multiculturalism'];
diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index 00a2452f3d741b3f535adaef82b8b7eae56c8824..8d6a4eeb6444b1c6ea3bddcdbac0592f5cc0bdca 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -93,9 +93,9 @@ Despite your direct elevator, interaction with the majority of your security for
<<set $activeSlave.waist = random(-10,50)>>
<</if>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.accent = random(0,1)>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.hLength = 1>>
@@ -169,4 +169,4 @@ Despite your direct elevator, interaction with the majority of your security for
<</replace>>
<</link>> // It will cost @@.red;<<print cashFormat(50000)>>@@ to participate in the trick shot night.//
<</if>>
-</span>
\ No newline at end of file
+</span>
diff --git a/src/art/artJS.js b/src/art/artJS.js
index 830f4cb7811159459d6417c621c4cba68a3c98a8..596837587b905b7fa576dbddd8e21bc9f30522ba 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -272,11 +272,14 @@ window.skinColorCatcher = function (artSlave) {
case "white":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#F4EAF0";
colorSlave.areolaColor = "#FCCCDC";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#F4EAF0";
colorSlave.areolaColor = "#FCCCDC";
colorSlave.labiaColor = "#F977A3";
@@ -304,9 +307,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#F4C9AA";
colorSlave.areolaColor = "#F19795";
colorSlave.labiaColor = "#F977A3";
@@ -317,20 +318,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#C39696";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#E1B585";
colorSlave.areolaColor = "#C39696";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#D58E5F";
colorSlave.areolaColor = "#B17777";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#D58E5F";
colorSlave.areolaColor = "#B17777";
colorSlave.labiaColor = "#F977A3";
@@ -341,11 +341,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#825633";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#784F2F";
colorSlave.areolaColor = "#583E2F";
@@ -386,11 +389,14 @@ window.skinColorCatcher = function (artSlave) {
case "black":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FEE4CA";
colorSlave.areolaColor = "#E0B3A2";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FEE4CA";
colorSlave.areolaColor = "#E0B3A2";
colorSlave.labiaColor = "#F977A3";
@@ -418,9 +424,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#D59D73";
colorSlave.areolaColor = "#8D6859";
colorSlave.labiaColor = "#F977A3";
@@ -431,20 +435,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#7C594B";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#AC7C4A";
colorSlave.areolaColor = "#7C594B";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#985C34";
colorSlave.areolaColor = "#764B3A";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#985C34";
colorSlave.areolaColor = "#764B3A";
colorSlave.labiaColor = "#F977A3";
@@ -455,11 +458,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4B3121";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#5A3C24";
colorSlave.areolaColor = "#493326";
@@ -504,11 +510,14 @@ window.skinColorCatcher = function (artSlave) {
case "latina":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FEDECE";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FEDECE";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
@@ -536,9 +545,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#DAA782";
colorSlave.areolaColor = "#9E7666";
colorSlave.labiaColor = "#F977A3";
@@ -549,20 +556,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#B27554";
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
@@ -573,11 +579,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#775031";
colorSlave.areolaColor = "#69452F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#774A31";
colorSlave.areolaColor = "#614330";
@@ -622,11 +631,14 @@ window.skinColorCatcher = function (artSlave) {
case "asian":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FFF8EE";
colorSlave.areolaColor = "#F7DBD0";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FFF8EE";
colorSlave.areolaColor = "#F7DBD0";
colorSlave.labiaColor = "#F977A3";
@@ -654,9 +666,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
@@ -667,20 +677,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#CFB48D";
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
@@ -691,11 +700,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#855834";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#83522B";
colorSlave.areolaColor = "#68442A";
@@ -736,11 +748,14 @@ window.skinColorCatcher = function (artSlave) {
case "middle eastern":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
@@ -768,9 +783,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
@@ -781,20 +794,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#CC8D53";
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
@@ -805,11 +817,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#684528";
colorSlave.areolaColor = "#563826";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#6E4730";
colorSlave.areolaColor = "#604534";
@@ -850,11 +865,14 @@ window.skinColorCatcher = function (artSlave) {
case "amerindian":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FDE4BF";
colorSlave.areolaColor = "#F0BEAA";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FDE4BF";
colorSlave.areolaColor = "#F0BEAA";
colorSlave.labiaColor = "#F977A3";
@@ -882,9 +900,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
@@ -895,20 +911,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#CFB48D";
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
@@ -919,11 +934,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#855834";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#83522B";
colorSlave.areolaColor = "#68442A";
@@ -964,11 +982,14 @@ window.skinColorCatcher = function (artSlave) {
case "southern european":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#EBDBE4";
colorSlave.areolaColor = "#FFE4E0";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#EBDBE4";
colorSlave.areolaColor = "#FFE4E0";
colorSlave.labiaColor = "#F977A3";
@@ -996,9 +1017,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#F2BC94";
colorSlave.areolaColor = "#EE8280";
colorSlave.labiaColor = "#F977A3";
@@ -1009,20 +1028,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#BF7577";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#DCA972";
colorSlave.areolaColor = "#BF7577";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#D0814C";
colorSlave.areolaColor = "#A96767";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#D0814C";
colorSlave.areolaColor = "#A96767";
colorSlave.labiaColor = "#F977A3";
@@ -1033,11 +1051,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#7F5431";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#784F2F";
colorSlave.areolaColor = "#583E2F";
@@ -1078,11 +1099,14 @@ window.skinColorCatcher = function (artSlave) {
case "semitic":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
@@ -1110,9 +1134,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
@@ -1123,20 +1145,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#CC8D53";
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
@@ -1147,11 +1168,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#684528";
colorSlave.areolaColor = "#563826";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#6E4730";
colorSlave.areolaColor = "#604534";
@@ -1192,11 +1216,14 @@ window.skinColorCatcher = function (artSlave) {
case "malay":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
@@ -1224,9 +1251,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
@@ -1237,20 +1262,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#BA855E";
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
@@ -1261,11 +1285,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#804A28";
colorSlave.areolaColor = "#5F3F27";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#6F4523";
colorSlave.areolaColor = "#623C20";
@@ -1306,11 +1333,14 @@ window.skinColorCatcher = function (artSlave) {
case "indo-aryan":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#F8D4BE";
colorSlave.areolaColor = "#F8B6A4";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#F8D4BE";
colorSlave.areolaColor = "#F8B6A4";
colorSlave.labiaColor = "#F977A3";
@@ -1338,9 +1368,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#E8B68E";
colorSlave.areolaColor = "#D08661";
colorSlave.labiaColor = "#F977A3";
@@ -1351,20 +1379,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#C36E45";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#C36E45";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#A75A34";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#A75A34";
colorSlave.labiaColor = "#F977A3";
@@ -1375,11 +1402,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#8A593C";
colorSlave.areolaColor = "#714931";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#845834";
colorSlave.areolaColor = "#614635";
@@ -1420,11 +1450,14 @@ window.skinColorCatcher = function (artSlave) {
case "pacific islander":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
@@ -1452,9 +1485,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
@@ -1465,20 +1496,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#BA855E";
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
@@ -1489,11 +1519,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#804A28";
colorSlave.areolaColor = "#5F3F27";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#6F4523";
colorSlave.areolaColor = "#623C20";
@@ -1534,11 +1567,14 @@ window.skinColorCatcher = function (artSlave) {
case "mixed race":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FEE5CC";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FEE5CC";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
@@ -1566,9 +1602,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#DAA782";
colorSlave.areolaColor = "#9E7666";
colorSlave.labiaColor = "#F977A3";
@@ -1579,20 +1613,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#B27554";
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
@@ -1603,11 +1636,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#775031";
colorSlave.areolaColor = "#69452F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#774A31";
colorSlave.areolaColor = "#5E4434";
@@ -1652,11 +1688,14 @@ window.skinColorCatcher = function (artSlave) {
default:
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FEE5CC";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FEE5CC";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
@@ -1684,9 +1723,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#DAA782";
colorSlave.areolaColor = "#9E7666";
colorSlave.labiaColor = "#F977A3";
@@ -1697,20 +1734,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#B27554";
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
@@ -1721,11 +1757,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#775031";
colorSlave.areolaColor = "#69452F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#774A31";
colorSlave.areolaColor = "#5E4434";
diff --git a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
index a8a94dc1cb0fa4f3fd650f806f27e6435c2bfc76..501ec523ad7675c4c1b32dc4ea9a4d7f3c6ad7bc 100644
--- a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
@@ -217,40 +217,40 @@
<<print "Slaves physical Age is equal or higher than male Puberty Age, Puberty set to 1 (Post Puberty)" >><br>
<<set $tempSlave.pubertyXY = 1>>
<</if>>
-<<if $tempSlave.oralSkill < 0>>
+<<if $tempSlave.skill.oral < 0>>
<<print "Oral Skill Value set too low, reset to 0">><br>
- <<set $tempSlave.oralSkill = 0>>
-<<elseif $tempSlave.oralSkill > 100>>
+ <<set $tempSlave.skill.oral = 0>>
+<<elseif $tempSlave.skill.oral > 100>>
<<print "Oral Skill Value set too high, reset to 100">><br>
- <<set $tempSlave.oralSkill = 100>>
+ <<set $tempSlave.skill.oral = 100>>
<</if>>
-<<if $tempSlave.vaginalSkill < 0>>
+<<if $tempSlave.skill.vaginal < 0>>
<<print "Vaginal Skill Value too low, reset to 0">><br>
- <<set $tempSlave.vaginalSkill = 0>>
-<<elseif $tempSlave.vaginalSkill > 100>>
+ <<set $tempSlave.skill.vaginal = 0>>
+<<elseif $tempSlave.skill.vaginal > 100>>
<<print "Vaginal Skill Value too high, reset to 100">><br>
- <<set $tempSlave.vaginalSkill = 100>>
+ <<set $tempSlave.skill.vaginal = 100>>
<</if>>
-<<if $tempSlave.analSkill < 0>>
+<<if $tempSlave.skill.anal < 0>>
<<print "Anal Skill Value set too low, reset to 0">><br>
- <<set $tempSlave.analSkill = 0>>
-<<elseif $tempSlave.analSkill > 100>>
+ <<set $tempSlave.skill.anal = 0>>
+<<elseif $tempSlave.skill.anal > 100>>
<<print "Anal Skill Value set too high, reset to 100">><br>
- <<set $tempSlave.analSkill = 100>>
+ <<set $tempSlave.skill.anal = 100>>
<</if>>
-<<if $tempSlave.whoreSkill < 0>>
+<<if $tempSlave.skill.whore < 0>>
<<print "Whoring Skill Value set too low, reset to 0">><br>
- <<set $tempSlave.whoreSkill = 0>>
-<<elseif $tempSlave.whoreSkill > 100>>
+ <<set $tempSlave.skill.whore = 0>>
+<<elseif $tempSlave.skill.whore > 100>>
<<print "Whoring Skill Value set too high, reset to 100">><br>
- <<set $tempSlave.whoreSkill = 100>>
+ <<set $tempSlave.skill.whore = 100>>
<</if>>
-<<if $tempSlave.entertainSkill < 0>>
+<<if $tempSlave.skill.entertainment < 0>>
<<print "Entertainment Skill Value set too low, reset to 0">><br>
- <<set $tempSlave.entertainSkill = 0>>
-<<elseif $tempSlave.entertainSkill > 100>>
+ <<set $tempSlave.skill.entertainment = 0>>
+<<elseif $tempSlave.skill.entertainment > 100>>
<<print "Entertainment Skill Value set too high, reset to 100">><br>
- <<set $tempSlave.entertainSkill = 100>>
+ <<set $tempSlave.skill.entertainment = 100>>
<</if>>
<<if $tempSlave.intelligence < -100>>
<<print "Slave Intelligence Value set too low, reset to -100">><br>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index a9f5198bb62048f536b28c39fca089b9495a6c43..e5639559c9744983e4fcb349f24d8b9540b798df 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -702,21 +702,24 @@
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
<<radiobutton "$tempSlave.skin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.skin" "ivory">> Ivory
+ <<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+ <<radiobutton "$tempSlave.skin" "very pale">> Very Pale
<<radiobutton "$tempSlave.skin" "pale">> Pale
<<radiobutton "$tempSlave.skin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.skin" "very fair">> Very Fair
<<radiobutton "$tempSlave.skin" "fair">> Fair
- <<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "light">> Light
- <<radiobutton "$tempSlave.skin" "lightened">> Lightened
<<radiobutton "$tempSlave.skin" "light olive">> Light Olive
+ <<radiobutton "$tempSlave.skin" "tan">> Tan
<<radiobutton "$tempSlave.skin" "olive">> Olive
- <<radiobutton "$tempSlave.skin" "natural">> Natural
- <<radiobutton "$tempSlave.skin" "tanned">> Tanned
- <<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+ <<radiobutton "$tempSlave.skin" "bronze">> Bronze
<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.skin" "dark">> Dark
+ <<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+ <<radiobutton "$tempSlave.skin" "beige">> Beige
+ <<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.skin" "light brown">> Light Brown
<<radiobutton "$tempSlave.skin" "brown">> Brown
<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
@@ -729,21 +732,24 @@
<<textbox "$tempSlave.origSkin" $tempSlave.origSkin>>
<br>
<<radiobutton "$tempSlave.origSkin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.origSkin" "ivory">> Ivory
+ <<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "extremely pale">> Extremely Pale
+ <<radiobutton "$tempSlave.origSkin" "very pale">> Very Pale
<<radiobutton "$tempSlave.origSkin" "pale">> Pale
<<radiobutton "$tempSlave.origSkin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.origSkin" "very fair">> Very Fair
<<radiobutton "$tempSlave.origSkin" "fair">> Fair
- <<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "light">> Light
- <<radiobutton "$tempSlave.origSkin" "lightened">> Lightened
<<radiobutton "$tempSlave.origSkin" "light olive">> Light Olive
+ <<radiobutton "$tempSlave.origSkin" "tan">> Tan
<<radiobutton "$tempSlave.origSkin" "olive">> Olive
- <<radiobutton "$tempSlave.origSkin" "natural">> Natural
- <<radiobutton "$tempSlave.origSkin" "tanned">> Tanned
- <<radiobutton "$tempSlave.origSkin" "bronzed">> Bronzed
+ <<radiobutton "$tempSlave.origSkin" "bronze">> Bronze
<<radiobutton "$tempSlave.origSkin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.origSkin" "dark">> Dark
+ <<radiobutton "$tempSlave.origSkin" "light beige">> Light Beige
+ <<radiobutton "$tempSlave.origSkin" "beige">> Beige
+ <<radiobutton "$tempSlave.origSkin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.origSkin" "light brown">> Light Brown
<<radiobutton "$tempSlave.origSkin" "brown">> Brown
<<radiobutton "$tempSlave.origSkin" "dark brown">> Dark Brown
@@ -2034,123 +2040,123 @@
<<widget SkillsTab>>
<br>
''Oral sex (0 to 100):''
- <<if $tempSlave.oralSkill <= 10>>
+ <<if $tempSlave.skill.oral <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.oralSkill <= 30>>
+ <<elseif $tempSlave.skill.oral <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.oralSkill <= 60>>
+ <<elseif $tempSlave.skill.oral <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.oralSkill < 100>>
+ <<elseif $tempSlave.skill.oral < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.oralSkill" $tempSlave.oralSkill>>
+ <<textbox "$tempSlave.skill.oral" $tempSlave.skill.oral>>
<br>
- <<radiobutton "$tempSlave.oralSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.oralSkill" 15>> Basic
- <<radiobutton "$tempSlave.oralSkill" 35>> Skilled
- <<radiobutton "$tempSlave.oralSkill" 65>> Expert
- <<radiobutton "$tempSlave.oralSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.oral" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.oral" 15>> Basic
+ <<radiobutton "$tempSlave.skill.oral" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.oral" 65>> Expert
+ <<radiobutton "$tempSlave.skill.oral" 100>> Masterful
<<if $tempSlave.vagina > -1>>
<br>
''Vaginal sex (0 to 100):''
- <<if $tempSlave.vaginalSkill <= 10>>
+ <<if $tempSlave.skill.vaginal <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.vaginalSkill <= 30>>
+ <<elseif $tempSlave.skill.vaginal <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.vaginalSkill <= 60>>
+ <<elseif $tempSlave.skill.vaginal <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.vaginalSkill < 100>>
+ <<elseif $tempSlave.skill.vaginal < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.vaginalSkill" $tempSlave.vaginalSkill>>
+ <<textbox "$tempSlave.skill.vaginal" $tempSlave.skill.vaginal>>
<br>
- <<radiobutton "$tempSlave.vaginalSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.vaginalSkill" 15>> Basic
- <<radiobutton "$tempSlave.vaginalSkill" 35>> Skilled
- <<radiobutton "$tempSlave.vaginalSkill" 65>> Expert
- <<radiobutton "$tempSlave.vaginalSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.vaginal" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.vaginal" 15>> Basic
+ <<radiobutton "$tempSlave.skill.vaginal" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.vaginal" 65>> Expert
+ <<radiobutton "$tempSlave.skill.vaginal" 100>> Masterful
<</if>>
<br>
''Anal sex (0 to 100):''
- <<if $tempSlave.analSkill <= 10>>
+ <<if $tempSlave.skill.anal <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.analSkill <= 30>>
+ <<elseif $tempSlave.skill.anal <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.analSkill <= 60>>
+ <<elseif $tempSlave.skill.anal <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.analSkill < 100>>
+ <<elseif $tempSlave.skill.anal < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.analSkill" $tempSlave.analSkill>>
+ <<textbox "$tempSlave.skill.anal" $tempSlave.skill.anal>>
<br>
- <<radiobutton "$tempSlave.analSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.analSkill" 15>> Basic
- <<radiobutton "$tempSlave.analSkill" 35>> Skilled
- <<radiobutton "$tempSlave.analSkill" 65>> Expert
- <<radiobutton "$tempSlave.analSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.anal" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.anal" 15>> Basic
+ <<radiobutton "$tempSlave.skill.anal" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.anal" 65>> Expert
+ <<radiobutton "$tempSlave.skill.anal" 100>> Masterful
<br>
''Prostitution (0 to 100):''
- <<if $tempSlave.whoreSkill <= 10>>
+ <<if $tempSlave.skill.whore <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.whoreSkill <= 30>>
+ <<elseif $tempSlave.skill.whore <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.whoreSkill <= 60>>
+ <<elseif $tempSlave.skill.whore <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.whoreSkill < 100>>
+ <<elseif $tempSlave.skill.whore < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.whoreSkill" $tempSlave.whoreSkill>>
+ <<textbox "$tempSlave.skill.whore" $tempSlave.skill.whore>>
<br>
- <<radiobutton "$tempSlave.whoreSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.whoreSkill" 15>> Basic
- <<radiobutton "$tempSlave.whoreSkill" 35>> Skilled
- <<radiobutton "$tempSlave.whoreSkill" 65>> Expert
- <<radiobutton "$tempSlave.whoreSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.whore" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.whore" 15>> Basic
+ <<radiobutton "$tempSlave.skill.whore" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.whore" 65>> Expert
+ <<radiobutton "$tempSlave.skill.whore" 100>> Masterful
<br>
''Entertainment (0 to 100):''
- <<if $tempSlave.entertainSkill <= 10>>
+ <<if $tempSlave.skill.entertainment <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.entertainSkill <= 30>>
+ <<elseif $tempSlave.skill.entertainment <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.entertainSkill <= 60>>
+ <<elseif $tempSlave.skill.entertainment <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.entertainSkill < 100>>
+ <<elseif $tempSlave.skill.entertainment < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.entertainSkill" $tempSlave.entertainSkill>>
+ <<textbox "$tempSlave.skill.entertainment" $tempSlave.skill.entertainment>>
<br>
- <<radiobutton "$tempSlave.entertainSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.entertainSkill" 15>> Basic
- <<radiobutton "$tempSlave.entertainSkill" 35>> Skilled
- <<radiobutton "$tempSlave.entertainSkill" 65>> Expert
- <<radiobutton "$tempSlave.entertainSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.entertainment" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.entertainment" 15>> Basic
+ <<radiobutton "$tempSlave.skill.entertainment" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.entertainment" 65>> Expert
+ <<radiobutton "$tempSlave.skill.entertainment" 100>> Masterful
<br>
''Combat (0,1):''
- <<if $tempSlave.combatSkill == 0>>
+ <<if $tempSlave.skill.combat == 0>>
@@.yellow;Unskilled@@.
<<else>>
@@.cyan;Skilled.@@
<</if>>
- <<radiobutton "$tempSlave.combatSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.combatSkill" 1>> Skilled
+ <<radiobutton "$tempSlave.skill.combat" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.combat" 1>> Skilled
<br>
<</widget>>
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 2c9cd76744554d539261e97bdd8ea55c7056a438..4eba97996242a5fe7fbbec99455c1939006964ad 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -137,21 +137,24 @@
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
<<radiobutton "$tempSlave.skin" "pure white">> Pure White
+<<radiobutton "$tempSlave.skin" "ivory">> Ivory
+<<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+<<radiobutton "$tempSlave.skin" "very pale">> Very Pale
<<radiobutton "$tempSlave.skin" "pale">> Pale
<<radiobutton "$tempSlave.skin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.skin" "very fair">> Very Fair
<<radiobutton "$tempSlave.skin" "fair">> Fair
-<<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "light">> Light
-<<radiobutton "$tempSlave.skin" "lightened">> Lightened
<<radiobutton "$tempSlave.skin" "light olive">> Light Olive
+<<radiobutton "$tempSlave.skin" "tan">> Tan
<<radiobutton "$tempSlave.skin" "olive">> Olive
-<<radiobutton "$tempSlave.skin" "natural">> Natural
-<<radiobutton "$tempSlave.skin" "tanned">> Tanned
-<<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+<<radiobutton "$tempSlave.skin" "bronze">> Bronze
<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.skin" "dark">> Dark
+<<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+<<radiobutton "$tempSlave.skin" "beige">> Beige
+<<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.skin" "light brown">> Light Brown
<<radiobutton "$tempSlave.skin" "brown">> Brown
<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
@@ -165,21 +168,24 @@
<<textbox "$tempSlave.origSkin" $tempSlave.origSkin>>
<br>
<<radiobutton "$tempSlave.origSkin" "pure white">> Pure White
+<<radiobutton "$tempSlave.origSkin" "ivory">> Ivory
+<<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "extremely pale">> Extremely Pale
+<<radiobutton "$tempSlave.origSkin" "very pale">> Very Pale
<<radiobutton "$tempSlave.origSkin" "pale">> Pale
<<radiobutton "$tempSlave.origSkin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.origSkin" "very fair">> Very Fair
<<radiobutton "$tempSlave.origSkin" "fair">> Fair
-<<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "light">> Light
-<<radiobutton "$tempSlave.origSkin" "lightened">> Lightened
<<radiobutton "$tempSlave.origSkin" "light olive">> Light Olive
+<<radiobutton "$tempSlave.origSkin" "tan">> Tan
<<radiobutton "$tempSlave.origSkin" "olive">> Olive
-<<radiobutton "$tempSlave.origSkin" "natural">> Natural
-<<radiobutton "$tempSlave.origSkin" "tanned">> Tanned
-<<radiobutton "$tempSlave.origSkin" "bronzed">> Bronzed
+<<radiobutton "$tempSlave.origSkin" "bronze">> Bronze
<<radiobutton "$tempSlave.origSkin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.origSkin" "dark">> Dark
+<<radiobutton "$tempSlave.origSkin" "light beige">> Light Beige
+<<radiobutton "$tempSlave.origSkin" "beige">> Beige
+<<radiobutton "$tempSlave.origSkin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.origSkin" "light brown">> Light Brown
<<radiobutton "$tempSlave.origSkin" "brown">> Brown
<<radiobutton "$tempSlave.origSkin" "dark brown">> Dark Brown
@@ -415,24 +421,24 @@ Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>>
<br>
''Oral sex (0 to 100):''
-<<if $tempSlave.oralSkill <= 10>>
+<<if $tempSlave.skill.oral <= 10>>
Unskilled.
-<<elseif $tempSlave.oralSkill <= 30>>
+<<elseif $tempSlave.skill.oral <= 30>>
@@.cyan;Basic.@@
-<<elseif $tempSlave.oralSkill <= 60>>
+<<elseif $tempSlave.skill.oral <= 60>>
@@.cyan;Skilled.@@
-<<elseif $tempSlave.oralSkill < 100>>
+<<elseif $tempSlave.skill.oral < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
-<<textbox "$tempSlave.oralSkill" $tempSlave.oralSkill>>
+<<textbox "$tempSlave.skill.oral" $tempSlave.skill.oral>>
<br>
-<<radiobutton "$tempSlave.oralSkill" 0>> Unskilled
-<<radiobutton "$tempSlave.oralSkill" 15>> Basic
-<<radiobutton "$tempSlave.oralSkill" 35>> Skilled
-<<radiobutton "$tempSlave.oralSkill" 65>> Expert
-<<radiobutton "$tempSlave.oralSkill" 100>> Masterful
+<<radiobutton "$tempSlave.skill.oral" 0>> Unskilled
+<<radiobutton "$tempSlave.skill.oral" 15>> Basic
+<<radiobutton "$tempSlave.skill.oral" 35>> Skilled
+<<radiobutton "$tempSlave.skill.oral" 65>> Expert
+<<radiobutton "$tempSlave.skill.oral" 100>> Masterful
<br>
@@ -744,24 +750,24 @@ Plush.
<br>
''Anal sex (0 to 100):''
-<<if $tempSlave.analSkill <= 10>>
+<<if $tempSlave.skill.anal <= 10>>
Unskilled.
-<<elseif $tempSlave.analSkill <= 30>>
+<<elseif $tempSlave.skill.anal <= 30>>
@@.cyan;Basic.@@
-<<elseif $tempSlave.analSkill <= 60>>
+<<elseif $tempSlave.skill.anal <= 60>>
@@.cyan;Skilled.@@
-<<elseif $tempSlave.analSkill < 100>>
+<<elseif $tempSlave.skill.anal < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
-<<textbox "$tempSlave.analSkill" $tempSlave.analSkill>>
+<<textbox "$tempSlave.skill.anal" $tempSlave.skill.anal>>
<br>
-<<radiobutton "$tempSlave.analSkill" 0>> Unskilled
-<<radiobutton "$tempSlave.analSkill" 15>> Basic
-<<radiobutton "$tempSlave.analSkill" 35>> Skilled
-<<radiobutton "$tempSlave.analSkill" 65>> Expert
-<<radiobutton "$tempSlave.analSkill" 100>> Masterful
+<<radiobutton "$tempSlave.skill.anal" 0>> Unskilled
+<<radiobutton "$tempSlave.skill.anal" 15>> Basic
+<<radiobutton "$tempSlave.skill.anal" 35>> Skilled
+<<radiobutton "$tempSlave.skill.anal" 65>> Expert
+<<radiobutton "$tempSlave.skill.anal" 100>> Masterful
<br><br>
@@ -814,24 +820,24 @@ Excessive.
<br>
''Vaginal sex (0 to 100):''
-<<if $tempSlave.vaginalSkill <= 10>>
+<<if $tempSlave.skill.vaginal <= 10>>
Unskilled.
-<<elseif $tempSlave.vaginalSkill <= 30>>
+<<elseif $tempSlave.skill.vaginal <= 30>>
@@.cyan;Basic.@@
-<<elseif $tempSlave.vaginalSkill <= 60>>
+<<elseif $tempSlave.skill.vaginal <= 60>>
@@.cyan;Skilled.@@
-<<elseif $tempSlave.vaginalSkill < 100>>
+<<elseif $tempSlave.skill.vaginal < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
-<<textbox "$tempSlave.vaginalSkill" $tempSlave.vaginalSkill>>
+<<textbox "$tempSlave.skill.vaginal" $tempSlave.skill.vaginal>>
<br>
-<<radiobutton "$tempSlave.vaginalSkill" 0>> Unskilled
-<<radiobutton "$tempSlave.vaginalSkill" 15>> Basic
-<<radiobutton "$tempSlave.vaginalSkill" 35>> Skilled
-<<radiobutton "$tempSlave.vaginalSkill" 65>> Expert
-<<radiobutton "$tempSlave.vaginalSkill" 100>> Masterful
+<<radiobutton "$tempSlave.skill.vaginal" 0>> Unskilled
+<<radiobutton "$tempSlave.skill.vaginal" 15>> Basic
+<<radiobutton "$tempSlave.skill.vaginal" 35>> Skilled
+<<radiobutton "$tempSlave.skill.vaginal" 65>> Expert
+<<radiobutton "$tempSlave.skill.vaginal" 100>> Masterful
<br>
@@ -1054,59 +1060,59 @@ Monstrous.
<br><br>
''Prostitution (0 to 100):''
-<<if $tempSlave.whoreSkill <= 10>>
+<<if $tempSlave.skill.whore <= 10>>
Unskilled.
-<<elseif $tempSlave.whoreSkill <= 30>>
+<<elseif $tempSlave.skill.whore <= 30>>
@@.cyan;Basic.@@
-<<elseif $tempSlave.whoreSkill <= 60>>
+<<elseif $tempSlave.skill.whore <= 60>>
@@.cyan;Skilled.@@
-<<elseif $tempSlave.whoreSkill < 100>>
+<<elseif $tempSlave.skill.whore < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
-<<textbox "$tempSlave.whoreSkill" $tempSlave.whoreSkill>>
+<<textbox "$tempSlave.skill.whore" $tempSlave.skill.whore>>
<br>
-<<radiobutton "$tempSlave.whoreSkill" 0>> Unskilled
-<<radiobutton "$tempSlave.whoreSkill" 15>> Basic
-<<radiobutton "$tempSlave.whoreSkill" 35>> Skilled
-<<radiobutton "$tempSlave.whoreSkill" 65>> Expert
-<<radiobutton "$tempSlave.whoreSkill" 100>> Masterful
+<<radiobutton "$tempSlave.skill.whore" 0>> Unskilled
+<<radiobutton "$tempSlave.skill.whore" 15>> Basic
+<<radiobutton "$tempSlave.skill.whore" 35>> Skilled
+<<radiobutton "$tempSlave.skill.whore" 65>> Expert
+<<radiobutton "$tempSlave.skill.whore" 100>> Masterful
<br>
''Entertainment (0 to 100):''
-<<if $tempSlave.entertainSkill <= 10>>
+<<if $tempSlave.skill.entertainment <= 10>>
Unskilled.
-<<elseif $tempSlave.entertainSkill <= 30>>
+<<elseif $tempSlave.skill.entertainment <= 30>>
@@.cyan;Basic.@@
-<<elseif $tempSlave.entertainSkill <= 60>>
+<<elseif $tempSlave.skill.entertainment <= 60>>
@@.cyan;Skilled.@@
-<<elseif $tempSlave.entertainSkill < 100>>
+<<elseif $tempSlave.skill.entertainment < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
-<<textbox "$tempSlave.entertainSkill" $tempSlave.entertainSkill>>
+<<textbox "$tempSlave.skill.entertainment" $tempSlave.skill.entertainment>>
<br>
-<<radiobutton "$tempSlave.entertainSkill" 0>> Unskilled
-<<radiobutton "$tempSlave.entertainSkill" 15>> Basic
-<<radiobutton "$tempSlave.entertainSkill" 35>> Skilled
-<<radiobutton "$tempSlave.entertainSkill" 65>> Expert
-<<radiobutton "$tempSlave.entertainSkill" 100>> Masterful
+<<radiobutton "$tempSlave.skill.entertainment" 0>> Unskilled
+<<radiobutton "$tempSlave.skill.entertainment" 15>> Basic
+<<radiobutton "$tempSlave.skill.entertainment" 35>> Skilled
+<<radiobutton "$tempSlave.skill.entertainment" 65>> Expert
+<<radiobutton "$tempSlave.skill.entertainment" 100>> Masterful
<br>
''Combat (0,1):''
-<<if $tempSlave.combatSkill == 0>>
+<<if $tempSlave.skill.combat == 0>>
Unskilled.
<<else>>
@@.cyan;Skilled.@@
<</if>>
-<<textbox "$tempSlave.combatSkill" $tempSlave.combatSkill>>
+<<textbox "$tempSlave.skill.combat" $tempSlave.skill.combat>>
<br>
-<<radiobutton "$tempSlave.combatSkill" 0>> Unskilled
-<<radiobutton "$tempSlave.combatSkill" 1>> Skilled
+<<radiobutton "$tempSlave.skill.combat" 0>> Unskilled
+<<radiobutton "$tempSlave.skill.combat" 1>> Skilled
<br><br>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 28cfaee1dc2fb4e878171cee093d16d1ac25f78d..fd627ac6ba68694ffb52b8eb68c1e563e57aa6cf 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1286,21 +1286,24 @@
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
<<radiobutton "$tempSlave.skin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.skin" "ivory">> Ivory
+ <<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+ <<radiobutton "$tempSlave.skin" "very pale">> Very Pale
<<radiobutton "$tempSlave.skin" "pale">> Pale
<<radiobutton "$tempSlave.skin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.skin" "very fair">> Very Fair
<<radiobutton "$tempSlave.skin" "fair">> Fair
- <<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "light">> Light
- <<radiobutton "$tempSlave.skin" "lightened">> Lightened
<<radiobutton "$tempSlave.skin" "light olive">> Light Olive
+ <<radiobutton "$tempSlave.skin" "tan">> Tan
<<radiobutton "$tempSlave.skin" "olive">> Olive
- <<radiobutton "$tempSlave.skin" "natural">> Natural
- <<radiobutton "$tempSlave.skin" "tanned">> Tanned
- <<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+ <<radiobutton "$tempSlave.skin" "bronze">> Bronze
<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.skin" "dark">> Dark
+ <<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+ <<radiobutton "$tempSlave.skin" "beige">> Beige
+ <<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.skin" "light brown">> Light Brown
<<radiobutton "$tempSlave.skin" "brown">> Brown
<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
@@ -1313,21 +1316,24 @@
<<textbox "$tempSlave.origSkin" $tempSlave.origSkin>>
<br>
<<radiobutton "$tempSlave.origSkin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.origSkin" "ivory">> Ivory
+ <<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "extremely pale">> Extremely Pale
+ <<radiobutton "$tempSlave.origSkin" "very pale">> Very Pale
<<radiobutton "$tempSlave.origSkin" "pale">> Pale
<<radiobutton "$tempSlave.origSkin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.origSkin" "very fair">> Very Fair
<<radiobutton "$tempSlave.origSkin" "fair">> Fair
- <<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "light">> Light
- <<radiobutton "$tempSlave.origSkin" "lightened">> Lightened
<<radiobutton "$tempSlave.origSkin" "light olive">> Light Olive
+ <<radiobutton "$tempSlave.origSkin" "tan">> Tan
<<radiobutton "$tempSlave.origSkin" "olive">> Olive
- <<radiobutton "$tempSlave.origSkin" "natural">> Natural
- <<radiobutton "$tempSlave.origSkin" "tanned">> Tanned
- <<radiobutton "$tempSlave.origSkin" "bronzed">> Bronzed
+ <<radiobutton "$tempSlave.origSkin" "bronze">> Bronze
<<radiobutton "$tempSlave.origSkin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.origSkin" "dark">> Dark
+ <<radiobutton "$tempSlave.origSkin" "light beige">> Light Beige
+ <<radiobutton "$tempSlave.origSkin" "beige">> Beige
+ <<radiobutton "$tempSlave.origSkin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.origSkin" "light brown">> Light Brown
<<radiobutton "$tempSlave.origSkin" "brown">> Brown
<<radiobutton "$tempSlave.origSkin" "dark brown">> Dark Brown
@@ -1490,7 +1496,7 @@
<<radiobutton "$tempSlave.earT" "neko">> Cat
<<radiobutton "$tempSlave.earT" "inu">> Dog
<<radiobutton "$tempSlave.earT" "kit">> Fox
- <<radiobutton "$tempSlave.earT" "tanuki">> TANUKI
+ <<radiobutton "$tempSlave.earT" "tanuki">> Tanuki
<br><br>
''Sense of Smell:''
@@ -2137,7 +2143,7 @@
<<radiobutton "$tempSlave.tailShape" "inu">> Dog
<<radiobutton "$tempSlave.tailShape" "kit">> Fox
<<radiobutton "$tempSlave.tailShape" "kitsune">> 3 Fox Tails
- <<radiobutton "$tempSlave.tailShape" "tanuki">> TANUKI
+ <<radiobutton "$tempSlave.tailShape" "tanuki">> Tanuki
<<radiobutton "$tempSlave.tailShape" "ushi">> Bovine
<br><br>
@@ -2838,123 +2844,123 @@
<<widget SkillsTab>>
<br>
''Oral sex (0 to 100):''
- <<if $tempSlave.oralSkill <= 10>>
+ <<if $tempSlave.skill.oral <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.oralSkill <= 30>>
+ <<elseif $tempSlave.skill.oral <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.oralSkill <= 60>>
+ <<elseif $tempSlave.skill.oral <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.oralSkill < 100>>
+ <<elseif $tempSlave.skill.oral < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.oralSkill" $tempSlave.oralSkill>>
+ <<textbox "$tempSlave.skill.oral" $tempSlave.skill.oral>>
<br>
- <<radiobutton "$tempSlave.oralSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.oralSkill" 15>> Basic
- <<radiobutton "$tempSlave.oralSkill" 35>> Skilled
- <<radiobutton "$tempSlave.oralSkill" 65>> Expert
- <<radiobutton "$tempSlave.oralSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.oral" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.oral" 15>> Basic
+ <<radiobutton "$tempSlave.skill.oral" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.oral" 65>> Expert
+ <<radiobutton "$tempSlave.skill.oral" 100>> Masterful
<<if $tempSlave.vagina > -1>>
<br>
''Vaginal sex (0 to 100):''
- <<if $tempSlave.vaginalSkill <= 10>>
+ <<if $tempSlave.skill.vaginal <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.vaginalSkill <= 30>>
+ <<elseif $tempSlave.skill.vaginal <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.vaginalSkill <= 60>>
+ <<elseif $tempSlave.skill.vaginal <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.vaginalSkill < 100>>
+ <<elseif $tempSlave.skill.vaginal < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.vaginalSkill" $tempSlave.vaginalSkill>>
+ <<textbox "$tempSlave.skill.vaginal" $tempSlave.skill.vaginal>>
<br>
- <<radiobutton "$tempSlave.vaginalSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.vaginalSkill" 15>> Basic
- <<radiobutton "$tempSlave.vaginalSkill" 35>> Skilled
- <<radiobutton "$tempSlave.vaginalSkill" 65>> Expert
- <<radiobutton "$tempSlave.vaginalSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.vaginal" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.vaginal" 15>> Basic
+ <<radiobutton "$tempSlave.skill.vaginal" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.vaginal" 65>> Expert
+ <<radiobutton "$tempSlave.skill.vaginal" 100>> Masterful
<</if>>
<br>
''Anal sex (0 to 100):''
- <<if $tempSlave.analSkill <= 10>>
+ <<if $tempSlave.skill.anal <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.analSkill <= 30>>
+ <<elseif $tempSlave.skill.anal <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.analSkill <= 60>>
+ <<elseif $tempSlave.skill.anal <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.analSkill < 100>>
+ <<elseif $tempSlave.skill.anal < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.analSkill" $tempSlave.analSkill>>
+ <<textbox "$tempSlave.skill.anal" $tempSlave.skill.anal>>
<br>
- <<radiobutton "$tempSlave.analSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.analSkill" 15>> Basic
- <<radiobutton "$tempSlave.analSkill" 35>> Skilled
- <<radiobutton "$tempSlave.analSkill" 65>> Expert
- <<radiobutton "$tempSlave.analSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.anal" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.anal" 15>> Basic
+ <<radiobutton "$tempSlave.skill.anal" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.anal" 65>> Expert
+ <<radiobutton "$tempSlave.skill.anal" 100>> Masterful
<br>
''Prostitution (0 to 100):''
- <<if $tempSlave.whoreSkill <= 10>>
+ <<if $tempSlave.skill.whore <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.whoreSkill <= 30>>
+ <<elseif $tempSlave.skill.whore <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.whoreSkill <= 60>>
+ <<elseif $tempSlave.skill.whore <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.whoreSkill < 100>>
+ <<elseif $tempSlave.skill.whore < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.whoreSkill" $tempSlave.whoreSkill>>
+ <<textbox "$tempSlave.skill.whore" $tempSlave.skill.whore>>
<br>
- <<radiobutton "$tempSlave.whoreSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.whoreSkill" 15>> Basic
- <<radiobutton "$tempSlave.whoreSkill" 35>> Skilled
- <<radiobutton "$tempSlave.whoreSkill" 65>> Expert
- <<radiobutton "$tempSlave.whoreSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.whore" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.whore" 15>> Basic
+ <<radiobutton "$tempSlave.skill.whore" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.whore" 65>> Expert
+ <<radiobutton "$tempSlave.skill.whore" 100>> Masterful
<br>
''Entertainment (0 to 100):''
- <<if $tempSlave.entertainSkill <= 10>>
+ <<if $tempSlave.skill.entertainment <= 10>>
@@.yellow;Unskilled@@.
- <<elseif $tempSlave.entertainSkill <= 30>>
+ <<elseif $tempSlave.skill.entertainment <= 30>>
@@.cyan;Basic.@@
- <<elseif $tempSlave.entertainSkill <= 60>>
+ <<elseif $tempSlave.skill.entertainment <= 60>>
@@.cyan;Skilled.@@
- <<elseif $tempSlave.entertainSkill < 100>>
+ <<elseif $tempSlave.skill.entertainment < 100>>
@@.cyan;Expert.@@
<<else>>
@@.cyan;Masterful.@@
<</if>>
- <<textbox "$tempSlave.entertainSkill" $tempSlave.entertainSkill>>
+ <<textbox "$tempSlave.skill.entertainment" $tempSlave.skill.entertainment>>
<br>
- <<radiobutton "$tempSlave.entertainSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.entertainSkill" 15>> Basic
- <<radiobutton "$tempSlave.entertainSkill" 35>> Skilled
- <<radiobutton "$tempSlave.entertainSkill" 65>> Expert
- <<radiobutton "$tempSlave.entertainSkill" 100>> Masterful
+ <<radiobutton "$tempSlave.skill.entertainment" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.entertainment" 15>> Basic
+ <<radiobutton "$tempSlave.skill.entertainment" 35>> Skilled
+ <<radiobutton "$tempSlave.skill.entertainment" 65>> Expert
+ <<radiobutton "$tempSlave.skill.entertainment" 100>> Masterful
<br>
''Combat (0,1):''
- <<if $tempSlave.combatSkill == 0>>
+ <<if $tempSlave.skill.combat == 0>>
@@.yellow;Unskilled@@.
<<else>>
@@.cyan;Skilled.@@
<</if>>
- <<radiobutton "$tempSlave.combatSkill" 0>> Unskilled
- <<radiobutton "$tempSlave.combatSkill" 1>> Skilled
+ <<radiobutton "$tempSlave.skill.combat" 0>> Unskilled
+ <<radiobutton "$tempSlave.skill.combat" 1>> Skilled
<br>
<</widget>>
diff --git a/src/endWeek/minorInjuryResponse.js b/src/endWeek/minorInjuryResponse.js
index d955c359411d6e595747c26b2653f32787b30441..23072e1dd9549d5103b6b049aca63e313814e04b 100644
--- a/src/endWeek/minorInjuryResponse.js
+++ b/src/endWeek/minorInjuryResponse.js
@@ -18,10 +18,10 @@ window.minorInjuryResponse = /** @param {App.Entity.SlaveState} slave */ functio
} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
cashX(50, "slaveUpkeep", slave);
- } else if (slave.whoreSkill > jsRandom(1, 100)) {
+ } else if (slave.skill.whore > jsRandom(1, 100)) {
r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
cashX(50, "slaveUpkeep", slave);
- } else if (slave.combatSkill > 0) {
+ } else if (slave.skill.combat > 0) {
r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
cashX(50, "slaveUpkeep", slave);
}
@@ -32,10 +32,10 @@ window.minorInjuryResponse = /** @param {App.Entity.SlaveState} slave */ functio
} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
cashX(10, "slaveUpkeep", slave);
- } else if (slave.whoreSkill > jsRandom(1, 100)) {
+ } else if (slave.skill.whore > jsRandom(1, 100)) {
r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
cashX(10, "slaveUpkeep", slave);
- } else if (slave.combatSkill > 0) {
+ } else if (slave.skill.combat > 0) {
r += ` ${slave.slaveName} can take care of ${himself}, and $he successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
cashX(10, "slaveUpkeep", slave);
}
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 74fb208236a74ad06557123e7b6f06256b3d86de..6fe6c24df528e8856544255ab22b81883517ecdc 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -77,10 +77,10 @@ window.saServant = /** @param {App.Entity.SlaveState} slave */ function saServan
if (setup.servantCareers.includes(slave.career)) {
t += ` ${He} has experience with house keeping from ${his} life before ${he} was a slave, making ${him} more effective.`;
- } else if (slave.skillS >= V.masteredXP) {
+ } else if (slave.skill.servant >= V.masteredXP) {
t += ` ${He} has experience with house keeping from working for you, making ${him} more effective.`;
} else {
- slave.skillS += jsRandom(1, Math.ceil((slave.intelligence+slave.intelligenceImplant)/15) + 8);
+ slave.skill.servant += jsRandom(1, Math.ceil((slave.intelligence+slave.intelligenceImplant)/15) + 8);
}
if (slave.fetishStrength > 60) {
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 377e444007fa07d6ee571abcb8a10821691aefd3..62706720becfef45f7876862a02ae952a430c937 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -458,33 +458,33 @@ window.saServeThePublic = (function saServeThePublic() {
slave.health -= 7;
injury = 1;
} else if (slave.vagina < 0) {
- if ((slave.analSkill + slave.oralSkill) >= 200) {
+ if ((slave.skill.anal + slave.skill.oral) >= 200) {
r += ` ${He}'s such an expert public servant that ${he} copes with the stress of being a ${SlaveTitle(slave)} slut.`;
- } else if (jsRandom(1, 100) > (40 + (10 * (slave.analSkill + slave.oralSkill)))) {
+ } else if (jsRandom(1, 100) > (40 + (10 * (slave.skill.anal + slave.skill.oral)))) {
r += ` The stress of being a ${SlaveTitle(slave)} slut is <span class="red">hard on ${him}.</span>`;
slave.health -= 7;
injury = 1;
}
} else if (slave.vagina > 0 && !canDoVaginal(slave)) {
if (canDoAnal(slave)) {
- if ((slave.analSkill + slave.oralSkill) >= 200) {
+ if ((slave.skill.anal + slave.skill.oral) >= 200) {
r += ` ${He}'s such an expert slut that ${he} copes with the stress of being limited to buttsex and oral.`;
- } else if (jsRandom(1, 100) > (40 + (10 * (slave.analSkill + slave.oralSkill)))) {
+ } else if (jsRandom(1, 100) > (40 + (10 * (slave.skill.anal + slave.skill.oral)))) {
r += ` The stress of being limited to buttsex and oral is <span class="red">hard on ${him}.</span>`;
slave.health -= 7;
injury = 1;
}
} else {
- if (slave.oralSkill >= 100) {
+ if (slave.skill.oral >= 100) {
r += ` ${He}'s such an expert slut that ${he} copes with the stress of being limited to oral.`;
- } else if (jsRandom(1, 100) > (40 + (10 * slave.oralSkill))) {
+ } else if (jsRandom(1, 100) > (40 + (10 * slave.skill.oral))) {
r += ` The stress of being limited to oral sex is <span class="red">hard on ${him}.</span>`;
slave.health -= 7;
injury = 1;
}
}
- } else if ((slave.analSkill + slave.oralSkill + slave.vaginalSkill) < 300) {
- if (jsRandom(1, 100) > (10 + ((slave.analSkill + slave.oralSkill + slave.vaginalSkill) / 10))) {
+ } else if ((slave.skill.anal + slave.skill.oral + slave.skill.vaginal) < 300) {
+ if (jsRandom(1, 100) > (10 + ((slave.skill.anal + slave.skill.oral + slave.skill.vaginal) / 10))) {
injury = 1;
}
}
@@ -536,7 +536,7 @@ window.saServeThePublic = (function saServeThePublic() {
slave.vagina = 1;
}
} else if (slave.vagina < 3) {
- if (jsRandom(1, 100) > ((170 - beauty) + (slave.vagina * 10) + (slave.vaginalSkill / 3))) {
+ if (jsRandom(1, 100) > ((170 - beauty) + (slave.vagina * 10) + (slave.skill.vaginal / 3))) {
r += ` <span class="lime">${His} pussy gets loosened by the intense use.</span>`;
slave.vagina += 1;
}
@@ -561,17 +561,17 @@ window.saServeThePublic = (function saServeThePublic() {
}
} else if (slave.anus < 3) {
if (slave.vagina < 0) {
- if (jsRandom(1, 100) > ((150 - beauty) + (slave.anus * 10) + (slave.analSkill / 6))) {
+ if (jsRandom(1, 100) > ((150 - beauty) + (slave.anus * 10) + (slave.skill.anal / 6))) {
r += ` <span class="lime">${His} asshole sees constant use in place of a pussy and loosens.</span>`;
slave.anus += 1;
}
} else if (!canDoVaginal(slave)) {
- if (jsRandom(1, 100) > ((150 - beauty) + (slave.anus * 10) + (slave.analSkill / 6))) {
+ if (jsRandom(1, 100) > ((150 - beauty) + (slave.anus * 10) + (slave.skill.anal / 6))) {
r += ` <span class="lime">${His} asshole sees constant use in place of ${his} protected pussy and loosens.</span>`;
slave.anus += 1;
}
} else {
- if (jsRandom(1, 100) > ((160 - beauty) + (slave.anus * 10) + (slave.analSkill / 6))) {
+ if (jsRandom(1, 100) > ((160 - beauty) + (slave.anus * 10) + (slave.skill.anal / 6))) {
r += ` <span class="lime">${His} asshole loosens with constant use.</span>`;
slave.anus += 1;
}
@@ -583,23 +583,23 @@ window.saServeThePublic = (function saServeThePublic() {
/** @param {App.Entity.SlaveState} slave */
function slaveSkills(slave) {
let skillIncrease;
- if (!setup.entertainmentCareers.includes(slave.career) && slave.skillE < V.masteredXP) {
- slave.skillE += jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
+ if (!setup.entertainmentCareers.includes(slave.career) && slave.skill.entertainer < V.masteredXP) {
+ slave.skill.entertainer += jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
}
if (setup.entertainmentCareers.includes(slave.career)) {
r += ` ${He} has experience with entertainment from ${his} life before ${he} was a slave, making ${him} more effective.`;
- } else if (slave.skillE >= V.masteredXP) {
+ } else if (slave.skill.entertainer >= V.masteredXP) {
r += ` ${He} has learned to be entertaining from working for you, making ${him} more effective.`;
}
if (slave.devotion > 20) {
if (!canWalk(slave)) {
r += ` Since ${he} can't walk, never mind dance, ${he} sits on a stool near the floor to flirt until a citizen feels like helping ${him} back to a private room.`;
- } else if (slave.entertainSkill <= 30) {
+ } else if (slave.skill.entertainment <= 30) {
r += ` ${He} attracts some attention by stripping, come-ons, and simple dancing.`;
- } else if (slave.entertainSkill <= 60) {
+ } else if (slave.skill.entertainment <= 60) {
r += ` ${He} attracts more attention with striptease, flirting, and erotic dancing.`;
- } else if (slave.entertainSkill < 100) {
+ } else if (slave.skill.entertainment < 100) {
r += ` ${He} attracts much attention with arousing innuendo and lusty striptease.`;
} else {
r += ` ${He} attracts popular attention with clever flirting and world-class erotic dancing.`;
@@ -619,7 +619,7 @@ window.saServeThePublic = (function saServeThePublic() {
slave.devotion += 4;
}
} else {
- if ((slave.oralSkill + slave.analSkill >= 200) && ((slave.vaginalSkill >= 100) || !canDoVaginal(slave))) {
+ if ((slave.skill.oral + slave.skill.anal >= 200) && ((slave.skill.vaginal >= 100) || !canDoVaginal(slave))) {
r += ` ${He}'s a <span class="aquamarine">sexual master</span> `;
if (canDoVaginal(slave)) {
r += `whose`;
@@ -679,7 +679,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
}
if (slave.amp !== 1) {
- if (slave.entertainSkill < 100) {
+ if (slave.skill.entertainment < 100) {
r += ` ${He} gains experience as a public slut.`;
skillIncrease = (10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32));
r += `${SkillIncrease.Entertain(slave, skillIncrease)}`;
@@ -1333,13 +1333,13 @@ window.saServeThePublic = (function saServeThePublic() {
function addFlaw(slave) {
if (slave.devotion < 10) {
if (jsRandom(1, 100) > 70) {
- if (slave.vaginalSkill <= 30 && canDoVaginal(slave)) {
+ if (slave.skill.vaginal <= 30 && canDoVaginal(slave)) {
r += ` After being fucked too hard too often, ${he} now <span class="red">dislikes being penetrated.</span>`;
slave.sexualFlaw = "hates penetration";
- } else if (slave.analSkill <= 30 && canDoAnal(slave)) {
+ } else if (slave.skill.anal <= 30 && canDoAnal(slave)) {
r += ` After so much anal pain, ${he} now <span class="red">dislikes being buttfucked.</span>`;
slave.sexualFlaw = "hates anal";
- } else if (slave.oralSkill <= 30) {
+ } else if (slave.skill.oral <= 30) {
r += ` After one too many facials, ${he} now <span class="red">dislikes sucking cock.</span>`;
slave.sexualFlaw = "hates oral";
}
@@ -1351,14 +1351,14 @@ window.saServeThePublic = (function saServeThePublic() {
function addRep(slave) {
if (slave.assignment !== "recruit girls") {
if (slave.assignment === "serve in the club") {
- repX(Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.entertainSkill)) * 0.15), "publicServantClub", slave);
+ repX(Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "publicServantClub", slave);
} else if (slave.assignment === "serve the public") {
- repX(Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.entertainSkill)) * 0.15), "publicServant", slave);
+ repX(Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "publicServant", slave);
} else {
- repX(Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.entertainSkill)) * 0.15), "serving the public in an unregistered building", slave);
+ repX(Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "serving the public in an unregistered building", slave);
}
}
- T.incomeStats.income += Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.entertainSkill)) * 0.15);
+ T.incomeStats.income += Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.skill.entertainment)) * 0.15);
}
function applyFSDecoration() {
@@ -1444,17 +1444,17 @@ window.saServeThePublic = (function saServeThePublic() {
function sexCounts(slave) {
/* SEX ACT COUNTS AND SEXUAL SATISFACTION */
- oralUse = (V.oralUseWeight + (slave.oralSkill / 30) + (slave.lips / 20));
+ oralUse = (V.oralUseWeight + (slave.skill.oral / 30) + (slave.lips / 20));
analUse = 0;
if (canDoAnal(slave)) {
- analUse = (V.analUseWeight + (slave.analSkill / 30) - slave.anus);
+ analUse = (V.analUseWeight + (slave.skill.anal / 30) - slave.anus);
if (analUse < 0) {
analUse = 0;
}
}
vaginalUse = 0;
if (canDoVaginal(slave)) {
- vaginalUse = (V.vaginalUseWeight + (slave.vaginalSkill / 30) - slave.vagina);
+ vaginalUse = (V.vaginalUseWeight + (slave.skill.vaginal / 30) - slave.vagina);
if (vaginalUse < 0) {
vaginalUse = 0;
}
@@ -1471,7 +1471,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
let penetrativeUse = 0;
if (canDoVaginal(slave) && slave.clit > 1) {
- penetrativeUse += (V.penetrativeUseWeight + (slave.vaginalSkill / 30) + slave.clit);
+ penetrativeUse += (V.penetrativeUseWeight + (slave.skill.vaginal / 30) + slave.clit);
}
if (slave.dick && slave.chastityPenis !== 1) {
if (canPenetrate(slave)) {
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index f98e96e379d9ade463eb8a9ebc8179e7b22fdb67..2570b995320b2b16ac95933dc5e767a6df061b20 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -16,7 +16,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
} else {
t += `care`;
}
- if (V.Farmer.oralSkill) { // TODO: keep this? replace with something else?
+ if (V.Farmer.skill.oral) { // TODO: keep this? replace with something else?
t += ` and talented tongue`;
}
t += `. `;
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index d94cb4ca98e62d305942b710fd522ba44c5419ef..2508553d8b50acc3534c62cc2970162c6968000e 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -708,21 +708,24 @@ __''Player Character''__
<<options $PC.skin>>
Your skin tone is:
<<option "pure white" "Pure White" >>
+ <<option "ivory" "Ivory" >>
+ <<option "white" "White" >>
<<option "extremely pale" "Extremely Pale" >>
+ <<option "very pale" "Very Pale" >>
<<option "pale" "Pale" >>
<<option "extremely fair" "Extremely Fair" >>
<<option "very fair" "Very Fair" >>
<<option "fair" "Fair" >>
- <<option "white" "White" >>
<<option "light" "Light" >>
- <<option "lightened" "Lightened" >>
<<option "light olive" "Light Olive" >>
+ <<option "tan" "Tan" >>
<<option "olive" "Olive" >>
- <<option "natural" "Natural" >>
- <<option "tanned" "Tanned" >>
- <<option "bronzed" "Bronzed" >>
+ <<option "bronze" "Bronze" >>
<<option "dark olive" "Dark Olive" >>
<<option "dark" "Dark" >>
+ <<option "light beige" "Light Beige" >>
+ <<option "beige" "Beige" >>
+ <<option "dark beige" "Dark Beige" >>
<<option "light brown" "Light Brown" >>
<<option "brown" "Brown" >>
<<option "dark brown" "Dark Brown" >>
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 38e287e669d0849344520c1f59d36dca82f6cc65..660d716cabec88f633dd8302c1588f54e8199c61 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -57,15 +57,15 @@
<<elseif (_FLsFetish == 2)>>
$He's careful that all of the farmhands under $his supervision are all ready to work every morning, and $he @@.lightsalmon;becomes more dominant.@@
<</if>>
- <<if ($Farmer.farmhandSkill <= 10)>>
+ <<if ($Farmer.skill.farmer <= 10)>>
Though $Farmer.slaveName does $his best to manage the farmyard, with $his lack of skill $he can do little.
- <<elseif ($Farmer.farmhandSkill <= 30)>>
+ <<elseif ($Farmer.skill.farmer <= 30)>>
$Farmer.slaveName's basic skills marginally @@.yellowgreen;improve@@ business at $farmyardName.
<<set $FarmerCashBonus += 0.05>>
- <<elseif ($Farmer.farmhandSkill <= 60)>>
+ <<elseif ($Farmer.skill.farmer <= 60)>>
$Farmer.slaveName's skills @@.yellowgreen;improve@@ business at $farmyardName.
<<set $FarmerCashBonus += 0.1>>
- <<elseif ($Farmer.farmhandSkill < 100)>>
+ <<elseif ($Farmer.skill.farmer < 100)>>
$Farmer.slaveName's skills greatly @@.yellowgreen;improve@@ business at $farmyardName.
<<set $FarmerCashBonus += 0.15>>
<<else>>
@@ -81,11 +81,11 @@
<<if setup.farmerCareers.includes($Farmer.career)>>
$He has experience from $his life before $he was a slave that helps $him in the difficult life of managing animals and property.
<<set $FarmerCashBonus += 0.05>>
- <<elseif $Farmer.skillFA >= $masteredXP>>
+ <<elseif $Farmer.skill.farmer >= $masteredXP>>
$He has experience from working for you that helps $him in the difficult life of managing animals and property.
<<set $FarmerCashBonus += 0.05>>
<<else>>
- <<set $slaves[_FLs].skillFA += random(1,Math.ceil(($Farmer.intelligence+$Farmer.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.farmer += random(1,Math.ceil(($Farmer.intelligence+$Farmer.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Farmer.intelligence+$Farmer.intelligenceImplant > 15)>>
$He is a clever manager.
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 6e59fee11d3a709ca5f2ee41d2ae9c81d0368abc..f205b17a7cdab1e9c48502c1d3c73cec6763fe78 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -469,7 +469,7 @@
<</if>>
| <<link "Shock punishment">><<set $activeChild.collar = "shock punishment">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
| <<link "Dildo gag">><<set $activeChild.collar = "dildo gag">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
-<<if isItemAccessible("massive dildo gag") && $activeChild.oralSkill > 50>>
+<<if isItemAccessible("massive dildo gag") && $activeChild.skill.oral > 50>>
| <<link "Massive dildo gag">><<set $activeChild.collar = "massive dildo gag">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
<</if>>
| <<link "Ball gag">><<set $activeChild.collar = "ball gag">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 702d7bb835287badf55726145f44c9011d2b67b2..22c06a20d683fc445791605aa76b805b1b2cc512 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -121,8 +121,8 @@ is
<<= SlaveFullName($activeChild)>> is not $his original name: $he was once called <<= SlaveFullBirthName($activeChild)>>.
<</if>>
<</if>>
-
-<<= App.Desc.AgeAndHealth($activeChild)>>
+*/
+<<= App.Desc.ageAndHealth($activeChild)>>
<<if $saleDescription != 1>>
<<if $clinic != 0 && $clinicUpgradeScanner == 1>>
@@ -259,7 +259,7 @@ is
<</if>>
<</if>>
- <<= App.Desc.Eyes($activeChild)>>
+ <<= App.Desc.eyes($activeChild)>>
<<if $activeChild.fetish == "mindbroken">>
However, @@.coral;$his mind is fundamentally broken;@@ everything $he experiences will quickly be forgotten.
@@ -676,7 +676,7 @@ is
<<if $activeChild.fuckdoll == 0>>
<<if $showBodyMods == 1>>
<<if ["cheeks", "ears", "left cheek", "left ears", "neck", "right cheek", "right ears"].includes($activeChild.brandLocation)>>
- <<brandDescription>>
+ <<= App.Desc.brand($activeChild)>>
<</if>>
<</if>>
<</if>>
@@ -821,38 +821,38 @@ is
<</if>>
Entertainment and prostitution skills are irrelevant for a Fuckdoll.
<<else>>
- <<if $activeChild.whoreSkill <= 10>>
- <<if $activeChild.entertainSkill <= 10>>
- <<elseif $activeChild.entertainSkill <= 30>>
+ <<if $activeChild.skill.whore <= 10>>
+ <<if $activeChild.skill.entertainment <= 10>>
+ <<elseif $activeChild.skill.entertainment <= 30>>
$He is @@.aquamarine;reasonably entertaining.@@
- <<elseif $activeChild.entertainSkill <= 60>>
+ <<elseif $activeChild.skill.entertainment <= 60>>
$He is a @@.aquamarine;skilled entertainer.@@
- <<elseif $activeChild.entertainSkill < 100>>
+ <<elseif $activeChild.skill.entertainment < 100>>
$He is an @@.aquamarine;expert entertainer.@@
<<else>>
$He is a @@.aquamarine;master of entertainment.@@
<</if>>
<<else>>
- <<if $activeChild.entertainSkill <= 10>>
- <<elseif $activeChild.entertainSkill <= 30>>
+ <<if $activeChild.skill.entertainment <= 10>>
+ <<elseif $activeChild.skill.entertainment <= 30>>
$He is @@.aquamarine;reasonably entertaining@@ and
- <<elseif $activeChild.entertainSkill <= 60>>
+ <<elseif $activeChild.skill.entertainment <= 60>>
$He is a @@.aquamarine;skilled entertainer@@ and
- <<elseif $activeChild.entertainSkill < 100>>
+ <<elseif $activeChild.skill.entertainment < 100>>
$He is an @@.aquamarine;expert entertainer@@ and
<<else>>
$He is a @@.aquamarine;master of entertainment@@ and
<</if>>
<</if>>
- <<if $activeChild.whoreSkill <= 10>>
- <<elseif $activeChild.whoreSkill <= 30>>
- <<if $activeChild.entertainSkill <= 10>>$He <</if>>has @@.aquamarine;basic experience as a prostitute.@@
- <<elseif $activeChild.whoreSkill <= 60>>
- <<if $activeChild.entertainSkill <= 10>>$He is <</if>>a @@.aquamarine;skilled streetwalker.@@
- <<elseif $activeChild.whoreSkill < 100>>
- <<if $activeChild.entertainSkill <= 10>>$He is <</if>>an @@.aquamarine;expert working $girl.@@
+ <<if $activeChild.skill.whore <= 10>>
+ <<elseif $activeChild.skill.whore <= 30>>
+ <<if $activeChild.skill.entertainment <= 10>>$He <</if>>has @@.aquamarine;basic experience as a prostitute.@@
+ <<elseif $activeChild.skill.whore <= 60>>
+ <<if $activeChild.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;skilled streetwalker.@@
+ <<elseif $activeChild.skill.whore < 100>>
+ <<if $activeChild.skill.entertainment <= 10>>$He is <</if>>an @@.aquamarine;expert working $girl.@@
<<else>>
- <<if $activeChild.entertainSkill <= 10>>$He is <</if>>a @@.aquamarine;masterful whore.@@
+ <<if $activeChild.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;masterful whore.@@
<</if>>
<</if>>
@@ -886,7 +886,7 @@ is
<br>
<<if $activeChild.amp != 0>>
- <<amputeeDescription>>
+ <<= App.Desc.amputee($activeChild)>>
<</if>>
<<ClothingDescription>>
@@ -968,7 +968,7 @@ and
$His hips are unrealistically wide; it is obvious they have been artificially widened.
<</if>>
-<<waistDescription>>
+<<= App.Desc.waist($activeChild)>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
<<if $arcologies[0].FSHedonisticDecadence == "unset" && $arcologies[0].FSPhysicalIdealistStrongFat == 0>>
@@ -1114,7 +1114,7 @@ $He is
<<BodyguardWeapon>>
<</if>>
- <<if $activeChild.combatSkill > 0>>
+ <<if $activeChild.skill.combat > 0>>
$He is @@.aquamarine;skilled at combat:@@ $he is comfortable with the use of modern firearms and edged weapons, and $his hands <<if $activeChild.amp == -4>>would be deadly weapons even if they weren't full of deadly weapons already<<elseif $activeChild.amp > 0>>would be deadly weapons if $he had any<<else>>are deadly weapons<</if>>.
<</if>>
<</if>>
@@ -1160,7 +1160,7 @@ $He is
<<if $showBodyMods == 1>>
/* Check it's not a facial brand: */
<<if ["ankles", "back", "calves", "chest", "feet", "hands", "left ankle", "left calf", "left foot", "left hand", "left lower arm", "left shoulder", "left upper arm", "left wrist", "lower arms", "lower back", "right ankle", "right calf", "right foot", "right hand", "right lower arm", "right shoulder", "right upper arm", "right wrist", "shoulders", "upper arms", "wrists"].includes($activeChild.brandLocation)>>
- <<brandDescription>>
+ <<= App.Desc.brand($activeChild)>>
<</if>>
<</if>>
<</if>>
@@ -1176,7 +1176,7 @@ $He is
<<if $activeChild.markings == "birthmark" && $activeChild.prestige == 0 && $activeChild.pornPrestige < 2>>
$He has a large, liver-colored birthmark, detracting from $his beauty.
<</if>>
- <<if ($activeChild.skin == "tanned") && ($activeChild.origSkin != "tanned")>>
+ <<if ($activeChild.skin == "sun tanned")>>
<<if ($activeChild.releaseRules != "restrictive" && $activeChild.releaseRules != "masturbation" && $activeChild.releaseRules != "chastity")>>
<<if ($activeChild.fetishStrength > 60) && ($activeChild.fetishKnown == 1)>>
$His tan is slightly uneven, since $he enjoys
@@ -1218,7 +1218,7 @@ $He is
<<if ($activeChild.hColor == "red")>>
<<if ($activeChild.hLength >= 10)>>
<<if ($activeChild.markings == "freckles") || ($activeChild.markings == "heavily freckled")>>
- <<if ($activeChild.skin == "pale") || ($activeChild.skin == "fair")>>
+ <<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10)>>
It goes perfectly with $his $activeChild.skin skin and freckles.
<</if>>
<</if>>
@@ -1487,4 +1487,4 @@ $He is
<</if>>
<</if>>
-<<set $saleDescription = 0, $applyLaw = 0>> /* clear sale and law flags, if set */
\ No newline at end of file
+<<set $saleDescription = 0, $applyLaw = 0>> /* clear sale and law flags, if set */
diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw
index dcdf03ed03e7b9f5253151b1c09b3162b4c4eb67..6b2b3faa2e3b716bcb7c0d9ef8aee03cedca9018 100644
--- a/src/facilities/nursery/nurseryReport.tw
+++ b/src/facilities/nursery/nurseryReport.tw
@@ -50,11 +50,11 @@
<<if setup.attendantCareers.includes($Matron.career)>>
$He has experience with childcare from $his life before $he was a slave, making $him better at properly raising children, and giving $him a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
- <<elseif $Matron.skillMT >= $masteredXP>>
+ <<elseif $Matron.skill.matron >= $masteredXP>>
$He has experience with childcare from working for you, making $him better at properly raising children, and giving $him a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
<<else>>
- <<set $slaves[_FLs].skillMT += random(1,($Matron.intelligence+4)*2)>>
+ <<set $slaves[_FLs].skill.matron += random(1,($Matron.intelligence+4)*2)>>
<</if>>
<<if ($Matron.fetish == "none")>>
$Matron.slaveName respects the slaves working in the nursery, allowing them to care for the children more effectively.
@@ -213,4 +213,4 @@
<br><br>
<</if>>
-<<include "Children Report">>
\ No newline at end of file
+<<include "Children Report">>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index d4fc0bab886973ca288559240644826786db39aa..eda7434c3afe442db4f201c72d9d9bf3d4277eed 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -33,6 +33,7 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
<<set setup.filterRaces = ["Amerindian", "Asian", "Black", "Indo-Aryan", "Latina", "Malay", "Middle Eastern", "Mixed Race", "Pacific Islander", "Semitic", "Southern European", "White"]>>
<<set setup.filterRacesLowercase = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
<<set setup.filterRegions = ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"]>>
+<<set setup.naturalSkins = ["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "extremely fair", "very fair", "fair", "light", "light olive", "tan", "olive", "bronze", "dark olive", "dark", "light beige", "beige", "dark beige", "light brown", "brown", "dark brown", "black", "ebony", "pure black"]>>
/* START Custom Nationalities region filter */
/* Not currently weighted, but will accept weights */
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 4aad145dcb5d287ee407cf2959c77b5c14371500..16eaddefb11c35ec3c32e1d053c34032406277e6 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1346,7 +1346,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $weatherToday = $niceWeather.random()>>
<<set $customSlaveOrdered = 0>>
-<<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", amp: 0, eyes: 1, hears: 0}>>
+<<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, skill: {whore: 15, combat: 0}, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", amp: 0, eyes: 1, hears: 0}>>
<<set $huskSlaveOrdered = 0>>
<<set $huskSlave = {age: 18, nationality: "Stateless", race: "white", sex: 1, virgin: 0}>>
diff --git a/src/interaction/main/toychest.js b/src/interaction/main/toychest.js
index 56e233ca6d32633f63f838445cb4fe791e66bf7d..93dbadc1b03ffe96ec45c0309dca2a5758c16f82 100644
--- a/src/interaction/main/toychest.js
+++ b/src/interaction/main/toychest.js
@@ -1,22 +1,19 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
-
-/** breaks in the last case in switches are not required, but are highly recommended */
-
/* OPEN TOYCHEST */
App.Interact.ToyChest = function(slave) {
"use strict";
const V = State.variables;
let r = ``;
- var pronouns = getPronouns(slave);
- var he = pronouns.pronoun;
- var him = pronouns.object;
- var his = pronouns.possessive;
- var hers = pronouns.possessivePronoun;
- var himself = pronouns.objectReflexive;
- var boy = pronouns.noun;
- var He = capFirstChar(he);
- var His = capFirstChar(his);
+ /* eslint-disable */
+ let pronouns = getPronouns(slave);
+ let he = pronouns.pronoun;
+ let him = pronouns.object;
+ let his = pronouns.possessive;
+ let hers = pronouns.possessivePronoun;
+ let himself = pronouns.objectReflexive;
+ let boy = pronouns.noun;
+ let He = capFirstChar(he);
+ let His = capFirstChar(his);
+ /* eslint-enable */
r = `${slave.slaveName} `;
if (slave.fuckdoll) {
@@ -63,7 +60,7 @@ App.Interact.ToyChest = function(slave) {
} else if (slave.devotion <= 50) {
r += `has positioned ${himself} nearby to offer you ${his} body. `;
}
- let pose = random(1,100);
+ let pose = random(1, 100);
if (slave.fuckdoll) {
r += `${His} holes are, as always, available. `;
} else if (slave.fetish === "mindbroken") {
@@ -356,4 +353,4 @@ App.Interact.ToyChest = function(slave) {
}
}
return r;
-}
\ No newline at end of file
+}
diff --git a/src/interaction/main/useGuard.js b/src/interaction/main/useGuard.js
index cbc6ada15a4c98d3953e867489ce39c7a593b275..163dc22b62c767ae656f9cfd4903c35ec96d88c3 100644
--- a/src/interaction/main/useGuard.js
+++ b/src/interaction/main/useGuard.js
@@ -1,22 +1,19 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
-
-/** breaks in the last case in switches are not required, but are highly recommended */
/* OPEN USEGUARD */
App.Interact.UseGuard = function(slave) {
"use strict";
- const V = State.variables;
let r = ``;
- var pronouns = getPronouns(slave);
- var he = pronouns.pronoun;
- var him = pronouns.object;
- var his = pronouns.possessive;
- var hers = pronouns.possessivePronoun;
- var himself = pronouns.objectReflexive;
- var boy = pronouns.noun;
- var He = capFirstChar(he);
- var His = capFirstChar(his);
+ /* eslint-disable */
+ let pronouns = getPronouns(slave);
+ let he = pronouns.pronoun;
+ let him = pronouns.object;
+ let his = pronouns.possessive;
+ let hers = pronouns.possessivePronoun;
+ let himself = pronouns.objectReflexive;
+ let boy = pronouns.noun;
+ let He = capFirstChar(he);
+ let His = capFirstChar(his);
+ /* eslint-enable */
r = `${slave.slaveName} is standing behind your left shoulder, guarding your person. `;
switch (slave.clothes) {
@@ -279,4 +276,4 @@ App.Interact.UseGuard = function(slave) {
}
return r;
}
-/* CLOSE USEGUARD */
\ No newline at end of file
+/* CLOSE USEGUARD */
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 6a1ab33686b346212b5dec66f61bff55447f68fc..d2205db5d56c915b3512b73345a685407846cf8f 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -225,7 +225,7 @@ window.DefaultRules = (function() {
case "learn in the schoolroom":
if ((V.schoolroomSlaves < V.schoolroom && slave.fetish !== "mindbroken" && (slave.devotion >= -20 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)))) {
- if ((slave.intelligenceImplant < 30) || (slave.voice !== 0 && slave.accent+V.schoolroomUpgradeLanguage > 2) || (slave.oralSkill <= 10+V.schoolroomUpgradeSkills*20) || (slave.whoreSkill <= 10+V.schoolroomUpgradeSkills*20) || (slave.entertainSkill <= 10+V.schoolroomUpgradeSkills*20) || (slave.analSkill < 10+V.schoolroomUpgradeSkills*20) || ((slave.vagina >= 0) && (slave.vaginalSkill < 10+V.schoolroomUpgradeSkills*20))) {
+ if ((slave.intelligenceImplant < 30) || (slave.voice !== 0 && slave.accent+V.schoolroomUpgradeLanguage > 2) || (slave.skill.oral <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.whore <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.entertainment <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.anal < 10+V.schoolroomUpgradeSkills*20) || ((slave.vagina >= 0) && (slave.skill.vaginal < 10+V.schoolroomUpgradeSkills*20))) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -387,7 +387,7 @@ window.DefaultRules = (function() {
if (rule.collar === "preg biometrics" && slave.preg <= -1 && slave.ovaries === 0 && slave.mpreg === 0) {
slave.collar = "none";
r += `${slave.slaveName} cannot utilize preg biometrics. `;
- } else if ((rule.collar === "massive dildo gag" && slave.oralSkill <= 50)) {
+ } else if ((rule.collar === "massive dildo gag" && slave.skill.oral <= 50)) {
slave.collar = "none";
r += `${slave.slaveName} lacks the oral skill to successfully keep the massive dildo gag in ${his} throat. `;
} else {
diff --git a/src/js/PenthouseNaming.js b/src/js/PenthouseNaming.js
index 8fe4bac44d5299a539ded3cc6f420516bfb57bff..2df44f652f07d3cc675630f57efad64c2aa24eff 100644
--- a/src/js/PenthouseNaming.js
+++ b/src/js/PenthouseNaming.js
@@ -1,118 +1,80 @@
-/* eslint-disable no-undef */
/**
* @return {string}
*/
window.MasterSuiteUIName = function () {
const V = State.variables;
- let name = "";
- if (V.masterSuiteNameCaps === "The Master Suite") {
- name = "Master Suite";
- } else {
- name = V.masterSuiteNameCaps;
- }
+ const name = (V.masterSuiteNameCaps === "The Master Suite") ? "Master Suite" : V.masterSuiteNameCaps;
return `<<link "${name}""Master Suite">><</link>> `;
};
+
/**
* @return {string}
*/
window.HeadGirlSuiteUIName = function () {
const V = State.variables;
- let name = "";
- if (V.HGSuiteNameCaps === "The Head Girl Suite") {
- name = "Head Girl Suite";
- } else {
- name = V.HGSuiteNameCaps;
- }
+ const name = (V.HGSuiteNameCaps === "The Head Girl Suite") ? "Head Girl Suite" : V.HGSuiteNameCaps;
return `<<link "${name}""Head Girl Suite">><</link>> `;
};
+
/**
* @return {string}
*/
window.ServantQuartersUIName = function () {
const V = State.variables;
- let name = "";
- if (V.servantsQuartersNameCaps === "The Servants' Quarters") {
- name = "Servants' Quarters";
- } else {
- name = V.servantsQuartersNameCaps;
- }
+ const name = (V.servantsQuartersNameCaps === "The Servants' Quarters") ? "Servants' Quarters" : V.servantsQuartersNameCaps;
return `<<link "${name}""Servants' Quarters">><</link>> `;
};
+
/**
* @return {string}
*/
window.SpaUIName = function() {
const V = State.variables;
- let name = "";
- if (V.spaNameCaps === "The Spa") {
- name = "Spa";
- } else {
- name = V.spaNameCaps;
- }
+ const name = (V.spaNameCaps === "The Spa") ? "Spa" : V.spaNameCaps;
return `<<link "${name}""Spa">><</link>> `;
};
+
/**
* @return {string}
*/
window.NurseryUIName = function () {
const V = State.variables;
- let name = "";
- if (V.nurseryNameCaps === "The Nursery") {
- name = "Nursery";
- } else {
- name = V.nurseryNameCaps;
- }
+ const name = (V.nurseryNameCaps === "The Nursery") ? "Nursery" : V.nurseryNameCaps;
return `<<link "${name}""Nursery">><</link>> `;
};
+
/**
* @return {string}
*/
window.ClinicUIName = function () {
const V = State.variables;
- let name = "";
- if (V.clinicNameCaps === "The Clinic") {
- name = "Clinic";
- } else {
- name = V.clinicNameCaps;
- }
+ const name = (V.clinicNameCaps === "The Clinic") ? "Clinic" : V.clinicNameCaps;
return `<<link "${name}""Clinic">><</link>> `;
};
+
/**
* @return {string}
*/
window.SchoolRoomUIName = function () {
const V = State.variables;
- let name = "";
- if (V.schoolroomNameCaps === "The Schoolroom") {
- name = "Schoolroom";
- } else {
- name = V.schoolroomNameCaps;
- }
+ const name = (V.schoolroomNameCaps === "The Schoolroom") ? "Schoolroom" : V.schoolroomNameCaps;
return `<<link "${name}""Schoolroom">><</link>> `;
};
+
/**
* @return {string}
*/
window.CellblockUIName = function () {
const V = State.variables;
- let name = "";
- if (V.cellblockNameCaps === "The Cellblock") {
- name = "Cellblock";
- } else {
- name = V.cellblockNameCaps;
- }
+ const name = (V.cellblockNameCaps === "The Cellblock") ? "Cellblock" : V.cellblockNameCaps;
return `<<link "${name}""Cellblock">><</link>> `;
};
+
/**
* @return {string}
*/
window.IncubatorUIName = function () {
const V = State.variables;
- let name = "";
- if (V.incubatorNameCaps === "The Incubator") {
- name = "Incubator";
- } else {
- name = V.incubatorNameCaps;
- }
+ const name = (V.incubatorNameCaps === "The Incubator") ? "Incubator" : V.incubatorNameCaps;
return `<<link "${name}""Incubator">><</link>> `;
};
diff --git a/src/js/SetBellySize.js b/src/js/SetBellySize.js
index 657bd987bd790568386715dd8e0b09ab6cc8e16e..78d2eec4a50fdf0a59d1e954863fd2848acf0610 100644
--- a/src/js/SetBellySize.js
+++ b/src/js/SetBellySize.js
@@ -1,13 +1,8 @@
/** @param {App.Entity.SlaveState} slave */
window.SetBellySize = function SetBellySize(slave) {
- let _implantSize;
WombNormalizePreg(slave); /* now with support for legacy code that advances pregnancy by setting .preg++ */
- if (slave.bellyImplant > 0) {
- _implantSize = slave.bellyImplant;
- } else {
- _implantSize = 0;
- }
+ const _implantSize = (slave.bellyImplant > 0) ? slave.bellyImplant : 0;
if (slave.inflation === 3) {
slave.bellyFluid = 10000;
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index e5a14c55c1dffaf782551a294595862614ad992a..22696073c0033b4bc8a0688621cd5437f00f1c88 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -9,7 +9,7 @@
* App.Entity.SlaveState class.
* @ref App.Entity.SlaveState
*/
-App.Entity.SlavePornPerformanceState = class SlavePornPerformanceState {
+App.Entity.SlavePornPerformanceState = class {
constructor() {
/** what porn she is known for */
this.fameType = "none";
@@ -90,6 +90,135 @@ App.Entity.SlavePornPerformanceState = class SlavePornPerformanceState {
}
};
+/**
+ * Encapsulates skills of a slave. Used inside of the
+ * App.Entity.SlaveState class.
+ * @ref App.Entity.SlaveState
+ */
+App.Entity.SlaveSkillsState = class {
+ constructor() {
+ /**
+ * skill in vaginal sex
+ * * 0-10: unskilled
+ * * 11-30: basic
+ * * 31-60: skilled
+ * * 61-99: expert
+ * * 100+: master
+ */
+ this.vaginal = 0;
+ /**
+ * skill in oral sex
+ * * 0-10: unskilled
+ * * 11-30: basic
+ * * 31-60: skilled
+ * * 61-99: expert
+ * * 100+: master
+ */
+ this.oral = 0;
+ /**
+ * skill in anal sex
+ * * 0-10: unskilled
+ * * 11-30: basic
+ * * 31-60: skilled
+ * * 61-99: expert
+ * * 100+: master
+ */
+ this.anal = 0;
+ /**
+ * whoring skill
+ * * 0-10: unskilled
+ * * 11-30: basic
+ * * 31-60: skilled
+ * * 61-99: expert
+ * * 100+: master
+ */
+ this.whore = 0;
+ /**
+ * entertaining skill
+ * * 0-10: unskilled
+ * * 11-30: basic
+ * * 31-60: skilled
+ * * 61-99: expert
+ * * 100+: master
+ */
+ this.entertainment = 0;
+ /**
+ * combating skill
+ * * 0-10: unskilled
+ * * 11-30: basic
+ * * 31-60: skilled
+ * * 61-99: expert
+ * * 100+: master
+ */
+ this.combat = 0;
+
+ /** Her skill as a Head Girl
+ *
+ * default cap is 200 */
+ this.headGirl = 0;
+ /** Her skill as a recruiter
+ *
+ * default cap is 200 */
+ this.recruiter = 0;
+ /** Her skill as a bodyguard
+ *
+ * default cap is 200 */
+ this.bodyguard = 0;
+ /** Her skill as a brothel madam
+ *
+ * default cap is 200 */
+ this.madam = 0;
+ /** Her skill as a DJ
+ *
+ * default cap is 200 */
+ this.DJ = 0;
+ /** Her skill as a nurse
+ *
+ * default cap is 200 */
+ this.nurse = 0;
+ /** Her skill as a teacher
+ *
+ * default cap is 200 */
+ this.teacher = 0;
+ /** Her skill as an attendant
+ *
+ * default cap is 200 */
+ this.attendant = 0;
+ /** Her skill as a matron
+ *
+ * default cap is 200 */
+ this.matron = 0;
+ /** Her skill as a stewardess
+ *
+ * default cap is 200 */
+ this.stewardess = 0;
+ /** Her skill as a milkmaid
+ *
+ * default cap is 200 */
+ this.milkmaid = 0;
+ /** Her skill as a farmer
+ *
+ * default cap is 200 */
+ this.farmer = 0;
+ /** Her skill as a wardeness
+ *
+ * default cap is 200 */
+ this.wardeness = 0;
+ /** Her skill as a servant.
+ *
+ * default cap is 200 */
+ this.servant = 0;
+ /** Her skill as an entertainer
+ *
+ * default cap is 200 */
+ this.entertainer = 0;
+ /** Her skill as a whore
+ *
+ * default cap is 200 */
+ this.whore = 0;
+ }
+};
+
App.Entity.SlaveState = class SlaveState {
constructor() {
/** Slave's current name */
@@ -340,13 +469,13 @@ App.Entity.SlaveState = class SlaveState {
/** is there an inner ear implant device
* 0: no; 1: yes */
this.earImplant = 0;
- /**the shape of their outer ears
+ /** the shape of their outer ears
* "none", "damaged", "normal", "pointy", "elven", "ushi" */
this.earShape = "normal";
- /**type of kemonomimi ears if any
+ /** type of kemonomimi ears if any
* "neko", "inu", "kit", "tanuki" */
this.earT = "none";
- /**kemonomimi ear color
+ /** kemonomimi ear color
* "hairless" */
this.earTColor = "hairless";
/** sense of smell
@@ -355,12 +484,12 @@ App.Entity.SlaveState = class SlaveState {
/** sense of taste
0 - yes, -1 - no */
this.tastes = 0;
- /**horn type if any
+ /** horn type if any
* "none", "curved succubus horns", "backswept horns", "cow horns", "one long oni horn", "two long oni horns", "small horns" */
this.horn = "none";
- /**horn color */
+ /** horn color */
this.hornColor = "none";
- /**type of tail installed
+ /** type of tail installed
* "none", "mod", "combat", "sex"*/
this.tail = "none";
/**
@@ -369,10 +498,10 @@ App.Entity.SlaveState = class SlaveState {
* * 1: yes
*/
this.PTail = 0;
- /**the current shape of their modular tail
+ /** the current shape of their modular tail
* "none", "neko", "inu", "kit", "kitsune", "tanuki", "ushi" */
this.tailShape = "none";
- /**tail color */
+ /** tail color */
this.tailColor = "none";
/** slave's original hair color, defaults to their initial hair color. */
this.origHColor = "brown";
@@ -846,6 +975,20 @@ App.Entity.SlaveState = class SlaveState {
* * "restraint": Provides structural support for extremely oversized pregnancies
*/
this.wombImplant = "none";
+ /**
+ * Menstrual cycle known variable. To be used for fert cycle discover and things like pregnancy without a first period
+ *
+ * * 0: no
+ * * 1: yes
+ */
+ this.fertKnown = 0;
+ /**
+ * Menstrual cycle control variable.
+ *
+ * * 0: Danger week
+ * * 1+: safe week
+ */
+ this.fertPeak = 0;
/**
* has the slave been turned into a broodmother
*
@@ -1216,60 +1359,6 @@ App.Entity.SlaveState = class SlaveState {
* * "Paternalist"
* @type {string|number} */
this.stampTat = 0;
- /**
- * skill in vaginal sex
- * * 0-10: unskilled
- * * 11-30: basic
- * * 31-60: skilled
- * * 61-99: expert
- * * 100+: master
- */
- this.vaginalSkill = 0;
- /**
- * skill in oral sex
- * * 0-10: unskilled
- * * 11-30: basic
- * * 31-60: skilled
- * * 61-99: expert
- * * 100+: master
- */
- this.oralSkill = 0;
- /**
- * skill in anal sex
- * * 0-10: unskilled
- * * 11-30: basic
- * * 31-60: skilled
- * * 61-99: expert
- * * 100+: master
- */
- this.analSkill = 0;
- /**
- * whoring skill
- * * 0-10: unskilled
- * * 11-30: basic
- * * 31-60: skilled
- * * 61-99: expert
- * * 100+: master
- */
- this.whoreSkill = 0;
- /**
- * entertaining skill
- * * 0-10: unskilled
- * * 11-30: basic
- * * 31-60: skilled
- * * 61-99: expert
- * * 100+: master
- */
- this.entertainSkill = 0;
- /**
- * combating skill
- * * 0-10: unskilled
- * * 11-30: basic
- * * 31-60: skilled
- * * 61-99: expert
- * * 100+: master
- */
- this.combatSkill = 0;
/**
* * "spare"
* * "normal"
@@ -2154,70 +2243,8 @@ App.Entity.SlaveState = class SlaveState {
*
* 0: no; 1: yes */
this.newGamePlus = 0;
- /** Her skill as a Head Girl
- *
- * default cap is 200 */
- this.skillHG = 0;
- /** Her skill as a recruiter
- *
- * default cap is 200 */
- this.skillRC = 0;
- /** Her skill as a bodyguard
- *
- * default cap is 200 */
- this.skillBG = 0;
- /** Her skill as a brothel madam
- *
- * default cap is 200 */
- this.skillMD = 0;
- /** Her skill as a DJ
- *
- * default cap is 200 */
- this.skillDJ = 0;
- /** Her skill as a nurse
- *
- * default cap is 200 */
- this.skillNU = 0;
- /** Her skill as a teacher
- *
- * default cap is 200 */
- this.skillTE = 0;
- /** Her skill as an attendant
- *
- * default cap is 200 */
- this.skillAT = 0;
- /** Her skill as a matron
- *
- * default cap is 200 */
- this.skillMT = 0;
- /** Her skill as a stewardess
- *
- * default cap is 200 */
- this.skillST = 0;
- /** Her skill as a milk maid
- *
- * default cap is 200 */
- this.skillMM = 0;
- /** Her skill as a farmer
- *
- * default cap is 200 */
- this.skillFA = 0;
- /** Her skill as a wardeness
- *
- * default cap is 200 */
- this.skillWA = 0;
- /** Her skill as a servant.
- *
- * default cap is 200 */
- this.skillS = 0;
- /** Her skill as an entertainer
- *
- * default cap is 200 */
- this.skillE = 0;
- /** Her skill as a whore
- *
- * default cap is 200 */
- this.skillW = 0;
+ /** Her skills */
+ this.skill = new App.Entity.SlaveSkillsState();
/** Whether she was put in the incubator at birth
*
* 0: no; 1: yes, comforting; 2: yes, terrifying */
@@ -2235,7 +2262,7 @@ App.Entity.SlaveState = class SlaveState {
* 0: no; 1: yes */
rapidCellGrowth: 0
};
-
+ /* eslint-disable */
this.NCSyouthening = 0;
this.override_Race = 0;
this.override_Skin = 0;
@@ -2245,6 +2272,7 @@ App.Entity.SlaveState = class SlaveState {
this.override_Arm_H_Color = 0;
this.override_Brow_H_Color = 0;
this.albinismOverride = 0;
+ /* eslint-enable */
/** are eyes missing?
*
* 0: none; 1: yes, left; 2: yes, right; 3: yes, both */
@@ -2294,7 +2322,8 @@ App.Entity.SlaveState = class SlaveState {
return {
porn: {
fame: { }
- }
+ },
+ skill: { },
};
}
};
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 33d2ea025be775931c03aa6125dd717e7935d13b..70bda691e68cc904b2cd4b0b79304901b2fab907 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -137,7 +137,11 @@ window.newSlave = /** @param {App.Entity.SlaveState} slave */ function newSlave(
slave.eyebrowHColor = slave.hColor;
}
if (slave.override_Skin !== 1) {
- slave.origSkin = slave.skin;
+ if ((slave.skin === "sun tanned") || (slave.skin === "spray tanned")) {
+ slave.origSkin = randomRaceSkin(slave.origRace);
+ } else {
+ slave.origSkin = slave.skin;
+ }
}
slave.override_Race = 0;
@@ -192,7 +196,7 @@ window.newSlave = /** @param {App.Entity.SlaveState} slave */ function newSlave(
slave.sexualFlaw !== "hates women") {
V.REFeminizationCheckinIDs.push(slave.ID);
}
- if (slave.actualAge > 35 && slave.face < 40 && slave.analSkill <= 30) {
+ if (slave.actualAge > 35 && slave.face < 40 && slave.skill.anal <= 30) {
V.REMILFCheckinIDs.push(slave.ID);
}
if (slave.attrXY <= 60 && slave.attrXX > 60 ) {
@@ -566,48 +570,48 @@ window.PCTitle = function PCTitle() {
V.PCTitle = PlayerName();
if (V.cheater === 1) {
- V.PCTitle = (V.PCTitle + " the Cheater");
+ V.PCTitle = (`${V.PCTitle } the Cheater`);
} else if (V.arcologies[0].FSRestart > 10) {
- V.PCTitle = (V.PCTitle + " of the Societal Elite");
+ V.PCTitle = (`${V.PCTitle } of the Societal Elite`);
} else if (V.rep > 18000) {
- V.PCTitle = (V.PCTitle + " the Great");
+ V.PCTitle = (`${V.PCTitle } the Great`);
} else if (V.rep > 17000) {
- V.PCTitle = ("the exalted " + V.PCTitle);
+ V.PCTitle = (`the exalted ${ V.PCTitle}`);
} else if (V.rep > 16000) {
- V.PCTitle = ("the illustrious " + V.PCTitle);
+ V.PCTitle = (`the illustrious ${ V.PCTitle}`);
} else if (V.rep > 15000) {
- V.PCTitle = ("the prestigious " + V.PCTitle);
+ V.PCTitle = (`the prestigious ${ V.PCTitle}`);
} else if (V.rep > 14000) {
- V.PCTitle = ("the renowned " + V.PCTitle);
+ V.PCTitle = (`the renowned ${ V.PCTitle}`);
} else if (V.rep > 13000) {
- V.PCTitle = ("the famed " + V.PCTitle);
+ V.PCTitle = (`the famed ${ V.PCTitle}`);
} else if (V.rep > 12000) {
- V.PCTitle = ("the celebrated " + V.PCTitle);
+ V.PCTitle = (`the celebrated ${ V.PCTitle}`);
} else if (V.rep > 11000) {
- V.PCTitle = ("the honored " + V.PCTitle);
+ V.PCTitle = (`the honored ${ V.PCTitle}`);
} else if (V.rep > 10000) {
- V.PCTitle = ("the acclaimed " + V.PCTitle);
+ V.PCTitle = (`the acclaimed ${ V.PCTitle}`);
} else if (V.rep > 9000) {
- V.PCTitle = ("the eminent " + V.PCTitle);
+ V.PCTitle = (`the eminent ${ V.PCTitle}`);
} else if (V.rep > 8250) {
- V.PCTitle = ("the prominent " + V.PCTitle);
+ V.PCTitle = (`the prominent ${ V.PCTitle}`);
} else if (V.rep > 7500) {
- V.PCTitle = ("the distinguished " + V.PCTitle);
+ V.PCTitle = (`the distinguished ${ V.PCTitle}`);
} else if (V.rep > 6750) {
- V.PCTitle = ("the admired " + V.PCTitle);
+ V.PCTitle = (`the admired ${ V.PCTitle}`);
} else if (V.rep > 6000) {
- V.PCTitle = ("the esteemed " + V.PCTitle);
+ V.PCTitle = (`the esteemed ${ V.PCTitle}`);
} else if (V.rep > 5250) {
- V.PCTitle = ("the respected " + V.PCTitle);
+ V.PCTitle = (`the respected ${ V.PCTitle}`);
} else if (V.rep > 4500) {
- V.PCTitle = ("the known " + V.PCTitle);
+ V.PCTitle = (`the known ${ V.PCTitle}`);
} else if (V.rep > 3750) {
- V.PCTitle = ("the recognized " + V.PCTitle);
+ V.PCTitle = (`the recognized ${ V.PCTitle}`);
} else if (V.rep > 3000) {
- V.PCTitle = ("the rumored " + V.PCTitle);
+ V.PCTitle = (`the rumored ${ V.PCTitle}`);
}
- V.PCTitle = (V.PCTitle + ", ");
+ V.PCTitle = (`${V.PCTitle }, `);
if (V.PC.name === "FC Dev") {
titles.push("the Creator");
@@ -635,7 +639,7 @@ window.PCTitle = function PCTitle() {
}
if (V.SF.Active < -1) {
- switch(V.SF.BadOutcome) {
+ switch (V.SF.BadOutcome) {
case "lockdown":
titles.push("The War Host");
break;
@@ -645,22 +649,24 @@ window.PCTitle = function PCTitle() {
case "Exodus":
titles.push("The Abandoned");
break;
+ default:
+ break;
}
}
if (V.mercenaries >= 5) {
if (V.mercenariesTitle === "Evocati") {
- titles.push("Princeps of the " + V.mercenariesTitle);
+ titles.push(`Princeps of the ${ V.mercenariesTitle}`);
} else if (V.mercenariesTitle === "Knights") {
if (V.PC.title === 1) {
- titles.push("Lord Commander of the " + V.mercenariesTitle);
+ titles.push(`Lord Commander of the ${ V.mercenariesTitle}`);
} else {
- titles.push("Lady Commander of the " + V.mercenariesTitle);
+ titles.push(`Lady Commander of the ${ V.mercenariesTitle}`);
}
} else if (V.mercenariesTitle === "Immortals") {
- titles.push("Tyrant of the " + V.mercenariesTitle);
+ titles.push(`Tyrant of the ${ V.mercenariesTitle}`);
} else {
- titles.push("Commander of the " + V.mercenariesTitle);
+ titles.push(`Commander of the ${ V.mercenariesTitle}`);
}
} else if (V.mercenaries >= 1) {
titles.push("Commander of the Mercenaries");
@@ -1007,9 +1013,9 @@ window.PCTitle = function PCTitle() {
if (schoolsPerfected.length === 1) {
schoolTitle += schoolsPerfected[0];
} else if (schoolsPerfected.length === 2) {
- schoolTitle += schoolsPerfected[0] + " and " + schoolsPerfected[1];
+ schoolTitle += `${schoolsPerfected[0] } and ${ schoolsPerfected[1]}`;
} else {
- schoolsPerfected[schoolsPerfected.length - 1] = "and " + schoolsPerfected[schoolsPerfected.length - 1];
+ schoolsPerfected[schoolsPerfected.length - 1] = `and ${ schoolsPerfected[schoolsPerfected.length - 1]}`;
schoolTitle += schoolsPerfected.join(", ");
}
titles.push(schoolTitle);
@@ -1020,9 +1026,9 @@ window.PCTitle = function PCTitle() {
if (schoolsPresent.length === 1) {
schoolTitle += schoolsPresent[0];
} else if (schoolsPresent.length === 2) {
- schoolTitle += schoolsPresent[0] + " and " + schoolsPresent[1];
+ schoolTitle += `${schoolsPresent[0] } and ${ schoolsPresent[1]}`;
} else {
- schoolsPresent[schoolsPresent.length - 1] = "and " + schoolsPresent[schoolsPresent.length - 1];
+ schoolsPresent[schoolsPresent.length - 1] = `and ${ schoolsPresent[schoolsPresent.length - 1]}`;
schoolTitle += schoolsPresent.join(", ");
}
titles.push(schoolTitle);
@@ -1091,9 +1097,9 @@ window.PCTitle = function PCTitle() {
if (titles.length === 1) {
V.PCTitle += titles[0];
} else if (titles.length === 2) {
- V.PCTitle += titles[0] + " and " + titles[1];
+ V.PCTitle += `${titles[0] } and ${ titles[1]}`;
} else {
- titles[titles.length - 1] = "and " + titles[titles.length - 1];
+ titles[titles.length - 1] = `and ${ titles[titles.length - 1]}`;
V.PCTitle += titles.join(", ");
}
};
@@ -1189,104 +1195,104 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
if (slave.visualAge < 13) {
if (slave.genes === "XY" && slave.vagina === -1) {
- r = "shota " + r;
+ r = `shota ${ r}`;
} else {
- r = "loli " + r;
+ r = `loli ${ r}`;
}
}
if (slave.geneticQuirks.albinism === 2) {
- r = "albino " + r;
+ r = `albino ${ r}`;
}
if (slave.dick > 9 && slave.balls > 9 && slave.boobs > 12000) {
- r = "hyper " + r;
+ r = `hyper ${ r}`;
}
if (slave.boobs > 4000 && slave.lactation > 0) {
if (slave.physicalAge < 13) {
- r = r + " calf";
+ r = `${r } calf`;
} else {
- r = r + " cow";
+ r = `${r } cow`;
}
} else if (slave.lactation > 0) {
- r = "milky " + r;
+ r = `milky ${ r}`;
}
if (slave.boobs > 20000) {
- r = "supermassive titted " + r;
+ r = `supermassive titted ${ r}`;
} else if (slave.boobs > 10000) {
- r = "giant titted " + r;
+ r = `giant titted ${ r}`;
} else if (slave.boobs > 4000) {
- r = "huge titted " + r;
+ r = `huge titted ${ r}`;
} else if (slave.boobs > 1000) {
- r = "busty " + r;
+ r = `busty ${ r}`;
}
if (slave.dick > 5 && slave.balls > 5) {
- r = "womb filling " + r;
+ r = `womb filling ${ r}`;
} else if (slave.dick > 5) {
- r = "well hung " + r;
+ r = `well hung ${ r}`;
}
if (slave.butt >= 12) {
- r = "colossal assed " + r;
+ r = `colossal assed ${ r}`;
} else if (slave.butt >= 12) {
- r = "massive assed " + r;
+ r = `massive assed ${ r}`;
} else if (slave.butt >= 8) {
- r = "fat assed " + r;
+ r = `fat assed ${ r}`;
} else if (slave.butt >= 6) {
- r = "bottom heavy " + r;
+ r = `bottom heavy ${ r}`;
} else if (slave.butt >= 4) {
- r = "big bottomed " + r;
+ r = `big bottomed ${ r}`;
}
if (slave.weight > 10 && slave.weight < 100 && slave.boobs > 5000 && slave.butt > 5 && slave.hips >= 2 && slave.bellyPreg >= 30000 && slave.births >= 10) {
- r = r + " fertility goddess";
+ r = `${r } fertility goddess`;
} else if (slave.births >= 6) {
- r = r + " broodmother";
+ r = `${r } broodmother`;
} else if (slave.births >= 3) {
- r = r + " breeder";
+ r = `${r } breeder`;
}
if (slave.indenture > -1) {
- r = "indentured " + r;
+ r = `indentured ${ r}`;
}
if (slave.preg > slave.pregData.normalBirth/4 && slave.pregKnown === 1) {
- r = "pregnant " + r;
+ r = `pregnant ${ r}`;
} else if (slave.bellyFluid >= 5000) {
- r = "bloated " + r;
+ r = `bloated ${ r}`;
} else if (slave.belly >= 5000) {
- r = "gravid " + r;
+ r = `gravid ${ r}`;
}
if (slave.fuckdoll > 0) {
- r = r + " fuckdoll";
+ r = `${r } fuckdoll`;
}
} else {
r = "slave"; /* I don't tihnk there is an 'else'? */
if ((slave.dick === 0) && (slave.vagina === -1)) { /* NULLS */
r = "null";
if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + " cow";
+ r = `${r } cow`;
} else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo ";
+ r = `${r } bimbo `;
} else if (slave.boobs > 6000) {
- r = r + " boob";
+ r = `${r } boob`;
} else if (slave.butt > 6) {
- r = r + " ass";
+ r = `${r } ass`;
} else if ((slave.muscles > 30) && (slave.height < 185)) {
- r = r + " muscle";
+ r = `${r } muscle`;
}
if (slave.visualAge > 55) {
- r = r + "GILF";
+ r = `${r }GILF`;
} else if (slave.visualAge > 35) {
- r = r + "MILF";
+ r = `${r }MILF`;
} else if (slave.visualAge >= 25) {
- r = r + "slave";
+ r = `${r }slave`;
} else {
- r = r + "girl";
+ r = `${r }girl`;
}
}
@@ -1301,15 +1307,15 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
r = "slavegirl";
}
if ((slave.muscles > 30) && (slave.height < 185)) {
- r = "muscle " + r;
+ r = `muscle ${ r}`;
} else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + " cow";
+ r = `${r } cow`;
} else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo";
+ r = `${r } bimbo`;
} else if (slave.boobs > 6000) {
- r = "boob" + r;
+ r = `boob${ r}`;
} else if (slave.butt > 6) {
- r = "ass" + r;
+ r = `ass${ r}`;
}
}
@@ -1320,27 +1326,27 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
r = "futa ";
}
if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + "cow";
+ r = `${r }cow`;
} else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + "bimbo ";
+ r = `${r }bimbo `;
} else if (slave.boobs > 6000) {
- r = r + "boob";
+ r = `${r }boob`;
} else if (slave.butt > 6) {
- r = r + "ass";
+ r = `${r }ass`;
} else if ((slave.muscles > 30) && (slave.height < 185)) {
- r = r + "muscle";
+ r = `${r }muscle`;
}
if (slave.visualAge > 55) {
- r = r + "GILF";
+ r = `${r }GILF`;
} else if (slave.visualAge > 35) {
- r = r + "MILF";
+ r = `${r }MILF`;
} else if (slave.visualAge >= 25) {
- r = r + "slave";
+ r = `${r }slave`;
} else {
- r = r + "girl";
+ r = `${r }girl`;
}
if (slave.dick > 5 && slave.balls > 5 && slave.boobs > 5000) {
- r = "hyper " + r;
+ r = `hyper ${ r}`;
}
}
@@ -1355,15 +1361,15 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
r = "tgirl";
}
if ((slave.muscles > 30) && (slave.height < 185)) {
- r = "muscle" + r;
+ r = `muscle${ r}`;
} else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + " cow";
+ r = `${r } cow`;
} else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo";
+ r = `${r } bimbo`;
} else if (slave.boobs > 6000) {
- r = "topheavy " + r;
+ r = `topheavy ${ r}`;
} else if (slave.butt > 6) {
- r = "bottomheavy " + r;
+ r = `bottomheavy ${ r}`;
}
}
@@ -1390,9 +1396,9 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
}
}
if (slave.lactation > 0) {
- r = r + " cow";
+ r = `${r } cow`;
} else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo";
+ r = `${r } bimbo`;
}
}
}
@@ -1403,18 +1409,18 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
if ((slave.shoulders > 1) || (slave.muscles >= 30)) { /* BITCHES: masculine shoulders or muscles */
r = "bitch";
if ((slave.muscles > 30) && (slave.height < 185)) {
- r = "muscle" + r;
+ r = `muscle${ r}`;
} else if (slave.lactation > 0) {
- r = r + "cow";
+ r = `${r }cow`;
} else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = "bimbo " + r;
+ r = `bimbo ${ r}`;
}
if (slave.visualAge > 55) {
- r = "aged " + r;
+ r = `aged ${ r}`;
} else if (slave.visualAge > 35) {
- r = "mature " + r;
+ r = `mature ${ r}`;
} else if (slave.visualAge < 25) {
- r = "young " + r;
+ r = `young ${ r}`;
}
}
}
@@ -1423,61 +1429,61 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
if ((slave.dick !== 0) && (slave.vagina === -1) && (slave.balls === 0)) {
r = "dick";
if (slave.visualAge > 55) {
- r = r + "GILF";
+ r = `${r }GILF`;
} else if (slave.visualAge > 35) {
- r = r + "MILF";
+ r = `${r }MILF`;
} else if (slave.visualAge >= 25) {
- r = r + "slave";
+ r = `${r }slave`;
} else {
- r = r + "girl";
+ r = `${r }girl`;
}
if ((slave.muscles > 30) && (slave.height < 185)) {
- r = "muscle" + r;
+ r = `muscle${ r}`;
} else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + " cow";
+ r = `${r } cow`;
} else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo";
+ r = `${r } bimbo`;
} else if (slave.boobs > 6000) {
- r = "boob " + r;
+ r = `boob ${ r}`;
} else if (slave.butt > 6) {
- r = "ass " + r;
+ r = `ass ${ r}`;
}
}
if ((slave.muscles > 30) && (slave.height > 185)) {
- r = "amazon " + r;
+ r = `amazon ${ r}`;
} else if ((slave.muscles < 30) && (slave.height > 185)) {
- r = "statuesque " + r;
+ r = `statuesque ${ r}`;
} else if ((slave.boobs < 800) && (slave.height < 150)) {
- r = "petite " + r;
+ r = `petite ${ r}`;
} else if ((slave.boobs > 800) && (slave.height < 150)) {
- r = "shortstack " + r;
+ r = `shortstack ${ r}`;
}
if (slave.births >= 5) {
- r = r + " broodmother";
+ r = `${r } broodmother`;
} else if (slave.births >= 2) {
- r = r + " breeder";
+ r = `${r } breeder`;
}
if (slave.geneticQuirks.albinism === 2) {
- r = "albino " + r;
+ r = `albino ${ r}`;
}
if (slave.indenture > -1) {
- r = "indentured " + r;
+ r = `indentured ${ r}`;
}
if (slave.preg > slave.pregData.normalBirth/4 && slave.pregKnown === 1) {
- r = "pregnant " + r;
+ r = `pregnant ${ r}`;
} else if (slave.bellyFluid >= 5000) {
- r = "bloated " + r;
+ r = `bloated ${ r}`;
} else if (slave.belly >= 5000) {
- r = "gravid " + r;
+ r = `gravid ${ r}`;
}
if (slave.fuckdoll > 0) {
- r = r + " fuckdoll";
+ r = `${r } fuckdoll`;
}
}
return r;
@@ -1504,10 +1510,10 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
const suffixes = [];
if (slave.fuckdoll > 0) {
- slave.slaveName = "Fuckdoll No. " + slave.ID;
+ slave.slaveName = `Fuckdoll No. ${ slave.ID}`;
slave.slaveSurname = 0;
} else if (slave.assignment === "work in the dairy" && V.dairyRestraintsSetting >= 2) {
- slave.slaveName = "Bioreactor No. " + slave.ID;
+ slave.slaveName = `Bioreactor No. ${ slave.ID}`;
slave.slaveSurname = 0;
} else {
if (V.seeRace === 1) {
@@ -1548,6 +1554,8 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
case "mixed race":
names.push("Mixed", "Mulatto", "Mutt");
break;
+ default:
+ break;
}
}
names.push(slave.hColor);
@@ -1600,7 +1608,7 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
names.push("Creamy", "Milky");
suffixes.push("Cow");
}
- if (slave.oralSkill <= 30 && slave.analSkill <= 30) {
+ if (slave.skill.oral <= 30 && slave.skill.anal <= 30) {
names.push("Cheap", "Fail", "Gutter");
}
if (slave.nipples === "fuckable") {
@@ -1670,22 +1678,22 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
names.push("Stumpy", "Tiny");
suffixes.push("Shortstack", "Stumpy");
}
- if (slave.whoreSkill > 95) {
+ if (slave.skill.whore > 95) {
names.push("Money", "Street");
suffixes.push("Whore");
}
- if (slave.entertainSkill > 95) {
+ if (slave.skill.entertainment > 95) {
names.push("Easy", "Club");
suffixes.push("Slut");
}
- if (slave.oralSkill > 95) {
+ if (slave.skill.oral > 95) {
names.push("Suck");
suffixes.push("Throat");
}
- if (slave.vaginalSkill > 95) {
+ if (slave.skill.vaginal > 95) {
suffixes.push("Channel", "Kegel", "Pussy");
}
- if (slave.analSkill > 95) {
+ if (slave.skill.anal > 95) {
suffixes.push("Asspussy", "Sphincter");
}
if (slave.intelligence+slave.intelligenceImplant > 50) {
@@ -1696,7 +1704,7 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
} else if (slave.intelligence+slave.intelligenceImplant < -50) {
names.push("Cretin", "Dumb", "Retarded", "Stupid");
}
- if (slave.vagina === 1 && slave.vaginalSkill <= 10) {
+ if (slave.vagina === 1 && slave.skill.vaginal <= 10) {
names.push("Fresh", "New", "Tight");
}
if (slave.devotion < -75) {
@@ -1869,6 +1877,8 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
case "recruit girls":
slave.slaveName = jsEither(["Cam", "Recruiter"]);
break;
+ default:
+ break;
}
}
const surname = jsEither(suffixes);
@@ -2018,13 +2028,13 @@ window.Deadliness = /** @param {App.Entity.SlaveState} slave */ function Deadlin
const V = State.variables;
let deadliness = 2;
- if (slave.combatSkill > 0) {
+ if (slave.skill.combat > 0) {
deadliness += 2;
}
if (setup.bodyguardCareers.includes(slave.career)) {
deadliness += 1;
- } else if (slave.skillBG >= V.masteredXP) {
+ } else if (slave.skill.bodyguard >= V.masteredXP) {
deadliness += 1;
}
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 6ba508289009b8f3c706bbfcaa78acc486bd7fde..2299751ea2a66f755c4d3bace45ff22bfa8ec46a 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -13,6 +13,7 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function () {
/** @param {App.Entity.SlaveState} slave */
function SlaveDataSchemeCleanup(slave) { // eslint-disable-line no-unused-vars
migratePorn(slave);
+ migrateSkills(slave);
}
/** @param {App.Entity.SlaveState} slave */
@@ -40,7 +41,52 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function () {
delete slave["pornFocus"];
}
}
+ }
+ /** @param {App.Entity.SlaveState} slave */
+ function migrateSkills(slave) {
+ if (!slave.hasOwnProperty("skill")) {
+ slave.skill = new App.Entity.SlaveSkillsState();
+ slave.skill.anal = slave["analSkill"];
+ slave.skill.combat = slave["combatSkill"];
+ slave.skill.entertainment = slave["entertainSkill"];
+ slave.skill.oral = slave["oralSkill"];
+ slave.skill.vaginal = slave["vaginalSkill"];
+ slave.skill.whore = slave["whoreSkill"];
+ delete slave["analSkill"];
+ delete slave["combatSkill"];
+ delete slave["entertainSkill"];
+ delete slave["oralSkill"];
+ delete slave["vaginalSkill"];
+ delete slave["whoreSkill"];
+
+ const nameMap = {
+ "HG": "headGirl",
+ "RC": "recruiter",
+ "BG": "bodyguard",
+ "MD": "madam",
+ "DJ": "DJ",
+ "NU": "nurse",
+ "TE": "teacher",
+ "AT": "attendant",
+ "MT": "matron",
+ "ST": "stewardess",
+ "MM": "milkmaid",
+ "FA": "farmer",
+ "WA": "wardeness",
+ "S": "servant",
+ "E": "entertainer",
+ "W": "whore"
+ };
+ for (let prop in slave) {
+ const skillStr = "skill";
+ if (prop.length > skillStr.length && prop.startsWith(skillStr)) {
+ let skillName = prop.substr(skillStr.length);
+ slave.skill[nameMap[skillName]] = slave[prop];
+ delete slave[prop];
+ }
+ }
+ }
}
})();
@@ -76,7 +122,10 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
let V;
return SlaveDatatypeCleanup;
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @param {number} isIncubatorSlave
+ */
function SlaveDatatypeCleanup(slave, isIncubatorSlave) {
V = State.variables;
if (isIncubatorSlave !== true)
@@ -289,6 +338,7 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
if (typeof slave.ovaImplant !== "string") {
slave.ovaImplant = 0;
}
+ slave.fertPeak = Math.clamp(+slave.fertPeak, 0, 4) || 0;
slave.broodmother = Math.clamp(+slave.broodmother, 0, 3) || 0;
slave.broodmotherFetuses = Math.max(+slave.broodmotherFetuses, 0) || 0;
slave.broodmotherOnHold = Math.clamp(+slave.broodmotherOnHold, 0, 1) || 0;
@@ -452,7 +502,7 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
slave.vaginalAccessory = "none";
}
if (typeof slave.vaginalAttachment !== "string") {
- slave.vaginalAttachments = "none";
+ slave.vaginalAttachment = "none";
}
if (typeof slave.dickAccessory !== "string") {
slave.dickAccessory = "none";
@@ -563,28 +613,28 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
/** @param {App.Entity.SlaveState} slave */
function slaveSkillsDatatypeCleanup(slave) {
- slave.oralSkill = Math.clamp(+slave.oralSkill, 0, 100) || 0;
- slave.vaginalSkill = Math.clamp(+slave.vaginalSkill, 0, 100) || 0;
- slave.analSkill = Math.clamp(+slave.analSkill, 0, 100) || 0;
- slave.whoreSkill = Math.clamp(+slave.whoreSkill, 0, 100) || 0;
- slave.entertainSkill = Math.clamp(+slave.entertainSkill, 0, 100) || 0;
- slave.combatSkill = Math.clamp(+slave.combatSkill, 0, 1) || 0;
- slave.skillHG = Math.clamp(+slave.skillHG, 0, 200) || 0;
- slave.skillRC = Math.clamp(+slave.skillRC, 0, 200) || 0;
- slave.skillBG = Math.clamp(+slave.skillBG, 0, 200) || 0;
- slave.skillMD = Math.clamp(+slave.skillMD, 0, 200) || 0;
- slave.skillDJ = Math.clamp(+slave.skillDJ, 0, 200) || 0;
- slave.skillNU = Math.clamp(+slave.skillNU, 0, 200) || 0;
- slave.skillTE = Math.clamp(+slave.skillTE, 0, 200) || 0;
- slave.skillAT = Math.clamp(+slave.skillAT, 0, 200) || 0;
- slave.skillMT = Math.clamp(+slave.skillMT, 0, 200) || 0;
- slave.skillST = Math.clamp(+slave.skillST, 0, 200) || 0;
- slave.skillMM = Math.clamp(+slave.skillMM, 0, 200) || 0;
- slave.skillFA = Math.clamp(+slave.skillFA, 0, 200) || 0;
- slave.skillWA = Math.clamp(+slave.skillWA, 0, 200) || 0;
- slave.skillS = Math.clamp(+slave.skillS, 0, 200) || 0;
- slave.skillE = Math.clamp(+slave.skillE, 0, 200) || 0;
- slave.skillW = Math.clamp(+slave.skillW, 0, 200) || 0;
+ slave.skill.oral = Math.clamp(+slave.skill.oral, 0, 100) || 0;
+ slave.skill.vaginal = Math.clamp(+slave.skill.vaginal, 0, 100) || 0;
+ slave.skill.anal = Math.clamp(+slave.skill.anal, 0, 100) || 0;
+ slave.skill.whore = Math.clamp(+slave.skill.whore, 0, 100) || 0;
+ slave.skill.entertainment = Math.clamp(+slave.skill.entertainment, 0, 100) || 0;
+ slave.skill.combat = Math.clamp(+slave.skill.combat, 0, 1) || 0;
+ slave.skill.headGirl = Math.clamp(+slave.skill.headGirl, 0, 200) || 0;
+ slave.skill.recruiter = Math.clamp(+slave.skill.recruiter, 0, 200) || 0;
+ slave.skill.bodyguard = Math.clamp(+slave.skill.bodyguard, 0, 200) || 0;
+ slave.skill.madam = Math.clamp(+slave.skill.madam, 0, 200) || 0;
+ slave.skill.DJ = Math.clamp(+slave.skill.DJ, 0, 200) || 0;
+ slave.skill.nurse = Math.clamp(+slave.skill.nurse, 0, 200) || 0;
+ slave.skill.teacher = Math.clamp(+slave.skill.teacher, 0, 200) || 0;
+ slave.skill.attendant = Math.clamp(+slave.skill.attendant, 0, 200) || 0;
+ slave.skill.matron = Math.clamp(+slave.skill.matron, 0, 200) || 0;
+ slave.skill.stewardess = Math.clamp(+slave.skill.stewardess, 0, 200) || 0;
+ slave.skill.milkmaid = Math.clamp(+slave.skill.milkmaid, 0, 200) || 0;
+ slave.skill.farmer = Math.clamp(+slave.skill.farmer, 0, 200) || 0;
+ slave.skill.wardeness = Math.clamp(+slave.skill.wardeness, 0, 200) || 0;
+ slave.skill.servant = Math.clamp(+slave.skill.servant, 0, 200) || 0;
+ slave.skill.entertainer = Math.clamp(+slave.skill.entertainer, 0, 200) || 0;
+ slave.skill.whore = Math.clamp(+slave.skill.whore, 0, 200) || 0;
}
/** @param {App.Entity.SlaveState} slave */
@@ -898,6 +948,7 @@ window.childPregnancyDatatypeCleanup = function childPregnancyDatatypeCleanup(ch
if (typeof child.pregControl !== "string") {
child.pregControl = "none";
}
+ child.fertPeak = Math.clamp(+child.fertPeak, 0, 4) || 0;
WombNormalizePreg(child);
};
@@ -1030,7 +1081,7 @@ window.childCosmeticsDatatypeCleanup = function childCosmeticsDatatypeCleanup(ch
child.vaginalAccessory = "none";
}
if (typeof child.vaginalAttachment !== "string") {
- child.vaginalAttachments = "none";
+ child.vaginalAttachment = "none";
}
if (typeof child.dickAccessory !== "string") {
child.dickAccessory = "none";
@@ -1136,28 +1187,28 @@ window.childRelationDatatypeCleanup = function childRelationDatatypeCleanup(chil
};
window.childSkillsDatatypeCleanup = function childSkillsDatatypeCleanup(child) {
- child.oralSkill = Math.clamp(+child.oralSkill, 0, 100) || 0;
- child.vaginalSkill = Math.clamp(+child.vaginalSkill, 0, 100) || 0;
- child.analSkill = Math.clamp(+child.analSkill, 0, 100) || 0;
- child.whoreSkill = Math.clamp(+child.whoreSkill, 0, 100) || 0;
- child.entertainSkill = Math.clamp(+child.entertainSkill, 0, 100) || 0;
- child.combatSkill = Math.clamp(+child.combatSkill, 0, 1) || 0;
- child.skillHG = Math.clamp(+child.skillHG, 0, 200) || 0;
- child.skillRC = Math.clamp(+child.skillRC, 0, 200) || 0;
- child.skillBG = Math.clamp(+child.skillBG, 0, 200) || 0;
- child.skillMD = Math.clamp(+child.skillMD, 0, 200) || 0;
- child.skillDJ = Math.clamp(+child.skillDJ, 0, 200) || 0;
- child.skillNU = Math.clamp(+child.skillNU, 0, 200) || 0;
- child.skillTE = Math.clamp(+child.skillTE, 0, 200) || 0;
- child.skillAT = Math.clamp(+child.skillAT, 0, 200) || 0;
- child.skillMT = Math.clamp(+child.skillMT, 0, 200) || 0;
- child.skillST = Math.clamp(+child.skillST, 0, 200) || 0;
- child.skillMM = Math.clamp(+child.skillMM, 0, 200) || 0;
- child.skillFA = Math.clamp(+child.skillFA, 0, 200) || 0;
- child.skillWA = Math.clamp(+child.skillWA, 0, 200) || 0;
- child.skillS = Math.clamp(+child.skillS, 0, 200) || 0;
- child.skillE = Math.clamp(+child.skillE, 0, 200) || 0;
- child.skillW = Math.clamp(+child.skillW, 0, 200) || 0;
+ child.skill.oral = Math.clamp(+child.skill.oral, 0, 100) || 0;
+ child.skill.vaginal = Math.clamp(+child.skill.vaginal, 0, 100) || 0;
+ child.skill.anal = Math.clamp(+child.skill.anal, 0, 100) || 0;
+ child.skill.whore = Math.clamp(+child.skill.whore, 0, 100) || 0;
+ child.skill.entertainment = Math.clamp(+child.skill.entertainment, 0, 100) || 0;
+ child.skill.combat = Math.clamp(+child.skill.combat, 0, 1) || 0;
+ child.skill.headGirl = Math.clamp(+child.skill.headGirl, 0, 200) || 0;
+ child.skill.recruiter = Math.clamp(+child.skill.recruiter, 0, 200) || 0;
+ child.skill.bodyguard = Math.clamp(+child.skill.bodyguard, 0, 200) || 0;
+ child.skill.madam = Math.clamp(+child.skill.madam, 0, 200) || 0;
+ child.skill.DJ = Math.clamp(+child.skill.DJ, 0, 200) || 0;
+ child.skill.nurse = Math.clamp(+child.skill.nurse, 0, 200) || 0;
+ child.skill.teacher = Math.clamp(+child.skill.teacher, 0, 200) || 0;
+ child.skill.attendant = Math.clamp(+child.skill.attendant, 0, 200) || 0;
+ child.skill.matron = Math.clamp(+child.skill.matron, 0, 200) || 0;
+ child.skill.stewardess = Math.clamp(+child.skill.stewardess, 0, 200) || 0;
+ child.skill.milkmaid = Math.clamp(+child.skill.milkmaid, 0, 200) || 0;
+ child.skill.farmer = Math.clamp(+child.skill.farmer, 0, 200) || 0;
+ child.skill.wardeness = Math.clamp(+child.skill.wardeness, 0, 200) || 0;
+ child.skill.servant = Math.clamp(+child.skill.servant, 0, 200) || 0;
+ child.skill.entertainer = Math.clamp(+child.skill.entertainer, 0, 200) || 0;
+ child.skill.whore = Math.clamp(+child.skill.whore, 0, 200) || 0;
};
window.childStatCountDatatypeCleanup = function childStatCountDatatypeCleanup(child) {
@@ -1252,6 +1303,7 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
}
PC.vagina = Math.clamp(+PC.vagina, 0, 1) || 0;
PC.belly = Math.max(+PC.belly, 0) || 0;
+ PC.fertPeak = Math.clamp(+PC.fertPeak, 0, 4) || 0;
PC.pregMood = Math.clamp(+PC.pregMood, 0, 2) || 0;
PC.labor = Math.clamp(+PC.labor, 0, 1) || 0;
PC.births = Math.max(+PC.births, 0) || 0;
@@ -1786,4 +1838,4 @@ App.Entity.Utils.GenePoolRecordCleanup = (function () {
"slaveCost"
].forEach((s) => delete slave[s]);
}
-})();
\ No newline at end of file
+})();
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index c743e1e1e585459a225c4bc23da0f40992196f6d..eb1058eff1ac6ea21211d065c7377be04251644b 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -1,16 +1,23 @@
-App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+App.Desc.eyes =
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @return {string} Slave's eyes
+ */
+function (slave) {
"use strict";
const V = State.variables;
let r = ``;
- var pronouns = getPronouns(slave);
- var he = pronouns.pronoun;
- var him = pronouns.object;
- var his = pronouns.possessive;
- var hers = pronouns.possessivePronoun;
- var himself = pronouns.objectReflexive;
- var boy = pronouns.noun;
- var He = capFirstChar(he);
- var His = capFirstChar(his);
+ /* eslint-disable */
+ let pronouns = getPronouns(slave);
+ let he = pronouns.pronoun;
+ let him = pronouns.object;
+ let his = pronouns.possessive;
+ let hers = pronouns.possessivePronoun;
+ let himself = pronouns.objectReflexive;
+ let boy = pronouns.noun;
+ let He = capFirstChar(he);
+ let His = capFirstChar(his);
+ /* eslint-enable */
if (slave.eyes === -2) {
const HC = hasVisibleHeterochromia(slave) ? 1 : 0;
@@ -131,7 +138,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
}
} else {
if (slave.intelligence > 95) {
- r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
+ r += `${His} ${App.Desc.eyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
if (slave.intelligence + slave.intelligenceImplant >= 130) {
r += `with ${his} education, ${he} is so far <span class=deepskyblue>beyond brilliant</span> that ${he} is nearly peerless.`;
} else if (slave.intelligenceImplant >= 15) {
@@ -150,16 +157,16 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
r += `education is unimportant.`;
}
} else if (slave.intelligence > 50) {
- r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
+ r += `${His} ${App.Desc.eyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
if (slave.intelligence + slave.intelligenceImplant >= 95) {
- r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is both <span class=deepskyblue>highly intelligent</span> and `;
+ r += `${His} ${App.Desc.eyeColor(slave)} eyes are alive with intelligence; ${he} is both <span class=deepskyblue>highly intelligent</span> and `;
} else if (slave.intelligenceImplant >= 15) {
r += `well `;
if (slave.intelligenceImplant >= 30) {
r += `educated.`;
}
} else {
- r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `;
+ r += `${His} ${App.Desc.eyeColor(slave)} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `;
if (slave.intelligenceImplant > 0) {
r += `meager `;
} else {
@@ -168,7 +175,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
r += `education is unimportant.`;
}
} else if (slave.intelligence > 15) {
- r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
+ r += `${His} ${App.Desc.eyeColor(slave)} eyes are `;
if (slave.intelligence + slave.intelligenceImplant >= 50) {
r += `alive with intelligence; with ${his} education, ${he} can be considered <span class=deepskyblue>highly intelligent.</span>`;
} else if (slave.intelligenceImplant >= 15) {
@@ -181,7 +188,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> despite being undereducated.`;
}
} else if (slave.intelligence >= -15) {
- r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
+ r += `${His} ${App.Desc.eyeColor(slave)} eyes are `;
if (slave.intelligence + slave.intelligenceImplant >= 15) {
r += `clever; with ${his} education, ${he} can be considered of <span class=deepskyblue>above average intelligence.</span>`;
} else if (slave.intelligenceImplant >= 15) {
@@ -194,7 +201,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
r += `alert; ${he} is of average intelligence and is undereducated.`;
}
} else if (slave.intelligence >= -50) {
- r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
+ r += `${His} ${App.Desc.eyeColor(slave)} eyes are `;
if (slave.intelligence + slave.intelligenceImplant >= -15) {
r += `alert; with ${his} education, ${he} can be considered of average intelligence.`;
} else if (slave.intelligenceImplant >= 15) {
@@ -209,7 +216,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
r += `dim; even with ${his} education, ${he} can only be considered of <span class=orangered>below average intelligence.</span>`;
}
} else if (slave.intelligence >= -95) {
- r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
+ r += `${His} ${App.Desc.eyeColor(slave)} eyes are `;
if (slave.intelligence + slave.intelligenceImplant >= -50) {
r += `dull; ${he} is <span class=orangered>quite stupid</span> despite having `;
} else if (slave.intelligenceImplant >= 15) {
@@ -222,7 +229,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
r += `dull; ${he} is <span class=orangered>quite stupid</span> and ignorant.`;
}
} else {
- r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze betrays near-total insensibility; `;
+ r += `${His} ${App.Desc.eyeColor(slave)}-eyed gaze betrays near-total insensibility; `;
if (slave.intelligence + slave.intelligenceImplant >= -95) {
r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`;
} else if (slave.intelligenceImplant > 0) {
@@ -235,7 +242,12 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
return r;
}
-App.Desc.EyeColor = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+App.Desc.eyeColor =
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string} Slave's eye color
+ */
+function (slave) {
"use strict";
let r;
@@ -247,21 +259,29 @@ App.Desc.EyeColor = /** @param {App.Entity.SlaveState} slave */ function (slave)
return r;
}
-App.Desc.AgeAndHealth = /** @param {App.Entity.SlaveState} slave */ function (slave) {
- /* TODO: should age and health be split into two widgets? */
+App.Desc.ageAndHealth =
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+function (slave) {
"use strict";
const V = State.variables;
let r = ``;
- var pronouns = getPronouns(slave);
- var he = pronouns.pronoun;
- var him = pronouns.object;
- var his = pronouns.possessive;
- var hers = pronouns.possessivePronoun;
- var himself = pronouns.objectReflexive;
- var boy = pronouns.noun;
- var He = capFirstChar(he);
- var His = capFirstChar(his);
- let woman = boy === "girl" ? "woman" : "man";
+ let woman;
+ /* eslint-disable */
+ let pronouns = getPronouns(slave);
+ let he = pronouns.pronoun;
+ let him = pronouns.object;
+ let his = pronouns.possessive;
+ let hers = pronouns.possessivePronoun;
+ let himself = pronouns.objectReflexive;
+ let boy = pronouns.noun;
+ let He = capFirstChar(he);
+ let His = capFirstChar(his);
+ /* eslint-enable */
+
+ (boy === "girl" ? woman = "woman" : woman = "man");
if (!slave.fuckdoll) {
if (slave.health < -90) {
@@ -626,4 +646,483 @@ App.Desc.AgeAndHealth = /** @param {App.Entity.SlaveState} slave */ function (sl
r += ` and ${slave.physicalAge} years old.`;
}
return r;
-}
\ No newline at end of file
+}
+
+App.Desc.brand =
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string} Slave's brand
+ */
+function (slave) {
+ "use strict";
+ let r = ``;
+ let bellyAccessory;
+ /* eslint-disable */
+ let pronouns = getPronouns(slave);
+ let he = pronouns.pronoun;
+ let him = pronouns.object;
+ let his = pronouns.possessive;
+ let hers = pronouns.possessivePronoun;
+ let himself = pronouns.objectReflexive;
+ let boy = pronouns.noun;
+ let He = capFirstChar(he);
+ let His = capFirstChar(his);
+ /* eslint-enable */
+
+ if (slave.brand) {
+ bellyAccessory = slave.bellyAccessory;
+ if (setup.fakeBellies.includes(bellyAccessory) && slave.brandLocation === "belly") {
+ r += `${His} fake belly has ${slave.brand} branded on it.`;
+ } else {
+ r += `${He} has ${slave.brand} branded into the flesh of ${his} ${slave.brandLocation}.`;
+ }
+ }
+ return r;
+}
+
+App.Desc.amputee =
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string} Description of slave's amputation, if present
+ */
+function (slave) {
+ "use strict";
+ let r = ``;
+ /* eslint-disable */
+ let pronouns = getPronouns(slave);
+ let he = pronouns.pronoun;
+ let him = pronouns.object;
+ let his = pronouns.possessive;
+ let hers = pronouns.possessivePronoun;
+ let himself = pronouns.objectReflexive;
+ let boy = pronouns.noun;
+ let He = capFirstChar(he);
+ let His = capFirstChar(his);
+ /* eslint-enable */
+
+ if (slave.amp) {
+ if (slave.amp === -1) {
+ r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with a set of modern prosthetic limbs that allow ${him} a fairly normal life.`;
+ } else if (slave.amp === -2) {
+ r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized for sex. ${His} fingertips vibrate, ${his} finger joints are masked to prevent pinching, and ${his} hands can dispense lube.`;
+ } else if (slave.amp === -3) {
+ r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized to look natural. They are covered in a material that closely mimics living ${slave.skin} skin, and their servos are noise dampened.`;
+ } else if (slave.amp === -4) {
+ r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized for combat. They're hardened, strengthened, and more responsive, and they conceal taser knuckles and extensible forearm blades.`;
+ } else if (slave.amp === -5) {
+ r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with advanced cybernetic P-Limbs. The ultimate fusion of combat effectiveness and instruments of pleasure, they're capable of performing multiple functions. They can enhance sex through ${his} vibrating hands and increase ${his} combat skills with hardened, yet flexible artificial muscles. They have an advanced artificial skin that can send electrical impulses that can cause stimulation or extreme pain.`;
+ } else if (slave.amp > 0) {
+ r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> making ${him} a convenient torso-only sex toy.`;
+ } else {
+ r += `The most obvious thing about ${slave.slaveName} is that ${he} is a <span class=pink>quadruple amputee:</span> ${he} has neither arms nor legs.`;
+ }
+ }
+ return r;
+}
+
+App.Desc.waist =
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string} Description of slave's waist
+ */ function (slave) {
+ "use strict";
+ const V = State.variables;
+ let r = ``;
+ let belly;
+ let woman;
+ /* eslint-disable */
+ let pronouns = getPronouns(slave);
+ let he = pronouns.pronoun;
+ let him = pronouns.object;
+ let his = pronouns.possessive;
+ let hers = pronouns.possessivePronoun;
+ let himself = pronouns.objectReflexive;
+ let boy = pronouns.noun;
+ let He = capFirstChar(he);
+ let His = capFirstChar(his);
+ /* eslint-enable */
+
+ (boy === "girl" ? woman = "woman" : woman = "man");
+ if (slave.belly >= 1500) {
+ belly = bellyAdjective(slave);
+ }
+
+ r += `${He} has `;
+ if (slave.waist > 95) {
+ r += `a badly <span class=red>masculine waist</span> that ruins ${his} figure`;
+ if (slave.weight > 30) {
+ r += ` and greatly exaggerates how fat ${he} is.`;
+ } else if (slave.weight < -30) {
+ r += ` despite how thin ${he} is.`;
+ } else {
+ r += `. `;
+
+ }
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 750000) {
+ r += `${His} ${belly} belly grotesquely bulges around ${his} thick waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is horribly distended by ${his} bursting womb in a last ditch effort to find more room for ${his} children, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 300000) {
+ r += `${His} ${belly} belly is hidden by ${his} thick waist.`;
+ } else if (slave.belly < 450000) {
+ r += `${His} ${belly} belly can be seen around ${his} thick waist.`;
+ } else if (slave.belly < 600000) {
+ r += `${His} ${belly} belly can clearly be seen around ${his} thick waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is swollen wider than usual by ${his} crowded womb in its search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 750000) {
+ r += `${His} ${belly} belly lewdly bulges around ${his} thick waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is greatly distended by ${his} overfilled womb in its desperate search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ }
+ }
+ } else if (slave.waist > 40) {
+ r += `a broad, <span class=red>ugly waist</span> that makes ${him} look mannish`
+ if (slave.weight > 30) {
+ r += ` and exaggerates how fat ${he} is.`
+ } else if (slave.weight < -30) {
+ r += ` despite how thin ${he} is.`
+ } else {
+ r += `. `;
+ }
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 750000) {
+ r += `${His} ${belly} belly grotesquely bulges around ${his} chunky waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is horribly distended by ${his} bursting womb in a last ditch effort to find more room for ${his} children, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 150000) {
+ r += `${His} ${belly} belly is hidden by ${his} chunky waist.`;
+ } else if (slave.belly < 450000) {
+ r += `${His} ${belly} belly can be seen around ${his} chunky waist.`;
+ } else if (slave.belly < 600000) {
+ r += `${His} ${belly} belly can clearly be seen around ${his} chunky waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is swollen wider than usual by ${his} crowded womb in its search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 750000) {
+ r += `${His} ${belly} belly lewdly bulges around ${his} chunky waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is greatly distended by ${his} overfilled womb in its desperate search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ }
+ }
+ } else if (slave.waist > 10) {
+ r += `an <span class=red>unattractive waist</span> that conceals ${his} `
+ if (slave.visualAge > 25) {
+ r += `girlish`;
+ } else {
+ r += `womanly`;
+ }
+ r += ` figure`;
+ if (slave.weight > 30) {
+ r += ` and accentuates how fat ${he} is.`;
+ } else if (slave.weight < -30) {
+ r += ` despite how thin ${he} is.`;
+ } else {
+ r += `. `;
+ }
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 750000) {
+ r += `${His} ${belly} belly grotesquely bulges around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is horribly distended by ${his} bursting womb in a last ditch effort to find more room for ${his} children, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 10000) {
+ r += `From behind, ${his} figure hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 200000) {
+ r += `From behind, ${his} figure barely hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 300000) {
+ r += `${His} ${belly} belly can be seen around ${his} waist.`;
+ } else if (slave.belly < 450000) {
+ r += `${His} ${belly} belly can clearly be seen around ${his} waist.`;
+ } else if (slave.belly < 600000) {
+ r += `${His} ${belly} belly can clearly be seen around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is swollen wider than usual by ${his} crowded womb in its search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 750000) {
+ r += `${His} ${belly} belly lewdly bulges around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is greatly distended by ${his} overfilled womb in its desperate search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ }
+ }
+ } else if (slave.waist > -10) {
+ r += `an average waist for a `
+ if (slave.visualAge > 25) {
+ r += `${boy}`;
+ } else {
+ r += `${woman}`;
+ }
+ if (slave.weight > 30) {
+ r += `, though it looks broader since ${he}'s fat.`
+ } else if (slave.weight < -30) {
+ r += `, though it looks narrower since ${he}'s thin.`
+ } else {
+ r += `. `;
+ }
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 750000) {
+ r += `${His} ${belly} belly grotesquely bulges around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is horribly distended by ${his} bursting womb in a last ditch effort to find more room for ${his} children, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 10000) {
+ r += `From behind, ${his} figure hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 200000) {
+ r += `From behind, ${his} figure barely hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 300000) {
+ r += `${His} ${belly} belly can be seen around ${his} waist.`;
+ } else if (slave.belly < 450000) {
+ r += `${His} ${belly} belly can clearly be seen around ${his} waist.`;
+ } else if (slave.belly < 600000) {
+ r += `${His} ${belly} belly can clearly be seen around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is swollen wider than usual by ${his} crowded womb in its search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 750000) {
+ r += `${His} ${belly} belly lewdly bulges around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is greatly distended by ${his} overfilled womb in its desperate search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ }
+ }
+ } else if (slave.waist > -40) {
+ r += `a nice <span class=pink>feminine waist</span> that gives ${him} a `
+ if (slave.visualAge > 25) {
+ r += `girlish`;
+ } else {
+ r += `womanly`;
+ }
+ r += ` figure`;
+ if (slave.weight > 30) {
+ r += ` despite ${his} extra weight.`;
+ } else if (slave.weight < -30) {
+ r += ` and accentuates how thin ${he} is.`;
+ } else {
+ r += `. `;
+ }
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 750000) {
+ r += `${His} ${belly} belly grotesquely bulges around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is horribly distended by ${his} bursting womb in a last ditch effort to find more room for ${his} children, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 10000) {
+ r += `From behind, ${his} figure hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 100000) {
+ r += `From behind, ${his} figure barely hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 300000) {
+ r += `${His} ${belly} belly can be seen around ${his} waist.`;
+ } else if (slave.belly < 450000) {
+ r += `${His} ${belly} belly can clearly be seen around ${his} waist.`;
+ } else if (slave.belly < 600000) {
+ r += `${His} ${belly} belly can clearly be seen around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is swollen wider than usual by ${his} crowded womb in its search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 750000) {
+ r += `${His} ${belly} belly lewdly bulges around ${his} waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is greatly distended by ${his} overfilled womb in its desperate search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ }
+ }
+ } else if (slave.waist > -95) {
+ r += `a hot <span class=pink>wasp waist</span> that gives ${him} an hourglass figure`;
+ if (slave.weight > 30) {
+ r += `despite $his extra weight.`;
+ } else if (slave.weight < -30) {
+ r += `further accentuated by how thin $he is.`;
+ } else {
+ r += `. `;
+ }
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 750000) {
+ r += `${His} ${belly} belly grotesquely bulges around ${his} narrow waist and continues `;
+ if (slave.belly >= 1000000) {
+ r += `quite the distance`;
+ } else {
+ r += `over half a `;
+ if (V.showInches === 2) {
+ r += `yard`;
+ } else {
+ r += `meter`;
+ }
+ r += ` farther to either side.`;
+ }
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is horribly distended by ${his} bursting womb in a last ditch effort to find more room for ${his} children, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 5000) {
+ r += `From behind, ${his} narrow figure hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 80000) {
+ r += `From behind, ${his} narrow figure barely hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 100000) {
+ r += `${His} ${belly} belly can be seen around ${his} narrow waist.`;
+ } else if (slave.belly < 450000) {
+ r += `${His} ${belly} belly lewdly extends past ${his} narrow waist.`;
+ } else if (slave.belly < 600000) {
+ r += `${His} ${belly} belly lewdly distends far to either side of ${his} narrow waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is swollen wider than usual by ${his} crowded womb in its search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 750000) {
+ r += `${His} ${belly} belly lewdly bulges to either side of ${his} narrow waist and continues for nearly half a `
+ if (V.showInches === 2) {
+ r += `yard`;
+ } else {
+ r += `meter`;
+ }
+ r += `in both directions.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is greatly distended by ${his} overfilled womb in its desperate search for more room, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ }
+ }
+ } else {
+ r += `an <span class=pink>absurdly narrow waist</span> that gives ${him} a cartoonishly hourglass figure`
+ if (slave.weight > 30) {
+ r += `made even more ludicrous by ${his} extra weight.`;
+ } else if (slave.weight < -30) {
+ r += `made even more ludicrous by how thin ${he} is.`;
+ } else {
+ r += `. `;
+ }
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 750000) {
+ r += `${His} ${belly} belly grotesquely bulges around ${his} narrow waist and continues `
+ if (slave.belly >= 1000000) {
+ r += `quite the distance`;
+ } else {
+ r += `over half a `;
+ if (V.showInches === 2) {
+ r += `yard`;
+ } else {
+ r += `meter`;
+ }
+ r += ` farther to either side.`;
+ }
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is horribly distended by ${his} bursting womb in a last ditch effort to find more room for ${his} children, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 2000) {
+ r += `From behind, ${his} narrow figure hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 5000) {
+ r += `From behind, ${his} narrow figure barely hides ${his} ${belly} belly.`;
+ } else if (slave.belly < 8000) {
+ r += `${His} ${belly} belly can be seen around ${his} narrow waist.`;
+ } else if (slave.belly < 15000) {
+ r += `${His} ${belly} belly lewdly extends past ${his} narrow waist.`;
+ } else if (slave.belly < 45000) {
+ r += `${His} ${belly} belly lewdly distends far to either side of ${his} narrow waist.`;
+ } else if (slave.belly < 600000) {
+ r += `${His} ${belly} belly lewdly distends far to either side of ${his} narrow waist.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is swollen wider than usual by ${his} crowded womb in its search for more room, leaving ${his} original waistline only visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ } else if (slave.belly < 750000) {
+ r += `${His} ${belly} belly lewdly bulges to either side of ${his} narrow waist and continues for nearly half a `
+ if (V.showInches === 2) {
+ r += `yard`;
+ } else {
+ r += `meter`;
+ }
+ r += ` in both directions.`;
+ if (slave.preg > 3) {
+ if (slave.belly > (slave.pregAdaptation * 1000)) {
+ r += `${His} waist is greatly distended by ${his} overfilled womb in its desperate search for more room, leaving ${his} original waistline barely visible from behind.`;
+ } else {
+ r += `However, ${his} body is so adapted to pregnancy that ${his} womb rests forward enough to preserve the shape of ${his} waistline.`;
+ }
+ }
+ }
+ }
+ }
+ return r;
+}
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index aec7b86880342b57243716454227b4efc88505e3..da90ac68443e60bf9adda75747a83cccb8accc57 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -582,7 +582,7 @@ window.getSlaveMinorCosts = function(slave) {
if (slave.assignment === Job.SERVANT) {
costs -= rulesCost;
}
- if (setup.servantCareers.includes(slave.career) || slave.skillS >= State.variables.masteredXP) {
+ if (setup.servantCareers.includes(slave.career) || slave.skill.servant >= State.variables.masteredXP) {
costs -= rulesCost;
}
}
@@ -887,7 +887,7 @@ window.getSlaveCost = function(s) {
}
if (isNaN(cost)) {
- throw new Error('Cost calculation for slave ' + s.slaveName + ' (' + s.ID + ') failed.');
+ throw new Error(`Cost calculation for slave ${ s.slaveName } (${ s.ID }) failed.`);
}
return cost;
};
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 00916eef3e3dc3677944de37a9cdadb96c3332cd..a839c0b092c1b43bd7b406870cb387ecf1291c22 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -61,7 +61,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (eventSlave.entertainSkill >= 60 || ["a dancer", "a house DJ", "a party girl", "an aspiring pop star", "an exotic dancer"].includes(eventSlave.career)) {
+ if (eventSlave.skill.entertainment >= 60 || ["a dancer", "a house DJ", "a party girl", "an aspiring pop star", "an exotic dancer"].includes(eventSlave.career)) {
if (canHear(eventSlave)) {
if (eventSlave.health > 40) {
if (eventSlave.devotion > 50) {
@@ -134,9 +134,9 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.speechRules !== "restrictive") {
if (eventSlave.trust > 75) {
if (eventSlave.devotion > 50) {
- if (eventSlave.oralSkill > 30) {
+ if (eventSlave.skill.oral > 30) {
if (eventSlave.intelligence + eventSlave.intelligenceImplant >= State.variables.HeadGirl.intelligence + State.variables.HeadGirl.intelligenceImplant) {
- if (eventSlave.oralSkill > State.variables.HeadGirl.oralSkill) {
+ if (eventSlave.skill.oral > State.variables.HeadGirl.skill.oral) {
State.variables.events.push("RE HG replacement");
}
}
@@ -355,7 +355,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (eventSlave.analSkill > 30) {
+ if (eventSlave.skill.anal > 30) {
if (eventSlave.devotion >= 10) {
if (State.variables.REMILFCheckinIDs.includes(eventSlave.ID)) {
State.variables.RECIevent.push("MILF");
@@ -534,7 +534,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.vagina < 0) {
if (canDoAnal(eventSlave)) {
if (eventSlave.anus > 0) {
- if (eventSlave.analSkill <= 30) {
+ if (eventSlave.skill.anal <= 30) {
State.variables.RESSevent.push("obedient shemale");
}
}
@@ -1234,7 +1234,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (eventSlave.entertainSkill >= 100) {
+ if (eventSlave.skill.entertainment >= 100) {
if (eventSlave.trust > 50) {
if (["serve the public", "serve in the club"].includes(eventSlave.assignment)) {
State.variables.RESSevent.push("masterful entertainer");
@@ -1242,7 +1242,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (eventSlave.whoreSkill >= 100) {
+ if (eventSlave.skill.whore >= 100) {
if (eventSlave.trust > 50) {
if (["whore", "work in the brothel"].includes(eventSlave.assignment)) {
State.variables.RESSevent.push("masterful whore");
@@ -1363,7 +1363,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
State.variables.RESSevent.push("shift masturbation");
}
}
- if (eventSlave.entertainSkill >= 60) {
+ if (eventSlave.skill.entertainment >= 60) {
State.variables.RESSevent.push("shift doorframe");
}
}
@@ -1387,7 +1387,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (State.variables.corpIncorporated !== 0) {
State.variables.RESSevent.push("shift sleep");
}
- if (eventSlave.entertainSkill >= 60) {
+ if (eventSlave.skill.entertainment >= 60) {
State.variables.RESSevent.push("shift doorframe");
}
}
@@ -1772,13 +1772,13 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.prestige === 0) {
if (eventSlave.devotion > 50) {
if (eventSlave.trust > 50) {
- if (eventSlave.entertainSkill >= 100) {
+ if (eventSlave.skill.entertainment >= 100) {
if (eventSlave.assignment === "serve the public") {
State.variables.events.push("RE legendary entertainer");
}
}
- if (eventSlave.whoreSkill >= 100) {
+ if (eventSlave.skill.whore >= 100) {
if (eventSlave.assignment === "whore") {
State.variables.events.push("RE legendary whore");
}
@@ -2106,7 +2106,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (eventSlave.vagina < 0) {
if (canDoAnal(eventSlave)) {
if (eventSlave.anus > 0) {
- if (eventSlave.analSkill <= 30) {
+ if (eventSlave.skill.anal <= 30) {
State.variables.RESSevent.push("obedient shemale");
}
}
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index 2b3f362a1d826577ba6fcd640d99c5583005c9d3..59b672ae646be37413dce48fce73a42cd0146e89 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -288,21 +288,45 @@ window.totalPlayerRelatives = function(pc) {
window.relativeTerm = /** @param {App.Entity.SlaveState} slave1 @param {App.Entity.SlaveState} slave2 */
function (slave1, slave2) {
if (slave2.mother === slave1.ID || slave2.father === slave1.ID) {
- return "daughter";
+ if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+ return "son";
+ } else {
+ return "daughter";
+ }
} else if (slave1.mother === slave2.ID) {
return "mother";
} else if (slave1.father === slave2.ID) {
return "father";
} else if (areSisters(slave2, slave1) === 1) {
- return "twin";
+ if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+ return "twin brother";
+ } else {
+ return "twin sister";
+ }
} else if (areSisters(slave2, slave1) === 2) {
- return "sister";
+ if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+ return "brother";
+ } else {
+ return "sister";
+ }
} else if (areSisters(slave2, slave1) === 3) {
- return "half-sister";
+ if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+ return "half-brother";
+ } else {
+ return "half-sister";
+ }
} else if (isAunt(slave1, slave2)) {
- return "niece";
+ if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+ return "nephew";
+ } else {
+ return "niece";
+ }
} else if (isAunt(slave2, slave1)) {
- return "aunt";
+ if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+ return "uncle";
+ } else {
+ return "aunt";
+ }
} else if (areCousins(slave2, slave1)) {
return "cousin";
} else {
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index 9b9f993adb2c7622a993a46cbe42810d1d4bb96d..4819a4019cad81bb1a854391173009beb8d321c6 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -75,7 +75,7 @@ window.renderFamilyTree = function(slaves, filterID) {
chartLayer
.attr('width', chartWidth)
.attr('height', chartHeight)
- .attr('transform', 'translate('+[margin.left, margin.top]+')');
+ .attr('transform', `translate(${[margin.left, margin.top]})`);
}
function runFtreeSim(data) {
@@ -147,7 +147,7 @@ window.renderFamilyTree = function(slaves, filterID) {
} else {
ssym = '?';
}
- return d.name + '('+ssym+')';
+ return `${d.name }(${ssym})`;
})
.attr('dy', 4)
.attr('dx', function(d) { return -(8*d.name.length)/2; })
@@ -177,7 +177,7 @@ window.renderFamilyTree = function(slaves, filterID) {
.attr('y2', function (d) { return d.target.y; });
node
- .attr("transform", function (d) { return "translate(" + d.x + ", " + d.y + ")"; });
+ .attr("transform", function (d) { return `translate(${ d.x }, ${ d.y })`; });
};
simulation.nodes(data.nodes)
@@ -225,7 +225,7 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
var kids = {};
var fake_pc = {
- slaveName: State.variables.PC.name + '(You)',
+ slaveName: `${State.variables.PC.name }(You)`,
mother: State.variables.PC.mother,
father: State.variables.PC.father,
dick: State.variables.PC.dick,
@@ -311,12 +311,12 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
} else if(names.length === 2) {
name = names.join(' and ');
} else {
- names[-1] = 'and '+names[-1];
+ names[-1] = `and ${names[-1]}`;
name = names.join(', ');
}
node_lookup[key] = family_graph.nodes.length;
//Outside extant slaves set
- charList.push({ID: key, mother: 0, father: 0, is_mother: true, dick: 0, vagina: 1, slaveName: name+"'s mother"});
+ charList.push({ID: key, mother: 0, father: 0, is_mother: true, dick: 0, vagina: 1, slaveName: `${name}'s mother`});
}
var dkeys = Object.keys(outdads);
@@ -329,12 +329,12 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
} else if(names.length === 2) {
name = names.join(' and ');
} else {
- names[-1] = 'and '+names[-1];
+ names[-1] = `and ${names[-1]}`;
name = names.join(', ');
}
node_lookup[key] = family_graph.nodes.length;
//Outside extant slaves set
- charList.push({ID: key, mother: 0, father: 0, is_father: true, dick: 1, vagina: -1, slaveName: name+"'s father"});
+ charList.push({ID: key, mother: 0, father: 0, is_father: true, dick: 1, vagina: -1, slaveName: `${name}'s father`});
}
var charHash = {};
@@ -546,7 +546,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
slavesAdded[slave.ID] = true;
}
var data = {
- "name": slave.slaveName + (slave.physicalAge?(" (" + slave.physicalAge + ")"):""),
+ "name": slave.slaveName + (slave.physicalAge?(` (${ slave.physicalAge })`):""),
"class": slave.genes,
"textClass": (activeSlaveId === slave.ID)?"emphasis":"",
"marriages": [],
@@ -586,7 +586,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
var spouse = getSlave(key, (slaves.genes === "XX")?"unknownXY":(slaves.genes === "XY")?"unknownXX":"unknown");
var spouseName;
if (spouse.ID !== slave.ID){
- spouseName = spouse.slaveName + (spouse.physicalAge?(" (" + spouse.physicalAge + ")"):"");
+ spouseName = spouse.slaveName + (spouse.physicalAge?(` (${ spouse.physicalAge })`):"");
} else {
spouseName = (spouse.ID === -1)?"(yourself)":"(themselves)";
}
diff --git a/src/js/food.js b/src/js/food.js
index 37a94ac095a80a69966e0ac015c9adb7ef6d0238..2bcb193329f85aaceaf9811b515ab031538594a5 100644
--- a/src/js/food.js
+++ b/src/js/food.js
@@ -8,7 +8,7 @@ window.foodAmount = function (slave) {
} else {
if (V.Farmer !== 0) { // if a farmer is assigned
food *= 1.1; // TODO: expand this to account for farmer XP and skill
- if (V.Farmer.skillFA >= V.masteredXP) { // if farmer is master
+ if (V.Farmer.skill.farmer >= V.masteredXP) { // if farmer is master
food *= 1.1;
}
}
@@ -66,7 +66,7 @@ window.farmShowsIncome = function (slave) {
} else {
if (V.Farmer !== 0) { // farmer is assigned
cash *= 1.1;
- if (V.Farmer.skillFA >= V.masteredXP) { // farmer is master
+ if (V.Farmer.skill.farmer >= V.masteredXP) { // farmer is master
cash *= 1.1;
}
}
diff --git a/src/js/foreachMacroJS.js b/src/js/foreachMacroJS.js
index ea5e0afcd3ffed39d03bb4a9ef4e833376ad54fb..5aa54d90562c88b890c9458d1a7da4a2567a1c1f 100644
--- a/src/js/foreachMacroJS.js
+++ b/src/js/foreachMacroJS.js
@@ -31,15 +31,15 @@ Macro.add('foreach', {
// We don't check for "instanceof Array" to also be able to pass arguments or other strange objects
if(typeof resultLength !== 'number' || (resultLength % 1) !== 0) {
- return this.error("bad evaluation: '" + result + "' is not an array or array-like object");
+ return this.error(`bad evaluation: '${ result }' is not an array or array-like object`);
}
if(resultLength > Config.macros.maxLoopIterations) {
- return this.error('Array too large for maxLoopIterations (' + resultLength + ' > ' + Config.macros.maxLoopIterations + ')');
+ return this.error(`Array too large for maxLoopIterations (${ resultLength } > ${ Config.macros.maxLoopIterations })`);
}
if(!new RegExp(`^(${Patterns.variable})$`).test(variable)) {
- return this.error('not a variable identifier: ' + variable);
+ return this.error(`not a variable identifier: ${ variable}`);
}
if(resultLength <= 0) {
diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js
index 6978059a94ef3010a2c41179f75d09b8c285ac8c..bd005f0b772658df2c50e77f44088b56670d0c65 100644
--- a/src/js/futureSocietyJS.js
+++ b/src/js/futureSocietyJS.js
@@ -11,9 +11,9 @@ window.FutureSocieties = (function() {
function removeFS(FS) {
const V = State.variables;
const arcology = V.arcologies[0];
- const FSDecoration = FS + "Decoration";
- const FSSMR = FS + "SMR";
- let FSLaw = FS + "Law";
+ const FSDecoration = `${FS }Decoration`;
+ const FSSMR = `${FS }SMR`;
+ let FSLaw = `${FS }Law`;
if (arcology[FS] === undefined) {
console.log(`ERROR: bad FS reference, $arcologies[0].${FS} not defined`);
return;
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 635926cddef1a17bca7fadf86d8b29340d99c497..547c0c0b16a62c871134dafc19a89408c8990e3e 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
// Generates a child's genetics based off mother and father and returns it as an object to be attached to an ovum
window.generateGenetics = (function() {
@@ -179,9 +178,11 @@ window.generateGenetics = (function() {
// nationality
function setNationality(father, mother) {
- return (father === 0) ? "Stateless"
- : (father.nationality === mother.nationality) ? mother.nationality
- : "Stateless";
+ if (father === 0 || father.nationality !== mother.nationality) {
+ return "Stateless";
+ } else {
+ return mother.nationality;
+ }
}
// race
@@ -189,9 +190,13 @@ window.generateGenetics = (function() {
let race;
let fatherRace = 0;
if (father !== 0) {
- race = (mother.origRace === father.origRace) ? mother.origRace
- : (jsRandom(1, 4)) === 4 ? jsEither([father.origRace, mother.origRace])
- : "mixed race";
+ if (mother.origRace === father.origRace) {
+ race = mother.origRace;
+ } else if (jsRandom(1, 4) === 4) {
+ race = jsEither([father.origRace, mother.origRace]);
+ } else {
+ race = "mixed race";
+ }
} else {
if (((actor2 === -2 || actor2 === -5) && V.arcologies[0].FSSupremacistLawME === 1) || (actor2 === -6 && V.arcologies[0].FSSupremacist !== "unset")) {
fatherRace = V.arcologies[0].FSSupremacistRace;
@@ -200,9 +205,13 @@ window.generateGenetics = (function() {
fatherRace = racesList.random();
}
if (fatherRace !== 0) {
- race = (mother.origRace === fatherRace) ? mother.origRace
- : (jsRandom(1,4)) === 4 ? jsEither([fatherRace, mother.origRace])
- : "mixed race";
+ if (mother.origRace === fatherRace) {
+ race = mother.origRace;
+ } else if (jsRandom(1, 4) === 4) {
+ race = jsEither([fatherRace, mother.origRace]);
+ } else {
+ race = "mixed race";
+ }
} else {
race = mother.origRace;
}
@@ -214,29 +223,34 @@ window.generateGenetics = (function() {
function setSkin(father, mother, actor2) {
let fatherSkin = 0;
let dadSkinIndex;
- let skinToMelanin = {
- "pure black": 21,
- "ebony": 20,
- "black": 19,
- "dark brown": 18,
- "brown": 17,
- "light brown": 16,
- "dark": 15,
- "dark olive": 14,
- "bronze": 13,
- "tan": 11,
- "olive": 10,
- "light olive": 9,
- "light": 8,
- "white": 7,
- "fair": 6,
- "very fair": 5,
- "extremely fair": 4,
- "pale": 3,
- "extremely pale": 2,
+ const skinToMelanin = {
+ "pure black": 25,
+ "ebony": 24,
+ "black": 23,
+ "dark brown": 22,
+ "brown": 21,
+ "light brown": 20,
+ "dark beige": 19,
+ "beige": 18,
+ "light beige": 17,
+ "dark": 16,
+ "dark olive": 15,
+ "bronze": 14,
+ "olive": 13,
+ "tan": 12,
+ "light olive": 11,
+ "light": 10,
+ "fair": 9,
+ "very fair": 8,
+ "extremely fair": 7,
+ "pale": 6,
+ "very pale": 5,
+ "extremely pale": 4,
+ "white": 3,
+ "ivory": 2,
"pure white": 1
};
- let momSkinIndex = mother ? (skinToMelanin[mother.origSkin] || 13) : 8;
+ const momSkinIndex = mother ? (skinToMelanin[mother.origSkin] || 13) : 8;
if (((actor2 === -2 || actor2 === -5) && V.arcologies[0].FSSupremacistLawME === 1) || (actor2 === -6 && V.arcologies[0].FSSupremacist !== "unset")) {
fatherSkin = randomRaceSkin(V.arcologies[0].FSSupremacistRace);
} else if (((actor2 === -2 || actor2 === -5) && V.arcologies[0].FSSubjugationistLawME === 1) || (actor2 === -6 && V.arcologies[0].FSSubjugationist !== "unset")) {
@@ -248,7 +262,7 @@ window.generateGenetics = (function() {
} else {
dadSkinIndex = father !== 0 ? (skinToMelanin[father.origSkin] || 13) : 8;
}
- let skinIndex = Math.round(Math.random() * (dadSkinIndex - momSkinIndex) + momSkinIndex);
+ const skinIndex = Math.round(Math.random() * (dadSkinIndex - momSkinIndex) + momSkinIndex);
let prop = "";
for (prop in skinToMelanin) {
@@ -846,14 +860,14 @@ window.generateChild = function (mother, ova, destination) {
if (!pregUpgrade) {
if (genes.mother === -1) {
if (genes.father <= 0) {
- child.slaveName = "Your daughter";
+ child.slaveName = `Your daughter`;
} else {
child.slaveName = `Your and ${genes.fatherName}'s daughter`;
}
child.slaveSurname = V.PC.surname;
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your daughter`;
+ child.slaveName = `${genes.motherName}'s and your daughter`;
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
@@ -891,7 +905,7 @@ window.generateChild = function (mother, ova, destination) {
}
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your son`;
+ child.slaveName = `${genes.motherName}'s and your son`;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
} else {
@@ -943,7 +957,7 @@ window.generateChild = function (mother, ova, destination) {
child.slaveSurname = V.PC.surname;
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your son`;
+ child.slaveName = `${genes.motherName}'s and your son`;
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
@@ -981,7 +995,7 @@ window.generateChild = function (mother, ova, destination) {
}
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your son`;
+ child.slaveName = `${genes.motherName}'s and your son`;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
} else {
@@ -1112,14 +1126,14 @@ window.generateChild = function (mother, ova, destination) {
if (!pregUpgrade) {
if (genes.mother === -1) {
if (genes.father <= 0) {
- child.slaveName = "Your daughter";
+ child.slaveName = `Your daughter`;
} else {
- child.slaveName = `Your and ${genes.fatherName}'s daughter`;
+ child.slaveName = `Yours and ${genes.fatherName}'s daughter`;
}
child.slaveSurname = V.PC.surname;
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your daughter`;
+ child.slaveName = `Yours and ${genes.motherName}'s daughter`;
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
@@ -1151,13 +1165,13 @@ window.generateChild = function (mother, ova, destination) {
if (childName.indexOf("ovum") === 0) {
if (genes.mother === -1) {
if (genes.father <= 0) {
- child.slaveName = "Your daughter";
+ child.slaveName = `Your daughter`;
} else {
- child.slaveName = `Your and ${genes.fatherName}'s daughter`;
+ child.slaveName = `Yours and ${genes.fatherName}'s daughter`;
}
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your daughter`;
+ child.slaveName = `Yours and ${genes.motherName}'s daughter`;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
} else {
@@ -1402,12 +1416,12 @@ window.generateChild = function (mother, ova, destination) {
child.armsTat = 0;
child.legsTat = 0;
child.backTat = 0;
- child.combatSkill = 0;
- child.whoreSkill = 0;
- child.entertainSkill = 0;
- child.oralSkill = 0;
- child.analSkill = 0;
- child.vaginalSkill = 0;
+ child.skill.combat = 0;
+ child.skill.whore = 0;
+ child.skill.entertainment = 0;
+ child.skill.oral = 0;
+ child.skill.anal = 0;
+ child.skill.vaginal = 0;
child.accent = 4;
child.canRecruit = 0;
child.hStyle = "long";
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 30b1d04362b9b70eb2762fd3396a23cfbe74e73f..819e7e455d154063e48f2a9062582b79b0ebab0d 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1240,16 +1240,14 @@ window.GenerateNewSlave = (function() {
}
nationalityToRace(slave);
} else {
+ slave.race = V.fixedRace;
if (V.fixedNationality === 0) {
- slave.race = V.fixedRace;
- V.fixedRace = 0;
raceToNationality(slave);
} else {
- slave.race = V.fixedRace;
slave.nationality = V.fixedNationality;
V.fixedNationality = 0;
- V.fixedRace = 0;
}
+ V.fixedRace = 0;
}
}
@@ -1313,7 +1311,7 @@ window.GenerateNewSlave = (function() {
break;
case "latina":
slave.lips = jsRandom(5, 25);
- slave.skin = jsEither(["brown", "dark brown", "dark olive", "light olive", "tanned"]);
+ slave.skin = jsEither(["brown", "dark brown", "dark olive", "light olive", "tan"]);
slave.hColor = jsEither(["black", "brown"]);
if (slave.geneticQuirks.heterochromia === 2) {
slave.geneticQuirks.heterochromia = jsEither(["blue", "brown", "green"]);
@@ -1345,7 +1343,7 @@ window.GenerateNewSlave = (function() {
case "semitic":
case "southern european":
slave.lips = jsRandom(5, 25);
- slave.skin = jsEither(["fair", "light olive", "light", "tanned"]);
+ slave.skin = jsEither(["fair", "light olive", "light", "tan"]);
slave.hColor = "black";
slave.hStyle = "neat";
if (slave.geneticQuirks.heterochromia === 2) {
@@ -1361,7 +1359,7 @@ window.GenerateNewSlave = (function() {
slave.geneticQuirks.heterochromia = jsEither(["blue", "brown", "green"]);
}
}
- if (slave.skin === "pale" || slave.skin === "fair") {
+ if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10)) {
if (jsRandom(1, 4) === 1) {
slave.markings = jsEither(["beauty mark", "beauty mark", "birthmark", "birthmark", "freckles", "freckles", "freckles", "heavily freckled"]);
}
@@ -1421,11 +1419,11 @@ window.GenerateNewSlave = (function() {
}
function generateSkills() {
- slave.vaginalSkill = (slave.vagina === 0 ? 0 : jsRandom(0, 15));
- slave.analSkill = (slave.anus === 0 ? 0 : jsRandom(0, 15));
- slave.oralSkill = jsRandom(0, 15);
- slave.entertainSkill = jsRandom(0, 15);
- slave.whoreSkill = jsRandom(0, 15);
+ slave.skill.vaginal = (slave.vagina === 0 ? 0 : jsRandom(0, 15));
+ slave.skill.anal = (slave.anus === 0 ? 0 : jsRandom(0, 15));
+ slave.skill.oral = jsRandom(0, 15);
+ slave.skill.entertainment = jsRandom(0, 15);
+ slave.skill.whore = jsRandom(0, 15);
}
function generateDisabilities() {
diff --git a/src/js/hTagMacroJS.js b/src/js/hTagMacroJS.js
index 64681ad4b2d674888901a44ca00d456f210377db..a0908716ab2f36f3a701760f96851d23201c3b35 100644
--- a/src/js/hTagMacroJS.js
+++ b/src/js/hTagMacroJS.js
@@ -20,7 +20,7 @@ Macro.add('htag', {
let htag = 'div';
let attributes;
function munge (val, key) {
- return key + '="' + val + '"';
+ return `${key }="${ val }"`;
}
if (1 > this.args.length)
@@ -30,11 +30,11 @@ Macro.add('htag', {
if ("object" === typeof this.args[0])
attributes = $.map(this.args[0], munge).join(" ");
else
- attributes = 'id="' + String(this.args[0]).trim() + '"';
+ attributes = `id="${ String(this.args[0]).trim() }"`;
if (Config.debug)
this.debugView.modes({block: true});
- jQuery('<' + htag + ' ' + attributes + ' />')
+ jQuery(`<${ htag } ${ attributes } />`)
.wiki(payload)
.appendTo(this.output);
}
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 2bbfa0e66945ce80ac3b0987975c0af345cc3505..5871a894ddf883a73b61d3d69aca48ebb98c1a88 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -1,159 +1,164 @@
/* eslint-disable no-undef */
/* intended to condense the clothing/toy/etc availability checks into something less asinine */
+
+/**
+ * Checks whether item is accessible
+ * @param {string} string Name of the item
+ * @returns {boolean}
+ */
window.isItemAccessible = function(string) {
const V = State.variables;
if (V.cheatMode === 1) {
return true;
- } else {
- switch (string) { /* no breaks needed because we always return */
- case "attractive lingerie for a pregnant woman":
- return (V.arcologies[0].FSRepopulationFocus > 0 || V.clothesBoughtMaternityLingerie === 1);
- case "a bunny outfit":
- return (V.arcologies[0].FSGenderFundamentalist > 0 || V.clothesBoughtBunny === 1);
- case "body oil":
- return (V.arcologies[0].FSPhysicalIdealist > 0 || V.clothesBoughtOil === 1);
- case "chains":
- return (V.arcologies[0].FSDegradationist > 0 || V.clothesBoughtChains === 1);
- case "a chattel habit":
- return (V.arcologies[0].FSChattelReligionist > 0 || V.clothesBoughtHabit === 1);
- case "conservative clothing":
- return (V.arcologies[0].FSPaternalist > 0 || V.clothesBoughtConservative === 1);
- case "harem gauze":
- return (V.arcologies[0].FSArabianRevivalist > 0 || V.clothesBoughtHarem === 1);
- case "a huipil":
- return (V.arcologies[0].FSAztecRevivalist > 0 || V.clothesBoughtHuipil === 1);
- case "a kimono":
- return (V.arcologies[0].FSEdoRevivalist > 0 || V.clothesBoughtKimono === 1 || V.continent === "Japan");
- case "a maternity dress":
- return (V.arcologies[0].FSRepopulationFocus > 0 || V.clothesBoughtMaternityDress === 1);
- case "a slutty qipao":
- return (V.arcologies[0].FSChineseRevivalist > 0 || V.clothesBoughtQipao === 1);
- case "a long qipao":
- return (V.arcologies[0].FSChineseRevivalist > 0 || V.clothesBoughtCultural === 1);
- case "stretch pants and a crop-top":
- return (V.arcologies[0].FSHedonisticDecadence > 0 || V.clothesBoughtLazyClothes === 1);
- case "a toga":
- return (V.arcologies[0].FSRomanRevivalist > 0 || V.clothesBoughtToga === 1);
- case "Western clothing":
- return (V.arcologies[0].FSPastoralist > 0 || V.clothesBoughtWestern === 1);
- case "battlearmor":
- case "a military uniform":
- case "a red army uniform":
- case "battledress":
- return (V.clothesBoughtMilitary === 1);
- case "a biyelgee costume":
- case "a dirndl":
- case "lederhosen":
- case "a mounty outfit":
- case "a hanbok":
- return (V.clothesBoughtCultural === 1);
- case "a burqa":
- case "a niqab and abaya":
- return (V.clothesBoughtMiddleEastern === 1 || V.continent === "the Middle East");
- case "a hijab and blouse":
- return (V.clothesBoughtMiddleEastern === 1 || V.clothesBoughtConservative === 1 || V.continent === "the Middle East");
- case "a burkini":
- return (V.clothesBoughtMiddleEastern === 1 && V.clothesBoughtSwimwear === 1 || V.continent === "the Middle East");
- case "a Santa dress":
- return (V.clothesBoughtCostume === 1);
- case "a klan robe":
- case "a slutty klan robe":
- case "a schutzstaffel uniform":
- case "a slutty schutzstaffel uniform":
- return (V.clothesBoughtPol === 1);
- case "nice business attire":
- case "a nice nurse outfit":
- case "a police uniform":
- return (V.clothesBoughtCareer === 1);
- case "a nice maid outfit":
- return (V.clothesBoughtCareer === 1 || V.PC.career === "servant");
- case "a ball gown":
- case "a gothic lolita dress":
- //case 'a halter top dress':
- //case 'a mini dress':
- //case 'a slave gown':
- return (V.clothesBoughtDresses === 1);
- case "a cybersuit":
- case "a latex catsuit":
- return (V.clothesBoughtBodysuits === 1);
- case "a button-up shirt and panties":
- case "a button-up shirt":
- case "cutoffs":
- case "jeans":
- case "leather pants and a tube top":
- case "leather pants":
- case "an oversized t-shirt":
- case "a sweater and cutoffs":
- case "a sweater and panties":
- case "a sweater":
- case "a t-shirt and jeans":
- case "a t-shirt and panties":
- case "a t-shirt":
- case "a tank-top and panties":
- case "a tank-top":
- case "a tube top":
- return (V.clothesBoughtCasual === 1);
- case "boyshorts":
- case "a bra":
- case "kitty lingerie":
- case "panties and pasties":
- case "a skimpy loincloth":
- case "a thong":
- return (V.clothesBoughtUnderwear === 1);
- case "leather pants and pasties":
- case "a t-shirt and thong":
- case "a tube top and thong":
- case "an oversized t-shirt and boyshorts":
- return (V.clothesBoughtUnderwear === 1 && V.clothesBoughtCasual === 1);
- case "sport shorts and a sports bra":
- case "sport shorts":
- case "a sports bra":
- return (V.clothesBoughtSports === 1);
- case "sport shorts and a t-shirt":
- return (V.clothesBoughtSports === 1 && V.clothesBoughtCasual === 1);
- case "a nice pony outfit":
- case "a slutty pony outfit":
- return (V.clothesBoughtPony === 1);
- case "a monokini":
- case "a one-piece swimsuit":
- return (V.clothesBoughtSwimwear === 1);
- case "shimapan panties":
- case "a striped bra":
- case "striped panties":
- case "striped underwear":
- return (V.clothesBoughtPantsu === 1 || V.continent === "Japan");
- case "bowtie":
- return (V.arcologies[0].FSGenderFundamentalist > 0 || V.clothesBoughtBunny === 1);
- case "ancient Egyptian":
- return (V.arcologies[0].FSEgyptianRevivalist > 0 || V.clothesBoughtEgypt === 1);
- case "pasties": /* an option in saChoosesOwnClothes.tw, but everything else (e.g. descriptions, artwork, option in wardrobeUse.tw) is missing or not hooked up correctly */
- return false;
- case "massive dildo gag":
- return (V.toysBoughtGags === 1);
- case "a small empathy belly":
- case "a medium empathy belly":
- case "a large empathy belly":
- case "a huge empathy belly":
- return (V.arcologies[0].FSRepopulationFocus > 0 || V.clothesBoughtBelly === 1);
- case "bullet vibrator":
- case "smart bullet vibrator":
- case "long dildo":
- case "long, large dildo":
- case "long, huge dildo":
- return (V.toysBoughtDildos === 1);
- case "vibrator":
- return (V.toysBoughtVaginalAttachments === 1);
- case "long plug":
- case "long, large plug":
- case "long, huge plug":
- return (V.toysBoughtButtPlugs === 1);
- case "tail":
- case "cat tail":
- case "fox tail":
- return (V.toysBoughtButtPlugTails === 1);
- default:
- return true;
- }
+ }
+ switch (string) { /* no breaks needed because we always return */
+ case "attractive lingerie for a pregnant woman":
+ return (V.arcologies[0].FSRepopulationFocus > 0 || V.clothesBoughtMaternityLingerie === 1);
+ case "a bunny outfit":
+ return (V.arcologies[0].FSGenderFundamentalist > 0 || V.clothesBoughtBunny === 1);
+ case "body oil":
+ return (V.arcologies[0].FSPhysicalIdealist > 0 || V.clothesBoughtOil === 1);
+ case "chains":
+ return (V.arcologies[0].FSDegradationist > 0 || V.clothesBoughtChains === 1);
+ case "a chattel habit":
+ return (V.arcologies[0].FSChattelReligionist > 0 || V.clothesBoughtHabit === 1);
+ case "conservative clothing":
+ return (V.arcologies[0].FSPaternalist > 0 || V.clothesBoughtConservative === 1);
+ case "harem gauze":
+ return (V.arcologies[0].FSArabianRevivalist > 0 || V.clothesBoughtHarem === 1);
+ case "a huipil":
+ return (V.arcologies[0].FSAztecRevivalist > 0 || V.clothesBoughtHuipil === 1);
+ case "a kimono":
+ return (V.arcologies[0].FSEdoRevivalist > 0 || V.clothesBoughtKimono === 1 || V.continent === "Japan");
+ case "a maternity dress":
+ return (V.arcologies[0].FSRepopulationFocus > 0 || V.clothesBoughtMaternityDress === 1);
+ case "a slutty qipao":
+ return (V.arcologies[0].FSChineseRevivalist > 0 || V.clothesBoughtQipao === 1);
+ case "a long qipao":
+ return (V.arcologies[0].FSChineseRevivalist > 0 || V.clothesBoughtCultural === 1);
+ case "stretch pants and a crop-top":
+ return (V.arcologies[0].FSHedonisticDecadence > 0 || V.clothesBoughtLazyClothes === 1);
+ case "a toga":
+ return (V.arcologies[0].FSRomanRevivalist > 0 || V.clothesBoughtToga === 1);
+ case "Western clothing":
+ return (V.arcologies[0].FSPastoralist > 0 || V.clothesBoughtWestern === 1);
+ case "battlearmor":
+ case "a military uniform":
+ case "a red army uniform":
+ case "battledress":
+ return (V.clothesBoughtMilitary === 1);
+ case "a biyelgee costume":
+ case "a dirndl":
+ case "lederhosen":
+ case "a mounty outfit":
+ case "a hanbok":
+ return (V.clothesBoughtCultural === 1);
+ case "a burqa":
+ case "a niqab and abaya":
+ return (V.clothesBoughtMiddleEastern === 1 || V.continent === "the Middle East");
+ case "a hijab and blouse":
+ return (V.clothesBoughtMiddleEastern === 1 || V.clothesBoughtConservative === 1 || V.continent === "the Middle East");
+ case "a burkini":
+ return (V.clothesBoughtMiddleEastern === 1 && V.clothesBoughtSwimwear === 1 || V.continent === "the Middle East");
+ case "a Santa dress":
+ return (V.clothesBoughtCostume === 1);
+ case "a klan robe":
+ case "a slutty klan robe":
+ case "a schutzstaffel uniform":
+ case "a slutty schutzstaffel uniform":
+ return (V.clothesBoughtPol === 1);
+ case "nice business attire":
+ case "a nice nurse outfit":
+ case "a police uniform":
+ return (V.clothesBoughtCareer === 1);
+ case "a nice maid outfit":
+ return (V.clothesBoughtCareer === 1 || V.PC.career === "servant");
+ case "a ball gown":
+ case "a gothic lolita dress":
+ //case 'a halter top dress':
+ //case 'a mini dress':
+ //case 'a slave gown':
+ return (V.clothesBoughtDresses === 1);
+ case "a cybersuit":
+ case "a latex catsuit":
+ return (V.clothesBoughtBodysuits === 1);
+ case "a button-up shirt and panties":
+ case "a button-up shirt":
+ case "cutoffs":
+ case "jeans":
+ case "leather pants and a tube top":
+ case "leather pants":
+ case "an oversized t-shirt":
+ case "a sweater and cutoffs":
+ case "a sweater and panties":
+ case "a sweater":
+ case "a t-shirt and jeans":
+ case "a t-shirt and panties":
+ case "a t-shirt":
+ case "a tank-top and panties":
+ case "a tank-top":
+ case "a tube top":
+ return (V.clothesBoughtCasual === 1);
+ case "boyshorts":
+ case "a bra":
+ case "kitty lingerie":
+ case "panties and pasties":
+ case "a skimpy loincloth":
+ case "a thong":
+ return (V.clothesBoughtUnderwear === 1);
+ case "leather pants and pasties":
+ case "a t-shirt and thong":
+ case "a tube top and thong":
+ case "an oversized t-shirt and boyshorts":
+ return (V.clothesBoughtUnderwear === 1 && V.clothesBoughtCasual === 1);
+ case "sport shorts and a sports bra":
+ case "sport shorts":
+ case "a sports bra":
+ return (V.clothesBoughtSports === 1);
+ case "sport shorts and a t-shirt":
+ return (V.clothesBoughtSports === 1 && V.clothesBoughtCasual === 1);
+ case "a nice pony outfit":
+ case "a slutty pony outfit":
+ return (V.clothesBoughtPony === 1);
+ case "a monokini":
+ case "a one-piece swimsuit":
+ return (V.clothesBoughtSwimwear === 1);
+ case "shimapan panties":
+ case "a striped bra":
+ case "striped panties":
+ case "striped underwear":
+ return (V.clothesBoughtPantsu === 1 || V.continent === "Japan");
+ case "bowtie":
+ return (V.arcologies[0].FSGenderFundamentalist > 0 || V.clothesBoughtBunny === 1);
+ case "ancient Egyptian":
+ return (V.arcologies[0].FSEgyptianRevivalist > 0 || V.clothesBoughtEgypt === 1);
+ case "pasties": /* an option in saChoosesOwnClothes.tw, but everything else (e.g. descriptions, artwork, option in wardrobeUse.tw) is missing or not hooked up correctly */
+ return false;
+ case "massive dildo gag":
+ return (V.toysBoughtGags === 1);
+ case "a small empathy belly":
+ case "a medium empathy belly":
+ case "a large empathy belly":
+ case "a huge empathy belly":
+ return (V.arcologies[0].FSRepopulationFocus > 0 || V.clothesBoughtBelly === 1);
+ case "bullet vibrator":
+ case "smart bullet vibrator":
+ case "long dildo":
+ case "long, large dildo":
+ case "long, huge dildo":
+ return (V.toysBoughtDildos === 1);
+ case "vibrator":
+ return (V.toysBoughtVaginalAttachments === 1);
+ case "long plug":
+ case "long, large plug":
+ case "long, huge plug":
+ return (V.toysBoughtButtPlugs === 1);
+ case "tail":
+ case "cat tail":
+ case "fox tail":
+ return (V.toysBoughtButtPlugTails === 1);
+ default:
+ return true;
}
};
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index 29a156582111bfd18ffccd936ccf538fab404962..2a2e4567a7dab86af5cea46bda172ffa6142acaf 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -382,6 +382,9 @@ window.setPregType = function(actor) {
}
}
}
+ if (actor.geneticQuirks.superfetation === 2 && actor.womb.length > 0) {
+ ovum = Math.ceil(ovum / 4);
+ }
return ovum;
};
@@ -395,7 +398,13 @@ window.setPregType = function(actor) {
*/
window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
const V = State.variables;
+ let pronouns;
+ let He;
let r = "";
+ if (target.ID !== -1) {
+ pronouns = getPronouns(target);
+ He = capFirstChar(pronouns.pronoun);
+ }
if (V.seePreg !== 0) {
if (jsRandom(0,99) < (chance + (V.reproductionFormula*((target.pregSource <= 0) ? ((target.ID === -1) ? 0 : 10) : 20)))) {
if (target.mpreg === hole) {
@@ -416,10 +425,8 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
target.pregKnown = 1;
if (target.ID === -1) {
/* r += "@@.lime;You have gotten pregnant.@@"; */
- } else if (target.fuckdoll === 0) {
- r += "@@.lime;She has become pregnant.@@";
} else {
- r += "@@.lime;It has become pregnant.@@";
+ r += `<span class="lime">${He} has become pregnant.</span>`;
}
} else {
target.pregKnown = 1;
@@ -443,13 +450,25 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
target.pregKnown = 1;
if (target.ID === -1) {
/* r += "@@.lime;You have gotten pregnant.@@"; */
- } else if (target.fuckdoll === 0) {
- r += "@@.lime;She has become pregnant.@@";
} else {
- r += "@@.lime;It has become pregnant.@@";
+ r += `<span class="lime">${He} has become pregnant.</span>`;
+ }
+ if (target.geneticQuirks.superfetation === 2 && target.womb.length > 0) {
+ if (V.seeHyperPreg === 1) {
+ target.fertPeak = 1;
+ } else {
+ target.fertPeak = jsRandom(10, 20);
+ }
}
} else {
target.pregKnown = 1;
+ if (target.geneticQuirks.superfetation === 2 && target.womb.length > 0) {
+ if (V.seeHyperPreg === 1) {
+ target.fertPeak = 1;
+ } else {
+ target.fertPeak = jsRandom(10, 20);
+ }
+ }
}
}
}
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index 9a3d5fc2088be7cdb1593a848d65e360201436e1..76d3c507f30bd7425f3084209cccf76eec32287f 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -1,36 +1,66 @@
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object[]} rules
+ * @returns {boolean}
+*/
window.hasSurgeryRule = function (slave, rules) {
return rules.some(
rule => ruleApplied(slave, rule) && rule.set.autoSurgery > 0);
};
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object[]} rules
+ * @param {string} what
+ * @returns {boolean}
+*/
window.hasRuleFor = function(slave, rules, what) {
return rules.some(
rule => ruleApplied(slave, rule) && rule[what] !== "no default setting");
};
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object[]} rules
+ * @returns {boolean}
+*/
window.hasHColorRule = function(slave, rules) {
return hasRuleFor(slave, rules, "hColor");
};
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object[]} rules
+ * @returns {boolean}
+ * */
window.hasHStyleRule = function(slave, rules) {
return hasRuleFor(slave, rules, "hStyle");
};
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object[]} rules
+ * @returns {boolean}
+ * */
window.hasEyeColorRule = function(slave, rules) {
return hasRuleFor(slave, rules, "eyeColor");
};
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * return if a rule is applied on a slave
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object[]} rules
+ * @returns {boolean}
+*/
window.lastPregRule = function(slave, rules) {
return rules.some(rule =>
ruleApplied(slave, rule) && rule.set.preg === -1);
};
+/**
+ * @param {Object[]} rules
+ * @returns {Object}
+ */
window.mergeRules = function mergeRules(rules) {
const combinedRule = {};
rules.forEach(rule => {
@@ -49,14 +79,22 @@ window.mergeRules = function mergeRules(rules) {
return combinedRule;
};
-// return if a rule is applied on a slave
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * return if a rule is applied on a slave
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object} rule
+ * @returns {boolean}
+*/
window.ruleApplied = function(slave, rule) {
return slave.currentRules.includes(rule.ID);
};
-// remove slave from the facility described by the rule
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * remove slave from the facility described by the rule
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object} rule
+ * @returns {string}
+*/
window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
const V = State.variables;
let r = "";
@@ -155,8 +193,11 @@ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
}
};
-// return whether the rule applies to the slave
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * return whether the rule applies to the slave
+ * @param {Object} cond
+ * @param {App.Entity.SlaveState} slave
+ * @returns {boolean} flag */
window.ruleAppliesP = function ruleAppliesP(cond, slave) {
let flag;
@@ -196,6 +237,9 @@ window.ruleAppliesP = function ruleAppliesP(cond, slave) {
return flag;
};
+/**
+ * @returns {Object}
+ */
window.emptyDefaultRule = function emptyDefaultRule() {
const id = generateNewID();
const rule = {
@@ -339,9 +383,10 @@ window.emptyDefaultRule = function emptyDefaultRule() {
return rule;
};
-// Saves the slave, silently fires the RA, saves the slave's after-RA state, and then reverts the slave.
-// Call and then check potential change against $slaveAfterRA to see if the RA would revert it.
-/** @param {App.Entity.SlaveState} slave */
+/**
+ * Saves the slave, silently fires the RA, saves the slave's after-RA state, and then reverts the slave.
+ * Call and then check potential change against $slaveAfterRA to see if the RA would revert it.
+ * @param {App.Entity.SlaveState} slave */
window.RulesDeconfliction = function RulesDeconfliction(slave) {
const before = clone(slave);
DefaultRules(slave);
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index e476f2814d6f35b13dc802f3136ba18bdcb0c8f7..3dfc35e75707f5144ac42b17ba4672c0b701a4ae 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -167,7 +167,7 @@ window.rulesAssistantOptions = (function() {
// it can be "bound" to a variable by setting its "onchange" method
class EditorWithShortcuts extends Element {
constructor(prefix, data=[], editor=false, ...args) {
- super(prefix + ": ", editor, ...args);
+ super(`${prefix }: `, editor, ...args);
this.selectedItem = null;
data.forEach(item => this.appendChild(new ListItem(...item)));
}
@@ -199,9 +199,9 @@ window.rulesAssistantOptions = (function() {
setValue(what) {
if (this.value.tagName === "INPUT")
- this.value.value = ""+what;
+ this.value.value = `${what}`;
else
- this.value.innerHTML = ""+what;
+ this.value.innerHTML = `${what}`;
}
getData(what) {
@@ -305,7 +305,7 @@ window.rulesAssistantOptions = (function() {
render(label) {
const elem = document.createElement("div");
const lelem = document.createElement("em");
- lelem.innerText = label + ": ";
+ lelem.innerText = `${label }: `;
elem.appendChild(lelem);
return elem;
}
@@ -432,7 +432,7 @@ window.rulesAssistantOptions = (function() {
V.defaultRules.push(rule);
reload(this.root);
} catch (e) {
- alert("Couldn't import that rule:\n" + e.message);
+ alert(`Couldn't import that rule:\n${ e.message}`);
}
}
}
@@ -706,7 +706,7 @@ window.rulesAssistantOptions = (function() {
const min = document.createElement("input");
min.setAttribute("type", "text");
- min.value = "" + data.value[0];
+ min.value = `${ data.value[0]}`;
min.onkeypress = e => { if (returnP(e)) this.setmin(min.value); };
min.onblur = e => this.setmin(min.value);
this.min = min;
@@ -720,7 +720,7 @@ window.rulesAssistantOptions = (function() {
const max = document.createElement("input");
max.setAttribute("type", "text");
- max.value = "" + data.value[1];
+ max.value = `${ data.value[1]}`;
max.onkeypress = e => { if (returnP(e)) this.setmax(max.value); };
max.onblur = e => this.setmax(max.value);
this.max = max;
@@ -745,12 +745,12 @@ window.rulesAssistantOptions = (function() {
setmin(value) {
current_rule.condition.data.value[0] = this.parse(value);
- this.min.value = ""+current_rule.condition.data.value[0];
+ this.min.value = `${current_rule.condition.data.value[0]}`;
}
setmax(value) {
current_rule.condition.data.value[1] = this.parse(value);
- this.max.value = ""+current_rule.condition.data.value[1];
+ this.max.value = `${current_rule.condition.data.value[1]}`;
}
info(attribute) {
@@ -793,11 +793,11 @@ window.rulesAssistantOptions = (function() {
}
info(attribute) {
- return "Insert a valid JSON array. Known values: " + {
+ return `Insert a valid JSON array. Known values: ${ {
"fetish": "buttslut, cumslut, masochist, sadist, dom, submissive, boobs, pregnancy, none (AKA vanilla)",
"amp": "Amputated: 1, Not amputated: 0",
"genes": "XX, XY",
- }[attribute];
+ }[attribute]}`;
}
setValue(input) {
@@ -1315,9 +1315,9 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
bellies.push([acc.name, acc.value]);
else if (acc.fs === "repopulation" && V.arcologies[0].FSRepopulationFocus !== "unset")
- bellies.push([acc.name + " (FS)", acc.value]);
+ bellies.push([`${acc.name } (FS)`, acc.value]);
else if (acc.rs === "boughtBelly" && V.clothesBoughtBelly === 1)
- bellies.push([acc.name + " (Purchased)", acc.value]);
+ bellies.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Corsetage", bellies);
this.setValue(current_rule.set.bellyAccessory);
@@ -1359,7 +1359,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Vaginal accessories for virgins", accs);
this.setValue(current_rule.set.virginAccessory);
@@ -1374,7 +1374,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Vaginal accessories for anal virgins", accs);
this.setValue(current_rule.set.aVirginAccessory);
@@ -1389,7 +1389,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Vaginal accessories for other slaves", accs);
this.setValue(current_rule.set.vaginalAccessory);
@@ -1404,7 +1404,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyVaginalAttachments" && V.toysBoughtVaginalAttachments === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Vaginal attachments for slaves with vaginal accessories", accs);
this.setValue(current_rule.set.vaginalAttachment);
@@ -1461,7 +1461,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Buttplugs for anal virgins", accs);
this.setValue(current_rule.set.aVirginButtplug);
@@ -1476,7 +1476,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Buttplugs for other slaves", accs);
this.setValue(current_rule.set.buttplug);
@@ -1491,7 +1491,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyTails" && V.toysBoughtButtPlugTails === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Buttplug attachments for slaves with buttplugs", accs);
this.setValue(current_rule.set.buttplugAttachment);
@@ -1757,9 +1757,10 @@ window.rulesAssistantOptions = (function() {
["No default setting", "no default setting"],
["Abort all", "all"],
];
- if (V.pregnancyMonitoringUpgrade === 1 && V.geneticMappingUpgrade === 1)
+ if (V.pregnancyMonitoringUpgrade === 1 && V.geneticMappingUpgrade === 1) {
pairs.push(["Abort boys", "male"]);
pairs.push(["Abort girls", "female"]);
+ }
super("Pregnancy termination", pairs);
this.setValue(current_rule.set.abortion);
this.onchange = (value) => current_rule.set.abortion = value;
@@ -3642,10 +3643,33 @@ window.rulesAssistantOptions = (function() {
const items = [
["no default setting"],
["natural"],
+ ["pure white"],
+ ["ivory"],
+ ["white"],
+ ["extremely pale"],
+ ["very pale"],
["pale"],
- ["lightened"],
- ["tanned"],
+ ["extremely fair"],
+ ["very fair"],
+ ["fair"],
+ ["light"],
+ ["light olive"],
+ ["tan"],
+ ["olive"],
+ ["bronze"],
+ ["dark olive"],
["dark"],
+ ["light beige"],
+ ["beige"],
+ ["dark beige"],
+ ["light brown"],
+ ["brown"],
+ ["dark brown"],
+ ["black"],
+ ["ebony"],
+ ["pure black"],
+ ["sun tanned"],
+ ["spray tanned"],
["dyed red"],
["dyed green"],
["dyed blue"],
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 7e508b6c59df5693bc25c63b291cdae1c50ef616..8a6158e1ffa067b99ba3b875e5551f083eb7ae83 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -1,24 +1,32 @@
-/* eslint-disable no-undef */
window.rulesAutosurgery = (function() {
"use strict";
let V;
let r;
return rulesAutoSurgery;
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
function rulesAutoSurgery(slave) {
V = State.variables;
r = "";
const surgeries = [];
const thisSurgery = ProcessHGTastes(slave);
- if (slave.health > 20)
+ if (slave.health > 20) {
CommitSurgery(slave, thisSurgery, surgeries);
- if (surgeries.length > 0)
+ }
+ if (surgeries.length > 0) {
PrintResult(slave, thisSurgery, surgeries);
+ }
return r;
}
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object[]} ruleset
+ * @returns {Object}
+ */
function autoSurgerySelector(slave, ruleset) {
const surgery = {};
ruleset.forEach(rule => {
@@ -31,7 +39,10 @@ window.rulesAutosurgery = (function() {
return surgery;
}
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {Object}
+ */
function ProcessHGTastes(slave) {
let thisSurgery;
switch (V.HGTastes) {
@@ -50,7 +61,7 @@ window.rulesAutosurgery = (function() {
surgery_boobs: 0,
surgery_holes: 0
};
- break ;
+ break;
case 2:
thisSurgery = {
surgery_lactation: 0,
@@ -107,19 +118,23 @@ window.rulesAutosurgery = (function() {
.map(x => x.set));
if ((thisSurgery.surgery_hips !== "no default setting") && (thisSurgery.surgery_butt !== "no default setting")) {
if (slave.hips < -1) {
- if (thisSurgery.surgery_butt > 2)
+ if (thisSurgery.surgery_butt > 2) {
thisSurgery.surgery_butt = 2;
+ }
} else if (slave.hips < 0) {
- if (thisSurgery.surgery_butt > 4)
+ if (thisSurgery.surgery_butt > 4) {
thisSurgery.surgery_butt = 4;
+ }
} else if (slave.hips > 0) {
- if (thisSurgery.surgery_butt > 8)
+ if (thisSurgery.surgery_butt > 8) {
thisSurgery.surgery_butt = 8;
+ }
} else if (slave.hips > 1) {
// true
} else {
- if (thisSurgery.surgery_butt > 6)
+ if (thisSurgery.surgery_butt > 6) {
thisSurgery.surgery_butt = 6;
+ }
}
}
break;
@@ -127,7 +142,11 @@ window.rulesAutosurgery = (function() {
return thisSurgery;
}
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object} thisSurgery
+ * @param {string[]} surgeries
+ */
function CommitSurgery(slave, thisSurgery, surgeries) {
if (slave.health > 20 && surgeries.length < 3) {
if (slave.eyes === -1 && thisSurgery.surgery_eyes === 1) {
@@ -200,10 +219,11 @@ window.rulesAutosurgery = (function() {
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
} else if ((slave.boobShape === "normal" || slave.boobShape === "wide-set") && thisSurgery.surgery_cosmetic > 0 && slave.breastMesh !== 1) {
- if (slave.boobs > 800)
+ if (slave.boobs > 800) {
slave.boobShape = "torpedo-shaped";
- else
+ } else {
slave.boobShape = "perky";
+ }
surgeries.push("more interestingly shaped breasts");
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
@@ -282,55 +302,53 @@ window.rulesAutosurgery = (function() {
if (slave.anus > 3 && thisSurgery.surgery_cosmetic > 0) {
surgeries.push("a restored anus");
slave.anus = 3;
- if (slave.analSkill > 10)
- slave.analSkill -= 10;
+ if (slave.skill.anal > 10) {
+ slave.skill.anal -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
-
} else if (slave.vagina > 3 && thisSurgery.surgery_cosmetic > 0) {
surgeries.push("a restored pussy");
slave.vagina = 3;
- if (slave.vaginalSkill > 10)
- slave.vaginalSkill -= 10;
+ if (slave.skill.vaginal > 10) {
+ slave.skill.vaginal -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
-
} else if (slave.anus > 0 && V.surgeryUpgrade === 1 && thisSurgery.surgery_holes === 2) {
surgeries.push("a virgin anus");
slave.anus = 0;
- if (slave.analSkill > 10) {
- slave.analSkill -= 10;
+ if (slave.skill.anal > 10) {
+ slave.skill.anal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
-
} else if (slave.vagina > 0 && V.surgeryUpgrade === 1 && thisSurgery.surgery_holes === 2) {
surgeries.push("a virgin pussy");
slave.vagina = 0;
- if (slave.vaginalSkill > 10)
- slave.vaginalSkill -= 10;
+ if (slave.skill.vaginal > 10) {
+ slave.skill.vaginal -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
-
} else if (slave.anus > 1 && thisSurgery.surgery_holes === 1) {
surgeries.push("a tighter anus");
slave.anus = 1;
- if (slave.analSkill > 10) {
- slave.analSkill -= 10;
+ if (slave.skill.anal > 10) {
+ slave.skill.anal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
-
} else if (slave.vagina > 1 && thisSurgery.surgery_holes === 1) {
surgeries.push("a tighter pussy");
slave.vagina = 1;
- if (slave.vaginalSkill > 10) {
- slave.vaginalSkill -= 10;
+ if (slave.skill.vaginal > 10) {
+ slave.skill.vaginal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
@@ -353,19 +371,21 @@ window.rulesAutosurgery = (function() {
} else if (slave.balls > 0 && slave.vasectomy === 0 && thisSurgery.surgery_vasectomy === true) {
surgeries.push("vasectomy");
V.surgeryType = "vasectomy";
- if (V.PC.medicine >= 100)
+ if (V.PC.medicine >= 100) {
slave.health -= 5;
- else
+ } else {
slave.health -= 10;
+ }
slave.vasectomy = 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
} else if (slave.balls > 0 && slave.vasectomy === 1 && thisSurgery.surgery_vasectomy === false) {
surgeries.push("undo vasectomy");
V.surgeryType = "vasectomy undo";
- if (V.PC.medicine >= 100)
+ if (V.PC.medicine >= 100) {
slave.health -=5;
- else
+ } else {
slave.health -= 10;
+ }
slave.vasectomy = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
}
@@ -375,7 +395,7 @@ window.rulesAutosurgery = (function() {
surgeries.push("a nicer face");
if (slave.faceShape === "masculine") slave.faceShape = "androgynous";
slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
- slave.face = Math.clamp(slave.face+20,-100,100);
+ slave.face = Math.clamp(slave.face+20, -100, 100);
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
@@ -426,8 +446,9 @@ window.rulesAutosurgery = (function() {
surgeries.push("surgery to remove her lip implants");
slave.lips -= slave.lipsImplant;
slave.lipsImplant = 0;
- if (slave.oralSkill > 10)
- slave.oralSkill -= 10;
+ if (slave.skill.oral > 10) {
+ slave.skill.oral -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
@@ -435,8 +456,9 @@ window.rulesAutosurgery = (function() {
surgeries.push("bigger lips");
slave.lipsImplant += 10;
slave.lips += 10;
- if (slave.oralSkill > 10)
- slave.oralSkill -= 10;
+ if (slave.skill.oral > 10) {
+ slave.skill.oral -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
@@ -450,7 +472,7 @@ window.rulesAutosurgery = (function() {
surgeries.push("a nicer face");
if (slave.faceShape === "masculine") slave.faceShape = "androgynous";
slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
- slave.face = Math.clamp(slave.face+20,-100,100);
+ slave.face = Math.clamp(slave.face+20, -100, 100);
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
@@ -497,7 +519,7 @@ window.rulesAutosurgery = (function() {
else slave.health -= 10;
} else if (slave.waist >= -95 && V.seeExtreme === 1 && thisSurgery.surgery_cosmetic === 2) {
surgeries.push("a narrower waist");
- slave.waist = Math.clamp(slave.waist-20,-100,100);
+ slave.waist = Math.clamp(slave.waist-20, -100, 100);
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
@@ -534,14 +556,14 @@ window.rulesAutosurgery = (function() {
else slave.health -= 50;
}
bellyIn(slave);
-
} else if (slave.bellyImplant >= 0 && thisSurgery.surgery_bellyImplant === "remove") {
surgeries.push("belly implant removal");
V.surgeryType = "bellyOut";
- if (V.PC.medicine >= 100)
+ if (V.PC.medicine >= 100) {
slave.health -= 5;
- else
+ } else {
slave.health -= 10;
+ }
slave.preg = 0;
slave.bellyImplant = -1;
slave.cervixImplant = 0;
@@ -550,14 +572,18 @@ window.rulesAutosurgery = (function() {
}
}
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @param {Object} thisSurgery
+ * @param {string[]} surgeries
+ */
function PrintResult(slave, thisSurgery, surgeries) {
let surgeriesDisplay = "";
- if (surgeries.length === 1)
+ if (surgeries.length === 1) {
surgeriesDisplay = surgeries[0];
- else {
+ } else {
surgeriesDisplay = surgeries.slice(0, surgeries.length - 1).join(", ");
- surgeriesDisplay += ", and" + surgeries[surgeries.length - 1];
+ surgeriesDisplay += `, and${surgeries[surgeries.length - 1]}`;
}
r += `${V.assistantName === "your personal assistant" ? "Your personal assistant" : V.assistantName}, ordered to apply surgery, gives ${slave.slaveName} <span class="lime">${surgeriesDisplay}.</span>`;
}
@@ -565,11 +591,11 @@ window.rulesAutosurgery = (function() {
/** @param {App.Entity.SlaveState} slave */
function bellyIn(slave) {
// less hacky version of calling surgery degradation silently
- if (slave.devotion > 50)
+ if (slave.devotion > 50) {
slave.devotion += 4;
- else if (slave.devotion >= -20)
+ } else if (slave.devotion >= -20) {
slave.trust -= 5;
- else {
+ } else {
slave.trust -= 5;
slave.devotion -= 5;
}
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index f7d8af1a04120583cc9781fec97e59e49ec39625..1ccb2e21da33e3d1db9ca5d9846eacb88f67f2fa 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -1,5 +1,3 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
/*
times is how many times to increment the anal counts.
if left undefined it will assume it to be 1.
@@ -8,14 +6,15 @@ window.AnalVCheck = function AnalVCheck(times) {
const V = State.variables;
const slave = V.activeSlave;
const pronouns = getPronouns(slave);
- const he = pronouns.pronoun,
- //him = pronouns.object,
- his = pronouns.possessive;
+ const he = pronouns.pronoun;
+ //him = pronouns.object,
+ const his = pronouns.possessive;
// hers = pronouns.possessivePronoun,
// himself = pronouns.objectReflexive,
// boy = pronouns.noun;
- const He = capFirstChar(he),
- His = capFirstChar(his);
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
+ times = times || 1;
let r = ``;
if (canDoAnal(slave) && slave.anus === 0) {
r += `@@.lime;This breaks in ${slave.slaveName}'s virgin ass.@@ `;
@@ -48,13 +47,8 @@ window.AnalVCheck = function AnalVCheck(times) {
if (canImpreg(slave, V.PC)) {
r += knockMeUp(slave, 10, 1, -1, 1);
}
- if (!times) {
- V.analTotal += 1;
- slave.analCount += 1;
- } else {
- V.analTotal += times;
- slave.analCount += times;
- }
+ V.analTotal += times;
+ slave.analCount += times;
}
return r;
};
@@ -67,14 +61,15 @@ window.VaginalVCheck = function VaginalVCheck(times) {
const V = State.variables;
const slave = V.activeSlave;
const pronouns = getPronouns(slave);
- const he = pronouns.pronoun,
- him = pronouns.object,
- his = pronouns.possessive,
- hers = pronouns.possessivePronoun,
- himself = pronouns.objectReflexive,
- boy = pronouns.noun;
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.possessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
const He = capFirstChar(he);
const His = capFirstChar(his);
+ times = times || 1;
let r = ``;
if (canDoVaginal(slave) && slave.vagina === 0) {
r += `@@.lime;This breaks in ${slave.slaveName}'s virgin pussy.@@ `;
@@ -108,15 +103,9 @@ window.VaginalVCheck = function VaginalVCheck(times) {
if (canImpreg(slave, V.PC)) {
r += knockMeUp(slave, 10, 0, -1, 1);
}
- if (!times) {
- V.vaginalTotal += 1;
- slave.vaginalCount += 1;
- } else {
- V.vaginalTotal += times;
- slave.vaginalCount += times;
- }
+ V.vaginalTotal += times;
+ slave.vaginalCount += times;
}
-
return r;
};
@@ -129,14 +118,16 @@ window.BothVCheck = function BothVCheck(analTimes, bothTimes) {
const V = State.variables;
const slave = V.activeSlave;
const pronouns = getPronouns(slave);
- const he = pronouns.pronoun,
- him = pronouns.object,
- his = pronouns.possessive,
- hers = pronouns.possessivePronoun,
- himself = pronouns.objectReflexive,
- boy = pronouns.noun;
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.possessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
const He = capFirstChar(he);
const His = capFirstChar(his);
+ bothTimes = bothTimes || 1;
+ analTimes = analTimes || 1;
let r = ``;
if (canDoVaginal(slave)) {
if (slave.vagina === 0) {
@@ -200,28 +191,16 @@ window.BothVCheck = function BothVCheck(analTimes, bothTimes) {
slave.anus = 1;
}
if (canDoAnal(slave)) {
- if (!bothTimes) {
- V.vaginalTotal += 1;
- V.analTotal += 1;
- slave.vaginalCount += 1;
- slave.analCount += 1;
- } else {
- V.vaginalTotal += bothTimes;
- V.analTotal += bothTimes;
- slave.vaginalCount += bothTimes;
- slave.analCount += bothTimes;
- }
+ V.vaginalTotal += bothTimes;
+ V.analTotal += bothTimes;
+ slave.vaginalCount += bothTimes;
+ slave.analCount += bothTimes;
if (canImpreg(slave, V.PC)) {
r += knockMeUp(slave, 10, 2, -1, 1);
}
} else {
- if (!bothTimes) {
- V.vaginalTotal += 1;
- slave.vaginalCount += 1;
- } else {
- V.vaginalTotal += bothTimes;
- slave.vaginalCount += bothTimes;
- }
+ V.vaginalTotal += bothTimes;
+ slave.vaginalCount += bothTimes;
if (canImpreg(slave, V.PC)) {
r += knockMeUp(slave, 10, 0, -1, 1);
}
@@ -249,13 +228,8 @@ window.BothVCheck = function BothVCheck(analTimes, bothTimes) {
}
slave.anus = 1;
}
- if (!analTimes) {
- V.analTotal += 1;
- slave.analCount += 1;
- } else {
- V.analTotal += analTimes;
- slave.analCount += analTimes;
- }
+ V.analTotal += analTimes;
+ slave.analCount += analTimes;
if (canImpreg(slave, V.PC)) {
r += knockMeUp(slave, 10, 1, -1, 1);
}
@@ -289,14 +263,16 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
const V = State.variables;
const partner = V.slaves[V.partner];
const pronouns = getPronouns(partner);
- const he = pronouns.pronoun,
- him = pronouns.object,
- his = pronouns.possessive,
- hers = pronouns.possessivePronoun,
- himself = pronouns.objectReflexive,
- boy = pronouns.noun;
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.possessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
const He = capFirstChar(he);
const His = capFirstChar(his);
+ bothTimes = bothTimes || 1;
+ analTimes = analTimes || 1;
let r = ``;
if (V.partner < 0 || V.partner >= V.slaves.length) {
@@ -317,28 +293,16 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
}
if (canDoAnal(partner)) {
- if (!bothTimes) {
- V.vaginalTotal += 1;
- V.analTotal += 1;
- partner.vaginalCount += 1;
- partner.analCount += 1;
- } else {
- V.vaginalTotal += bothTimes;
- V.analTotal += bothTimes;
- partner.vaginalCount += bothTimes;
- partner.analCount += bothTimes;
- }
+ V.vaginalTotal += bothTimes;
+ V.analTotal += bothTimes;
+ partner.vaginalCount += bothTimes;
+ partner.analCount += bothTimes;
if (canImpreg(partner, V.PC)) {
r += knockMeUp(partner, 10, 2, -1);
}
} else {
- if (!bothTimes) {
- V.vaginalTotal += 1;
- partner.vaginalCount += 1;
- } else {
- V.vaginalTotal += bothTimes;
- partner.vaginalCount += bothTimes;
- }
+ V.vaginalTotal += bothTimes;
+ partner.vaginalCount += bothTimes;
if (canImpreg(partner, V.PC)) {
r += knockMeUp(partner, 10, 0, -1);
}
@@ -348,13 +312,8 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
r += `Since it's ${partner.slaveName}'s first time, you take your time and gently ease yourself into ${his} butthole before gradually increasing the intensity of your thrusts into ${his} ass. @@.lime;This breaks in ${partner.slaveName}'s virgin ass.@@ `;
partner.anus = 1;
}
- if (!analTimes) {
- V.analTotal += 1;
- partner.analCount += 1;
- } else {
- V.analTotal += analTimes;
- partner.analCount += analTimes;
- }
+ V.analTotal += analTimes;
+ partner.analCount += analTimes;
if (canImpreg(partner, V.PC)) {
r += knockMeUp(partner, 10, 1, -1);
}
@@ -370,11 +329,9 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
window.SimpleSexAct = function SimpleSexAct(slave, count) {
const V = State.variables;
let fuckTarget = 0;
- let fuckCount = 1;
- let r = ``;
- if (count) {
- fuckCount = count;
- }
+ const fuckCount = count || 1;
+ let r = "";
+
for (let i = 0; i < fuckCount; i++) {
fuckTarget = jsRandom(1, 100);
if (slave.nipples === "fuckable" && V.PC.dick === 1 && fuckTarget > 80) {
@@ -410,10 +367,8 @@ window.SimpleSexAct = function SimpleSexAct(slave, count) {
window.SimpleSlaveFucking = function SimpleSlaveFucking(slave, count) {
const V = State.variables;
let fuckTarget = 0;
- let fuckCount = 1;
- if (count) {
- fuckCount = count;
- }
+ const fuckCount = count || 1;
+
for (let i = 0; i < fuckCount; i++) {
fuckTarget = jsRandom(1, 100);
if (slave.nipples === "fuckable" && fuckTarget > 80) {
@@ -443,11 +398,9 @@ window.SimpleSlaveFucking = function SimpleSlaveFucking(slave, count) {
window.SimpleSlaveSlaveFucking = function SimpleSlaveSlaveFucking(subslave, domslave, count) {
const V = State.variables;
let fuckTarget = 0;
- let fuckCount = 1;
- let r = ``;
- if (count) {
- fuckCount = count;
- }
+ const fuckCount = count || 1;
+ let r = "";
+
for (let j = 0; j < fuckCount; j++) {
//there is a reason randomization happens inside cycle - to spread fuck around, otherwise cycle isn't even needed
fuckTarget = jsRandom(1, 100);
@@ -525,22 +478,14 @@ window.SimpleSlaveSlaveFucking = function SimpleSlaveSlaveFucking(subslave, doms
/** @param {App.Entity.SlaveState} slave */
window.SimpleVaginaFuck = function SimpleVaginaFuck(slave, count) {
- if (count) {
- State.variables.vaginalTotal += count;
- slave.vaginalCount += count;
- } else {
- State.variables.vaginalTotal++;
- slave.vaginalCount++;
- }
+ count = count || 1;
+ State.variables.vaginalTotal += count;
+ slave.vaginalCount += count;
};
/** @param {App.Entity.SlaveState} slave */
window.SimpleAssFuck = function SimpleAssFuck(slave, count) {
- if (count) {
- State.variables.analTotal += count;
- slave.analCount += count;
- } else {
- State.variables.analTotal++;
- slave.analCount++;
- }
+ count = count || 1;
+ State.variables.analTotal += count;
+ slave.analCount += count;
};
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index e605baafcd2d3dfd28c0b5d21508782c7fc0a003..65c36860e91c80c56b5f0b828539ef608787d956 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1,10 +1,14 @@
+/* eslint-disable no-undef */
window.Beauty = (function() {
"use strict";
let V;
let arcology;
let beauty;
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {number}
+ */
function Beauty(slave) {
V = State.variables;
arcology = V.arcologies[0];
@@ -79,10 +83,10 @@ window.Beauty = (function() {
beauty += (slave.height-160)/10;
beauty += 2*slave.hips;
if (slave.anus > 3) {
- beauty -= 10 + (slave.anus*2); /*-20*/
+ beauty -= 10 + (slave.anus*2); /* -20 */
}
if (slave.vagina > 3) {
- beauty -= 10 + (slave.vagina*2); /*-20*/
+ beauty -= 10 + (slave.vagina*2); /* -20 */
}
}
@@ -117,6 +121,8 @@ window.Beauty = (function() {
case "cute":
beauty += 8/3;
break;
+ default:
+ break;
}
}
@@ -145,10 +151,12 @@ window.Beauty = (function() {
case "mixed":
beauty -= 1;
break;
+ default:
+ break;
}
}
- function calcModBeauty(/*slave*/) {
+ function calcModBeauty(/* slave */) {
if (arcology.FSTransformationFetishist > 20 || arcology.FSDegradationist > 20) {
if (V.modScore > 15 || (V.piercingScore > 8 && V.tatScore > 5)) {
beauty += 8 + (V.modScore*0.25);
@@ -210,13 +218,15 @@ window.Beauty = (function() {
break;
case "freckles":
case "heavily freckled":
- if (slave.skin === "pale" || slave.skin === "fair") {
+ if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10)) {
beauty += 2;
if (slave.hColor === "red") {
beauty += 2;
}
}
break;
+ default:
+ break;
}
}
@@ -239,13 +249,13 @@ window.Beauty = (function() {
beauty -= (slave.intelligence + slave.intelligenceImplant)/2;
}
if (arcology.FSYouthPreferentialist !== "unset") {
- beauty += (30 - slave.visualAge)/(30 - V.minimumSlaveAge)*((arcology.FSYouthPreferentialist/2) + (arcology.FSYouthPreferentialistLaw*10)); /*max 60*/
+ beauty += (30 - slave.visualAge)/(30 - V.minimumSlaveAge)*((arcology.FSYouthPreferentialist/2) + (arcology.FSYouthPreferentialistLaw*10)); /* max 60 */
} else if (arcology.FSMaturityPreferentialist !== "unset") {
if (V.retirementAge > 30) {
- beauty += (30 - slave.visualAge)/(30 - V.retirementAge)*((arcology.FSMaturityPreferentialist/2) + (arcology.FSMaturityPreferentialistLaw*10)); /*max 60, problems if retirementAge is 30 or under*/
+ beauty += (30 - slave.visualAge)/(30 - V.retirementAge)*((arcology.FSMaturityPreferentialist/2) + (arcology.FSMaturityPreferentialistLaw*10)); /* max 60, problems if retirementAge is 30 or under */
}
}
- if (arcology.FSBodyPurist > 20) { /*bonus for virgin slaves*/
+ if (arcology.FSBodyPurist > 20) { /* bonus for virgin slaves */
if (slave.vagina === 0 && slave.vaginalCount === 0) {
beauty += 30*(arcology.FSBodyPurist/100);
}
@@ -295,12 +305,12 @@ window.Beauty = (function() {
beauty += Math.min(slave.health, 100)/5;
beauty += slave.voice;
beauty += (slave.intelligence + slave.intelligenceImplant)/10;
- beauty += slave.entertainSkill/10;
- beauty += slave.whoreSkill/10;
+ beauty += slave.skill.entertainment/10;
+ beauty += slave.skill.whore/10;
beauty -= 3*slave.visualAge;
if (setup.entertainmentCareers.includes(slave.career)) {
beauty += 20;
- } else if (V.week - slave.weekAcquired >= 20 && slave.entertainSkill >= 100) {
+ } else if (V.week - slave.weekAcquired >= 20 && slave.skill.entertainment >= 100) {
beauty += 10;
}
if (slave.race === "white" && slave.origRace === "white") {
@@ -314,11 +324,11 @@ window.Beauty = (function() {
function calcDickBeauty(slave) {
if (arcology.FSAssetExpansionist > 20 && arcology.FSGenderFundamentalist === "unset") {
if (slave.dick >= 20) {
- beauty += 17 + (slave.dick*(arcology.FSAssetExpansionist/500)); /*23*/
+ beauty += 17 + (slave.dick*(arcology.FSAssetExpansionist/500)); /* 23 */
} else if (slave.dick >= 10) {
- beauty += 10 + (slave.dick*(arcology.FSAssetExpansionist/300)); /*16.3*/
+ beauty += 10 + (slave.dick*(arcology.FSAssetExpansionist/300)); /* 16.3 */
} else if (slave.dick > 6) {
- beauty += slave.dick*(1 + (arcology.FSAssetExpansionist/100)); /*10*/
+ beauty += slave.dick*(1 + (arcology.FSAssetExpansionist/100)); /* 10 */
}
} else if (arcology.FSGenderFundamentalist !== "unset") {
if (slave.dick > 0) {
@@ -326,11 +336,11 @@ window.Beauty = (function() {
}
} else if (arcology.FSGenderRadicalist !== "unset") {
if (slave.dick > 20) {
- beauty += 20 + (slave.dick*(arcology.FSGenderRadicalist/400)); /*27.5*/
+ beauty += 20 + (slave.dick*(arcology.FSGenderRadicalist/400)); /* 27.5 */
} else if (slave.dick >= 10) {
- beauty += 10 + (slave.dick*(arcology.FSGenderRadicalist/200)); /*20*/
+ beauty += 10 + (slave.dick*(arcology.FSGenderRadicalist/200)); /* 20 */
} else if (slave.dick > 0) {
- beauty += slave.dick*(1 + (arcology.FSGenderRadicalist/100)); /*10*/
+ beauty += slave.dick*(1 + (arcology.FSGenderRadicalist/100)); /* 10 */
}
} else {
beauty -= 2*slave.dick;
@@ -341,13 +351,13 @@ window.Beauty = (function() {
function calcBallsBeauty(slave) {
if (arcology.FSAssetExpansionist > 20 && arcology.FSGenderFundamentalist === "unset") {
if (slave.balls > 100) {
- beauty += 41 + (slave.balls*(arcology.FSAssetExpansionist/500)); /*66*/
+ beauty += 41 + (slave.balls*(arcology.FSAssetExpansionist/500)); /* 66 */
} else if (slave.balls > 80) {
- beauty += 16 + (slave.balls*(arcology.FSAssetExpansionist/400)); /*41*/
+ beauty += 16 + (slave.balls*(arcology.FSAssetExpansionist/400)); /* 41 */
} else if (slave.balls > 60) {
- beauty += 6 + (slave.balls*(arcology.FSAssetExpansionist/800)); /*16*/
+ beauty += 6 + (slave.balls*(arcology.FSAssetExpansionist/800)); /* 16 */
} else if (slave.balls > 10) {
- beauty += slave.balls*((arcology.FSAssetExpansionist/1000)); /*6*/
+ beauty += slave.balls*((arcology.FSAssetExpansionist/1000)); /* 6 */
}
} else if (arcology.FSGenderFundamentalist !== "unset") {
if (slave.scrotum > 0) {
@@ -356,13 +366,13 @@ window.Beauty = (function() {
} else if (arcology.FSGenderRadicalist !== "unset") {
if (slave.scrotum > 0) {
if (slave.balls > 100) {
- beauty += 40 + (slave.balls*(arcology.FSGenderRadicalist/2000)); /*46.25*/
+ beauty += 40 + (slave.balls*(arcology.FSGenderRadicalist/2000)); /* 46.25 */
} else if (slave.balls > 60) {
- beauty += 30 + (slave.balls*(arcology.FSGenderRadicalist/1000)); /*40*/
+ beauty += 30 + (slave.balls*(arcology.FSGenderRadicalist/1000)); /* 40 */
} else if (slave.balls > 10) {
- beauty += 15 + (slave.balls*(arcology.FSGenderRadicalist/400)); /*30*/
+ beauty += 15 + (slave.balls*(arcology.FSGenderRadicalist/400)); /* 30 */
} else {
- beauty += slave.balls*(1 + (arcology.FSGenderRadicalist/200)); /*15*/
+ beauty += slave.balls*(1 + (arcology.FSGenderRadicalist/200)); /* 15 */
}
}
} else {
@@ -380,35 +390,35 @@ window.Beauty = (function() {
/** @param {App.Entity.SlaveState} slave */
function calcButtBeauty(slave) {
if (slave.butt <= 10) {
- beauty += 1.5*slave.butt; /*max 15*/
+ beauty += 1.5*slave.butt; /* max 15 */
} else {
- beauty += 15 + (slave.butt/4); /*max 20*/
+ beauty += 15 + (slave.butt/4); /* max 20 */
}
if ((arcology.FSTransformationFetishist > 20 && arcology.FSSlimnessEnthusiast === "unset") || arcology.FSAssetExpansionist > 20) {
if (slave.butt <= 2) {
- beauty += 2*(slave.butt - 1); /*2*/
+ beauty += 2*(slave.butt - 1); /* 2 */
} else if (slave.butt <= 4) {
- beauty += 2 + 1.5*(slave.butt - 2); /*5*/
+ beauty += 2 + 1.5*(slave.butt - 2); /* 5 */
} else if (slave.butt <= 10) {
- beauty += 5 + 1*(slave.butt - 4); /*11*/
+ beauty += 5 + 1*(slave.butt - 4); /* 11 */
} else {
- beauty += 7 + 0.5*(slave.butt - 5); /*14.5*/
+ beauty += 7 + 0.5*(slave.butt - 5); /* 14.5 */
} /* maybe buff butts? */
} else if (arcology.FSSlimnessEnthusiast > 20) {
if (slave.butt <= 3) {
- beauty += 12 + 3*(slave.butt - 1); /*18 buff if asses get buffed*/
+ beauty += 12 + 3*(slave.butt - 1); /* 18 buff if asses get buffed */
} else if (slave.butt <= 5) {
beauty += 9;
} else {
- beauty -= 10 + 3*slave.butt; /*-70*/
+ beauty -= 10 + 3*slave.butt; /* -70 */
}
} else {
if (slave.butt <= 2) {
- beauty += 2*(slave.butt-1); /*2*/
+ beauty += 2*(slave.butt-1); /* 2 */
} else if (slave.butt <= 4) {
- beauty += 2 + (1.5*(slave.butt - 2)); /*5*/
+ beauty += 2 + (1.5*(slave.butt - 2)); /* 5 */
} else if (slave.butt <= 8) {
- beauty += 2 + (1.5*(slave.butt - 2)); /*11*/
+ beauty += 2 + (1.5*(slave.butt - 2)); /* 11 */
} else {
beauty += 9;
}
@@ -495,6 +505,8 @@ window.Beauty = (function() {
beauty += 1;
}
break;
+ default:
+ break;
}
}
@@ -502,33 +514,33 @@ window.Beauty = (function() {
function calcBoobsBeauty(slave) {
if ((arcology.FSTransformationFetishist > 20 && arcology.FSSlimnessEnthusiast === "unset") || arcology.FSAssetExpansionist > 20) {
if (slave.boobs <= 750) {
- beauty += -4 + 0.01*(slave.boobs); /*3.5*/
+ beauty += -4 + 0.01*(slave.boobs); /* 3.5 */
} else if (slave.boobs <= 2050) {
- beauty += 3.5 + 0.0175*(slave.boobs - 750); /*26.25*/
+ beauty += 3.5 + 0.0175*(slave.boobs - 750); /* 26.25 */
} else if (slave.boobs <= 3000) {
- beauty += 26.25 + 0.025*(slave.boobs - 2050); /*50*/
+ beauty += 26.25 + 0.025*(slave.boobs - 2050); /* 50 */
} else if (slave.boobs <= 25000) {
- beauty += 50 + 0.005*(slave.boobs - 3000); /*160 - this might need to be lowered. Maybe drop the 50? Otherwise break it down more.*/
+ beauty += 50 + 0.005*(slave.boobs - 3000); /* 160 - this might need to be lowered. Maybe drop the 50? Otherwise break it down more. */
} else {
beauty += 160 + 0.001*(slave.boobs - 25000); /* 185 */
}
} else if (arcology.FSSlimnessEnthusiast > 20) {
if (slave.boobs <= 500) {
- beauty += 0.08*(slave.boobs); /*40 - buff me to be in line with higher end asset exp*/
+ beauty += 0.08*(slave.boobs); /* 40 - buff me to be in line with higher end asset exp */
} else if (slave.boobs <= 1000) {
beauty += 10;
} else if (slave.boobs <= 3000) {
beauty += 5;
} else {
- beauty -= 5 + 0.005*(slave.boobs - 3000); /*-110*/
+ beauty -= 5 + 0.005*(slave.boobs - 3000); /* -110 */
}
} else {
if (slave.boobs <= 1200) {
- beauty += 0.02*(slave.boobs - 200); /*20*/
+ beauty += 0.02*(slave.boobs - 200); /* 20 */
} else if (slave.boobs <= 2400) {
- beauty += 20 + (0.01*(slave.boobs - 1200)); /*32*/
+ beauty += 20 + (0.01*(slave.boobs - 1200)); /* 32 */
} else if (slave.boobs <= 3600) {
- beauty += 32 + (0.005*(slave.boobs - 2400)); /*38*/
+ beauty += 32 + (0.005*(slave.boobs - 2400)); /* 38 */
} else if (slave.boobs <= 10000) {
beauty += 38;
} else if (slave.boobs <= 25000) {
@@ -610,25 +622,25 @@ window.Beauty = (function() {
function calcWeightBeauty(slave) {
if (arcology.FSHedonisticDecadence > 20) {
if (slave.weight < -95) {
- beauty += -70 + (slave.weight/10); /*-80*/
+ beauty += -70 + (slave.weight/10); /* -80 */
} else if (slave.weight < -30) {
- beauty += -30 + (slave.weight/3); /*-61*/
+ beauty += -30 + (slave.weight/3); /* -61 */
} else if (slave.weight < -10) {
- beauty += (slave.weight); /*-30*/
+ beauty += (slave.weight); /* -30 */
} else if (slave.weight <= 10) {
/* no effect */
} else if (slave.weight <= 30) {
- beauty += (slave.weight/2); /*15*/
+ beauty += (slave.weight/2); /* 15 */
} else if (slave.weight <= 95) {
- beauty += 15 + (slave.weight/7); /*28.5*/
+ beauty += 15 + (slave.weight/7); /* 28.5 */
} else if (slave.weight <= 130) {
- beauty += 28 + (slave.weight/10); /*41*/
+ beauty += 28 + (slave.weight/10); /* 41 */
} else if (slave.weight <= 160) {
- beauty += 42 + (slave.weight/20); /*50*/
+ beauty += 42 + (slave.weight/20); /* 50 */
} else if (slave.weight <= 190) {
- beauty += 50 - (slave.weight/25); /*42.5*/
+ beauty += 50 - (slave.weight/25); /* 42.5 */
} else {
- beauty += 40 - (slave.weight/20); /*30*/
+ beauty += 40 - (slave.weight/20); /* 30 */
}
} else {
if (slave.weight > 130) {
@@ -656,7 +668,7 @@ window.Beauty = (function() {
if (arcology.FSPhysicalIdealist !== "unset") {
if (arcology.FSPhysicalIdealistStrongFat === 1) {
if (slave.weight > 10 && slave.weight <= 130) {
- beauty += slave.weight*(arcology.FSPhysicalIdealist/200); /*65*/
+ beauty += slave.weight*(arcology.FSPhysicalIdealist/200); /* 65 */
} else {
beauty -= Math.abs(slave.weight)/2;
}
@@ -675,17 +687,17 @@ window.Beauty = (function() {
}
} else {
if (slave.muscles > 30 || slave.muscles <= -5) {
- beauty += slave.muscles*(arcology.FSPhysicalIdealist/120); /*+-83*/
+ beauty += slave.muscles*(arcology.FSPhysicalIdealist/120); /* +-83 */
}
}
} else if (arcology.FSHedonisticDecadence !== "unset") {
if (slave.muscles < -10) {
- beauty += Math.abs(slave.muscles)*(arcology.FSHedonisticDecadence/160); /*62.5*/
+ beauty += Math.abs(slave.muscles)*(arcology.FSHedonisticDecadence/160); /* 62.5 */
} else if (slave.muscles > 5) {
if (arcology.FSHedonisticDecadenceStrongFat === 1) {
- beauty += slave.muscles*(arcology.FSHedonisticDecadence/200); /*50*/
+ beauty += slave.muscles*(arcology.FSHedonisticDecadence/200); /* 50 */
} else {
- beauty -= slave.muscles*(arcology.FSHedonisticDecadence/200); /*-50*/
+ beauty -= slave.muscles*(arcology.FSHedonisticDecadence/200); /* -50 */
}
}
}
@@ -710,6 +722,8 @@ window.Beauty = (function() {
beauty -= 2;
}
break;
+ default:
+ break;
}
switch (slave.pubicHStyle) {
case "hairless":
@@ -738,6 +752,8 @@ window.Beauty = (function() {
beauty -= 6;
}
break;
+ default:
+ break;
}
}
}
@@ -773,43 +789,43 @@ window.Beauty = (function() {
/** @param {App.Entity.SlaveState} slave */
function calcRepopulationPregBeauty(slave) {
- if (slave.preg > slave.pregData.normalBirth/1.33) { /*limited huge boost for full term */
+ if (slave.preg > slave.pregData.normalBirth/1.33) { /* limited huge boost for full term */
if (slave.broodmother > 0) {
- beauty += 0.4*(slave.broodmother*arcology.FSRepopulationFocus); /*40-80 limited due to constant presence. Also good breeders, but subpar mothers*/
+ beauty += 0.4*(slave.broodmother*arcology.FSRepopulationFocus); /* 40-80 limited due to constant presence. Also good breeders, but subpar mothers */
} else if (slave.bellyPreg >= 600000) {
- beauty += 1.5*arcology.FSRepopulationFocus; /*150*/
+ beauty += 1.5*arcology.FSRepopulationFocus; /* 150 */
} else if (slave.bellyPreg >= 300000) {
- beauty += arcology.FSRepopulationFocus; /*100*/
+ beauty += arcology.FSRepopulationFocus; /* 100 */
} else if (slave.bellyPreg >= 120000) {
- beauty += 0.9*arcology.FSRepopulationFocus; /*90*/
+ beauty += 0.9*arcology.FSRepopulationFocus; /* 90 */
} else {
- beauty += 0.8*arcology.FSRepopulationFocus; /*80*/
+ beauty += 0.8*arcology.FSRepopulationFocus; /* 80 */
}
} else if (slave.preg > slave.pregData.normalBirth/2) {
if (slave.pregType >= 20) {
- beauty += 10*(arcology.FSRepopulationFocus/40); /*25*/
+ beauty += 10*(arcology.FSRepopulationFocus/40); /* 25 */
} else if (slave.pregType >= 10) {
- beauty += 9*(arcology.FSRepopulationFocus/40); /*22.5*/
+ beauty += 9*(arcology.FSRepopulationFocus/40); /* 22.5 */
} else {
- beauty += 8*(arcology.FSRepopulationFocus/40); /*20*/
+ beauty += 8*(arcology.FSRepopulationFocus/40); /* 20 */
}
} else if (slave.preg > slave.pregData.normalBirth/4) {
if (slave.pregType >= 20) {
- beauty += arcology.FSRepopulationFocus/5; /*20*/
+ beauty += arcology.FSRepopulationFocus/5; /* 20 */
} else if (slave.pregType >= 10) {
- beauty += arcology.FSRepopulationFocus/6.25; /*16*/
+ beauty += arcology.FSRepopulationFocus/6.25; /* 16 */
} else {
- beauty += arcology.FSRepopulationFocus/10; /*10*/
+ beauty += arcology.FSRepopulationFocus/10; /* 10 */
}
} else if (slave.pregWeek < 0) {
- beauty += arcology.FSRepopulationFocus/10; /*10*/
+ beauty += arcology.FSRepopulationFocus/10; /* 10 */
} else if (slave.preg > 0 && slave.collar === "preg biometrics") {
- beauty += arcology.FSRepopulationFocus/12; /*8.33*/
+ beauty += arcology.FSRepopulationFocus/12; /* 8.33 */
} else {
- beauty -= arcology.FSRepopulationFocus/2.5; /*-40*/
+ beauty -= arcology.FSRepopulationFocus/2.5; /* -40 */
}
if (slave.births > 50) {
- beauty += arcology.FSRepopulationFocus/1.5; /*66.6*/
+ beauty += arcology.FSRepopulationFocus/1.5; /* 66.6 */
} else {
beauty += slave.births*(arcology.FSRepopulationFocus/75);
}
@@ -817,7 +833,7 @@ window.Beauty = (function() {
/** @param {App.Entity.SlaveState} slave */
function calcTrendyPregBeauty(slave) {
- if (slave.preg > slave.pregData.normalBirth/1.33) { /*limited huge boost for full term */
+ if (slave.preg > slave.pregData.normalBirth/1.33) { /* limited huge boost for full term */
beauty += 20;
} else if (slave.bellyPreg >= 1500) {
beauty += 10;
@@ -828,42 +844,42 @@ window.Beauty = (function() {
function calcRestartPregBeauty(slave) {
if (slave.breedingMark === 1 && V.propOutcome === 1) {
if (slave.preg > slave.pregData.normalBirth/8 && slave.pregSource === -1) {
- beauty += arcology.FSRestart; /*100*/
+ beauty += arcology.FSRestart; /* 100 */
}
} else {
if (slave.preg > slave.pregData.normalBirth/1.33) {
if (slave.bellyPreg >= 600000) {
- beauty -= 2.5*arcology.FSRestart; /*-250*/
+ beauty -= 2.5*arcology.FSRestart; /* -250 */
} else if (slave.bellyPreg >= 300000) {
- beauty -= 1.25*arcology.FSRestart; /*-125*/
+ beauty -= 1.25*arcology.FSRestart; /* -125 */
} else if (slave.bellyPreg >= 120000) {
- beauty -= arcology.FSRestart; /*-100*/
+ beauty -= arcology.FSRestart; /* -100 */
} else {
- beauty -= 0.75*arcology.FSRestart; /*-75*/
+ beauty -= 0.75*arcology.FSRestart; /* -75 */
}
} else if (slave.preg > slave.pregData.normalBirth/2) {
if (slave.pregType >= 20) {
- beauty -= arcology.FSRestart/1.5; /*-66.6*/
+ beauty -= arcology.FSRestart/1.5; /* -66.6 */
} else if (slave.pregType >= 10) {
- beauty -= arcology.FSRestart/2; /*-50*/
+ beauty -= arcology.FSRestart/2; /* -50 */
} else {
- beauty -= arcology.FSRestart/3; /*-33.3*/
+ beauty -= arcology.FSRestart/3; /* -33.3 */
}
} else if (slave.preg > slave.pregData.normalBirth/4) {
if (slave.pregType >= 20) {
- beauty -= 3*(arcology.FSRestart/8); /*-37.5*/
+ beauty -= 3*(arcology.FSRestart/8); /* -37.5 */
} else if (slave.pregType >= 10) {
- beauty -= arcology.FSRestart/4; /*-25*/
+ beauty -= arcology.FSRestart/4; /* -25 */
} else {
- beauty -= arcology.FSRestart/8; /*-12.5*/
+ beauty -= arcology.FSRestart/8; /* -12.5 */
}
} else if (slave.preg === -2) {
- beauty += arcology.FSRestart/7; /*14.2*/
+ beauty += arcology.FSRestart/7; /* 14.2 */
} else if (slave.preg < 1) {
- beauty += arcology.FSRestart/5; /*20*/
+ beauty += arcology.FSRestart/5; /* 20 */
}
if (slave.births > 50) {
- beauty -= arcology.FSRestart; /*-100*/
+ beauty -= arcology.FSRestart; /* -100 */
} else {
beauty -= slave.births*(arcology.FSRestart/50);
}
@@ -902,6 +918,8 @@ window.Beauty = (function() {
}
}
break;
+ default:
+ break;
}
}
@@ -941,25 +959,25 @@ window.Beauty = (function() {
/** @param {App.Entity.SlaveState} slave */
function calcFutaLawBigBootyBeauty(slave) {
if (slave.hips >= 1) {
- beauty += 4*(slave.hips - 1); /*8*/
+ beauty += 4*(slave.hips - 1); /* 8 */
if (arcology.FSSlimnessEnthusiast !== "unset") {
- beauty += 4*(slave.hips - 1); /*8*/ /* offsets the malus for big butts */
+ beauty += 4*(slave.hips - 1); /* 8 */ /* offsets the malus for big butts */
}
}
- if (slave.analSkill > 60 && slave.anus >= 2) {
- beauty += 2*(slave.anus-2); /*6*/
+ if (slave.skill.anal > 60 && slave.anus >= 2) {
+ beauty += 2*(slave.anus-2); /* 6 */
if (arcology.FSSlimnessEnthusiast !== "unset") {
- beauty += 2*(slave.anus-2); /*6*/ /* offsets the malus for big butts */
+ beauty += 2*(slave.anus-2); /* 6 */ /* offsets the malus for big butts */
}
}
if (slave.butt >= 5) {
- beauty += (slave.butt - 5); /*15*/
+ beauty += (slave.butt - 5); /* 15 */
}
}
/** @param {App.Entity.SlaveState} slave */
function calcFutaLawFemboyBeauty(slave) {
- if (arcology.FSSlimnessEnthusiast === "unset") { /*balance with slimness*/
+ if (arcology.FSSlimnessEnthusiast === "unset") { /* balance with slimness */
beauty += 20;
if (slave.boobs < 300) {
beauty += 12;
@@ -975,8 +993,8 @@ window.Beauty = (function() {
if (slave.balls <= 2) {
beauty += 8;
}
- if (slave.faceShape === "cute" && slave.face > 0) { /*uggos need not apply, maybe a small boost for other faceShapes*/
- beauty += ((arcology.FSGenderRadicalist/25)*(slave.face/30)) - 2; /*gives a slightly better boost than androgynous does with gendrad boost, 15.3*/
+ if (slave.faceShape === "cute" && slave.face > 0) { /* uggos need not apply, maybe a small boost for other faceShapes */
+ beauty += ((arcology.FSGenderRadicalist/25)*(slave.face/30)) - 2; /* gives a slightly better boost than androgynous does with gendrad boost, 15.3 */
}
if (slave.nipples === "tiny") {
beauty += 5;
@@ -1028,6 +1046,8 @@ window.Beauty = (function() {
case -4:
beauty -= 2;
break;
+ default:
+ break;
}
}
@@ -1071,9 +1091,9 @@ window.Beauty = (function() {
}
if (arcology.FSHedonisticDecadenceLaw2 === 1) {
if (slave.boobs >= 2000 && slave.butt >= 5 && slave.weight > 95) {
- beauty += 5 + (arcology.FSHedonisticDecadence/20); /*10*/
+ beauty += 5 + (arcology.FSHedonisticDecadence/20); /* 10 */
} else {
- beauty -= 15 + (arcology.FSHedonisticDecadence/20); /*-20*/
+ beauty -= 15 + (arcology.FSHedonisticDecadence/20); /* -20 */
}
}
if (arcology.FSChattelReligionistCreed === 1) {
@@ -1155,7 +1175,7 @@ window.Beauty = (function() {
/** @param {App.Entity.SlaveState} slave */
function calcSlimBeauty(slave) {
if (slimPass(slave) === 1) {
- beauty += 40 + (arcology.FSSlimnessEnthusiast/20); /*45*/
+ beauty += 40 + (arcology.FSSlimnessEnthusiast/20); /* 45 */
} else {
beauty -= arcology.FSSlimnessEnthusiast/20;
}
@@ -1165,10 +1185,10 @@ window.Beauty = (function() {
function calcGenderLawBeauty(slave) {
V.genderLawPass = 1;
- if (arcology.FSPhysicalIdealist === "unset" && arcology.FSHedonisticDecadenceStrongFat === 0 && slave.muscles > 30) { /*muscle check*/
+ if (arcology.FSPhysicalIdealist === "unset" && arcology.FSHedonisticDecadenceStrongFat === 0 && slave.muscles > 30) { /* muscle check */
V.genderLawPass = 0;
}
- if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
+ if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /* weight check */
if (slave.weight > 130 || slave.weight <= -30) {
V.genderLawPass = 0;
}
@@ -1236,7 +1256,7 @@ window.Beauty = (function() {
}
if (slave.bellyImplant >= 1500) {
if (arcology.FSTransformationFetishist > 20) {
- beauty += Math.min(Math.trunc(slave.bellyImplant/1000), 50); /*50*/
+ beauty += Math.min(Math.trunc(slave.bellyImplant/1000), 50); /* 50 */
} else if (arcology.FSRepopulationFocus > 60) {
if ((slave.ovaries === 0 && slave.mpreg === 0) || slave.preg < -1) {
beauty += 20;
@@ -1316,11 +1336,17 @@ window.FResult = (function() {
"use strict";
// we can't initialize our global variables on load, because SugarCube.State isn't initialized
// instead, declare them and initialize on run time
- let V; let result; let incest_bonus;
- /** @param {App.Entity.SlaveState} slave */
+ // eslint-disable-next-line camelcase
+ let V;
+ let result;
+ let incestBonus;
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {number}
+ */
function FResult(slave) {
V = State.variables;
- incest_bonus = V.arcologies[0].FSEgyptianRevivalist > 20 || V.arcologies[0].FSEgyptianRevivalistIncestPolicy === 1;
+ incestBonus = V.arcologies[0].FSEgyptianRevivalist > 20 || V.arcologies[0].FSEgyptianRevivalistIncestPolicy === 1;
calcUseWeights(slave);
if (!slave.fuckdoll) {
@@ -1383,19 +1409,19 @@ window.FResult = (function() {
const uses = V.oralUseWeight + V.vaginalUseWeight + V.analUseWeight;
if (uses <= 0) return;
- result += (6+slave.tonguePiercing) * (V.oralUseWeight/uses) * (slave.oralSkill/30);
+ result += (6+slave.tonguePiercing) * (V.oralUseWeight/uses) * (slave.skill.oral/30);
if (slave.sexualFlaw === "cum addict") {
- result += (V.oralUseWeight/uses) * (slave.oralSkill/30);
+ result += (V.oralUseWeight/uses) * (slave.skill.oral/30);
}
if (canDoVaginal(slave)) {
- result += 6 * (V.vaginalUseWeight/uses) * (slave.vaginalSkill/30);
+ result += 6 * (V.vaginalUseWeight/uses) * (slave.skill.vaginal/30);
result += (3 - slave.vagina);
result += slave.vaginaLube;
}
if (canDoAnal(slave)) {
- result += 6 * (V.analUseWeight/uses) * (slave.analSkill/30);
+ result += 6 * (V.analUseWeight/uses) * (slave.skill.anal/30);
if (slave.sexualFlaw === "anal addict") {
- result += (V.analUseWeight/uses) * (slave.analSkill/30);
+ result += (V.analUseWeight/uses) * (slave.skill.anal/30);
}
if (slave.inflationType === "aphrodisiac") {
result += (V.analUseWeight/uses) * (slave.inflation * 3);
@@ -1416,11 +1442,11 @@ window.FResult = (function() {
V.slaves.forEach(islave => {
if (isParentP(slave, islave) && sameAssignmentP(slave, islave)) {
result += 1;
- if (incest_bonus) result += 1;
+ if (incestBonus) result += 1;
}
if (areSisters(slave, islave) > 0 && sameAssignmentP(slave, islave)) {
result += 1;
- if (incest_bonus) result += 1;
+ if (incestBonus) result += 1;
}
});
}
@@ -1430,7 +1456,7 @@ window.FResult = (function() {
const fre = getSlave(slave.relationTarget);
if (fre !== undefined && sameAssignmentP(slave, fre)) {
result += 2;
- if (incest_bonus) result += 2;
+ if (incestBonus) result += 2;
}
}
@@ -1658,7 +1684,12 @@ window.slaveCost = (function() {
"use strict";
let V; let arcology; let multiplier; let cost;
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @param {number} isStartingSlave
+ * @returns {number} Any number here means the slave
+ * is a "starting slave"
+ */
function slaveCost(slave, isStartingSlave) {
V = State.variables;
arcology = V.arcologies[0];
@@ -1945,7 +1976,7 @@ window.slaveCost = (function() {
multiplier += 0.05;
}
}
- if (V.week-slave.weekAcquired >= 20 && slave.entertainSkill >= 100) {
+ if (V.week-slave.weekAcquired >= 20 && slave.skill.entertainment >= 100) {
if (!setup.entertainmentCareers.includes(slave.career)) {
multiplier += 0.05;
}
@@ -1955,49 +1986,49 @@ window.slaveCost = (function() {
multiplier += 0.05;
}
}
- if (!setup.bodyguardCareers.includes(slave.career) && slave.skillBG >= V.masteredXP) {
+ if (!setup.bodyguardCareers.includes(slave.career) && slave.skill.bodyguard >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.wardenessCareers.includes(slave.career) && slave.skillWA >= V.masteredXP) {
+ if (!setup.wardenessCareers.includes(slave.career) && slave.skill.wardeness >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.attendantCareers.includes(slave.career) && slave.skillAT >= V.masteredXP) {
+ if (!setup.attendantCareers.includes(slave.career) && slave.skill.attendant >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.matronCareers.includes(slave.career) && slave.skillMT >= V.masteredXP) {
+ if (!setup.matronCareers.includes(slave.career) && slave.skill.matron >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.schoolteacherCareers.includes(slave.career) && slave.skillTE >= V.masteredXP) {
+ if (!setup.schoolteacherCareers.includes(slave.career) && slave.skill.teacher >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.stewardessCareers.includes(slave.career) && slave.skillST >= V.masteredXP) {
+ if (!setup.stewardessCareers.includes(slave.career) && slave.skill.stewardess >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.milkmaidCareers.includes(slave.career) && slave.skillMM >= V.masteredXP) {
+ if (!setup.milkmaidCareers.includes(slave.career) && slave.skill.milkmaid >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.farmerCareers.includes(slave.career) && slave.skillFA >= V.masteredXP) {
+ if (!setup.farmerCareers.includes(slave.career) && slave.skill.farmer >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.madamCareers.includes(slave.career) && slave.skillMD >= V.masteredXP) {
+ if (!setup.madamCareers.includes(slave.career) && slave.skill.madam >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.DJCareers.includes(slave.career) && slave.skillDJ >= V.masteredXP) {
+ if (!setup.DJCareers.includes(slave.career) && slave.skill.DJ >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.HGCareers.includes(slave.career) && slave.skillHG >= V.masteredXP) {
+ if (!setup.HGCareers.includes(slave.career) && slave.skill.headGirl >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.recruiterCareers.includes(slave.career) && slave.skillRC >= V.masteredXP) {
+ if (!setup.recruiterCareers.includes(slave.career) && slave.skill.recruiter >= V.masteredXP) {
multiplier += 0.1;
}
- if (!setup.servantCareers.includes(slave.career) && slave.skillS >= V.masteredXP) {
+ if (!setup.servantCareers.includes(slave.career) && slave.skill.servant >= V.masteredXP) {
multiplier += 0.05;
}
- if (!setup.entertainmentCareers.includes(slave.career) && slave.skillE >= V.masteredXP) {
+ if (!setup.entertainmentCareers.includes(slave.career) && slave.skill.entertainer >= V.masteredXP) {
multiplier += 0.05;
}
- if (!setup.whoreCareers.includes(slave.career) && slave.skillW >= V.masteredXP) {
+ if (!setup.whoreCareers.includes(slave.career) && slave.skill.whore >= V.masteredXP) {
multiplier += 0.05;
}
}
@@ -2042,7 +2073,7 @@ window.slaveCost = (function() {
}
}
- function calcCost(/*slave*/) {
+ function calcCost(/* slave */) {
cost *= multiplier*50;
cost = Number(cost) || 0;
if (cost < V.minimumSlaveCost) {
@@ -2073,22 +2104,22 @@ window.slaveCost = (function() {
if (slave.devotion > 20) {
startingSlaveMultiplier += (0.000117*(slave.devotion-20)*(slave.devotion-20))+(0.003167*(slave.devotion-20));
}
- if (slave.whoreSkill) {
- startingSlaveMultiplier += 0.00001*slave.whoreSkill*slave.whoreSkill;
+ if (slave.skill.whore) {
+ startingSlaveMultiplier += 0.00001*slave.skill.whore*slave.skill.whore;
}
- if (slave.entertainSkill) {
- startingSlaveMultiplier += 0.00001*slave.entertainSkill*slave.entertainSkill;
+ if (slave.skill.entertainment) {
+ startingSlaveMultiplier += 0.00001*slave.skill.entertainment*slave.skill.entertainment;
}
- if (slave.vaginalSkill) {
- startingSlaveMultiplier += 0.00001*slave.vaginalSkill*slave.vaginalSkill;
+ if (slave.skill.vaginal) {
+ startingSlaveMultiplier += 0.00001*slave.skill.vaginal*slave.skill.vaginal;
}
- if (slave.analSkill) {
- startingSlaveMultiplier += 0.00001*slave.analSkill*slave.analSkill;
+ if (slave.skill.anal) {
+ startingSlaveMultiplier += 0.00001*slave.skill.anal*slave.skill.anal;
}
- if (slave.oralSkill) {
- startingSlaveMultiplier += 0.00001*slave.oralSkill*slave.oralSkill;
+ if (slave.skill.oral) {
+ startingSlaveMultiplier += 0.00001*slave.skill.oral*slave.skill.oral;
}
- if (slave.combatSkill) {
+ if (slave.skill.combat) {
startingSlaveMultiplier += 0.1;
}
if (slave.prestige) {
@@ -2110,6 +2141,11 @@ window.slaveCost = (function() {
return slaveCost;
})();
-window.startingSlaveCost = /** @param {App.Entity.SlaveState} slave */ function startingSlaveCost(slave) {
+window.startingSlaveCost =
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {number}
+ */
+function startingSlaveCost(slave) {
return slaveCost(slave, true);
};
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index d87b6c35d4829b6e35ac15e55329fcbc94354599..f9359ebaf05f3f8120460158166ca28249fe4271 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.nationalityToRace = /** @param {App.Entity.SlaveState} slave */ function nationalityToRace(slave) {
slave.race = hashChoice(setup.raceSelector[slave.nationality] || setup.raceSelector[""]);
};
@@ -14,7 +13,7 @@ window.raceToNationality = /** @param {App.Entity.SlaveState} slave */ function
}
/* No success after 100 attempts, so just randomize according to race */
if (setup.raceSelector[slave.nationality] && !(slave.race in setup.raceSelector[slave.nationality]) && i === 100) {
- slave.nationality = hashChoice(setup[slave.race.toLowerCase().replace(/[ -]/g, '')+'Nationalities']);
+ slave.nationality = hashChoice(setup[`${slave.race.toLowerCase().replace(/[ -]/g, "")}Nationalities`]);
}
};
@@ -22,10 +21,10 @@ window.generateName = function generateName(nationality, race, male, filter) {
filter = filter || _.stubTrue; /* default: allow all */
const lookup = (male ? setup.malenamePoolSelector : setup.namePoolSelector);
const result = jsEither(
- (lookup[nationality + "." + race] || lookup[nationality] ||
+ (lookup[`${nationality }.${ race}`] || lookup[nationality] ||
(male ? setup.whiteAmericanMaleNames : setup.whiteAmericanSlaveNames)).filter(filter));
/* fallback for males without specific male name sets: return female name */
- if(male && !result) {
+ if (male && !result) {
return generateName(nationality, race, false);
}
return result;
@@ -34,13 +33,13 @@ window.generateName = function generateName(nationality, race, male, filter) {
window.generateSurname = function generateSurname(nationality, race, male, filter) {
filter = filter || _.stubTrue; /* default: allow all */
const result = jsEither(
- (setup.surnamePoolSelector[nationality + "." + race] ||
+ (setup.surnamePoolSelector[`${nationality }.${ race}`] ||
setup.surnamePoolSelector[nationality] ||
setup.whiteAmericanSlaveSurnames).filter(filter));
- if(male) {
+ if (male) {
/* see if we have male equivalent of that surname, and return that if so */
- const maleLookup = setup.maleSurnamePoolSelector[nationality + "." + race] || setup.maleSurnamePoolSelector[nationality];
- if(maleLookup && maleLookup[result]) {
+ const maleLookup = setup.maleSurnamePoolSelector[`${nationality }.${ race}`] || setup.maleSurnamePoolSelector[nationality];
+ if (maleLookup && maleLookup[result]) {
return maleLookup[result];
}
}
@@ -48,7 +47,7 @@ window.generateSurname = function generateSurname(nationality, race, male, filte
};
window.isMaleName = function isMaleName(name, nationality, race) {
- const names = setup.malenamePoolSelector[nationality + "." + race] ||
+ const names = setup.malenamePoolSelector[`${nationality }.${ race}`] ||
setup.malenamePoolSelector[nationality] ||
setup.whiteAmericanMaleNames;
return names && names.includes(name);
@@ -60,7 +59,7 @@ window.nationalityToName = /** @param {App.Entity.SlaveState} slave */ function
slave.birthName = generateName(slave.nationality, slave.race, male);
slave.birthSurname = generateSurname(slave.nationality, slave.race, male);
- if(male && isMaleName(slave.birthName, slave.nationality, slave.race) && !V.allowMaleSlaveNames) {
+ if (male && isMaleName(slave.birthName, slave.nationality, slave.race) && !V.allowMaleSlaveNames) {
slave.slaveName = generateName(slave.nationality, slave.race, false);
} else {
slave.slaveName = slave.birthName;
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index b88a492d73a69d0a67d0dbe0fb368e908656f06d..af21526748d02ade62e68a99fc29e7b3352abf5c 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -29,35 +29,48 @@ window.SlaveStatsChecker = (function() {
function piercingScore(slave) {
let score = 0;
- if (slave.earPiercing > 0)
+ if (slave.earPiercing > 0) {
score += slave.earPiercing*0.75 - 0.5;
- if (slave.nosePiercing > 0)
+ }
+ if (slave.nosePiercing > 0) {
score += slave.nosePiercing*0.75 - 0.5;
- if (slave.eyebrowPiercing > 0)
+ }
+ if (slave.eyebrowPiercing > 0) {
score += slave.eyebrowPiercing*0.75 - 0.5;
- if (slave.navelPiercing > 0)
+ }
+ if (slave.navelPiercing > 0) {
score += slave.navelPiercing*0.75 - 0.5;
- if (slave.corsetPiercing > 0)
+ }
+ if (slave.corsetPiercing > 0) {
score += slave.corsetPiercing*0.75 + 0.5;
- if (slave.nipplesPiercing > 0)
+ }
+ if (slave.nipplesPiercing > 0) {
score += slave.nipplesPiercing*0.75 - 0.25;
- if (slave.areolaePiercing > 0)
+ }
+ if (slave.areolaePiercing > 0) {
score += slave.areolaePiercing*0.75 + 0.5;
- if (slave.lipsPiercing > 0)
+ }
+ if (slave.lipsPiercing > 0) {
score += slave.lipsPiercing*0.75 - 0.25;
- if (slave.tonguePiercing > 0 )
+ }
+ if (slave.tonguePiercing > 0 ) {
score += slave.tonguePiercing*0.75 - 0.25;
- if (slave.clitPiercing === 3) /* smart piercing */
+ }
+ if (slave.clitPiercing === 3) /* smart piercing */ {
score += 1.25;
- else if (slave.clitPiercing > 0)
+ } else if (slave.clitPiercing > 0) {
score += slave.clitPiercing*0.75 - 0.25;
+ }
- if (slave.vaginaPiercing > 0)
+ if (slave.vaginaPiercing > 0) {
score += slave.vaginaPiercing*0.75 - 0.25;
- if (slave.dickPiercing > 0)
+ }
+ if (slave.dickPiercing > 0) {
score += slave.dickPiercing*0.75 - 0.25;
- if (slave.anusPiercing > 0)
+ }
+ if (slave.anusPiercing > 0) {
score += slave.anusPiercing*0.75 - 0.25;
+ }
return score;
}
@@ -67,49 +80,59 @@ window.SlaveStatsChecker = (function() {
function tatScore(slave) {
let score = 0;
- if (slave.boobsTat !== 0)
+ if (slave.boobsTat !== 0) {
score += 1.25;
- if (slave.buttTat !== 0)
+ }
+ if (slave.buttTat !== 0) {
score += 1.25;
- if (slave.lipsTat !== 0)
+ }
+ if (slave.lipsTat !== 0) {
score += 1.25;
- if (slave.shouldersTat !== 0)
+ }
+ if (slave.shouldersTat !== 0) {
score += 1;
- if (slave.backTat !== 0)
+ }
+ if (slave.backTat !== 0) {
score += 1.25;
- if (slave.armsTat !== 0)
+ }
+ if (slave.armsTat !== 0) {
score += 1;
- if (slave.legsTat !== 0)
+ }
+ if (slave.legsTat !== 0) {
score += 1;
- if (slave.stampTat !== 0)
+ }
+ if (slave.stampTat !== 0) {
score += 1;
- if (slave.vaginaTat !== 0)
+ }
+ if (slave.vaginaTat !== 0) {
score += 1;
- if (slave.dickTat !== 0)
+ }
+ if (slave.dickTat !== 0) {
score += 1;
+ }
if (slave.bellyTat !== 0) {
- if ((slave.preg > slave.pregData.normalBirth/1.33 && slave.pregType >= 20) || slave.belly >= 300000)
+ if ((slave.preg > slave.pregData.normalBirth/1.33 && slave.pregType >= 20) || slave.belly >= 300000) {
score += 0.75;
- else if ((slave.preg > slave.pregData.normalBirth/2 && slave.pregType >= 20) || (slave.preg > slave.pregData.normalBirth/1.33 && slave.pregType >= 10) || slave.belly >= 150000)
+ } else if ((slave.preg > slave.pregData.normalBirth/2 && slave.pregType >= 20) || (slave.preg > slave.pregData.normalBirth/1.33 && slave.pregType >= 10) || slave.belly >= 150000) {
score += 1;
- else if (slave.belly >= 10000 || slave.bellyImplant >= 8000)
+ } else if (slave.belly >= 10000 || slave.bellyImplant >= 8000) {
score += 1;
- else if ((slave.preg >= slave.pregData.normalBirth/4 && slave.pregType >= 20) || (slave.preg > slave.pregData.normalBirth/4 && slave.pregType >= 10) || slave.belly >= 5000)
+ } else if ((slave.preg >= slave.pregData.normalBirth/4 && slave.pregType >= 20) || (slave.preg > slave.pregData.normalBirth/4 && slave.pregType >= 10) || slave.belly >= 5000) {
score += 0.5;
- else if (slave.belly >= 1500)
+ } else if (slave.belly >= 1500) {
score += 0.25;
- else
+ } else {
score += 0.1;
+ }
}
- if (slave.anusTat === "bleached")
+ if (slave.anusTat === "bleached") {
score += 0.5;
- else if (slave.anusTat !== 0)
+ } else if (slave.anusTat !== 0) {
score += 1.25;
-
+ }
if (slave.abortionTat > 0 || (slave.abortionTat === 0 && slave.pregKnown === 1)) {
score += 1;
}
-
return score;
}
}());
@@ -183,8 +206,6 @@ window.isFertile = function(slave) {
if (slave.womb.length > 0 && slave.geneticQuirks.superfetation < 2) { /* currently pregnant without superfetation */
return false;
- } else if (slave.womb.length > 0) { /* temp failure condition to prevent current double preg bug */
- return false;
} else if (slave.broodmother > 0) { /* currently broodmother */
return false;
} else if (slave.preg < -1) { /* sterile */
@@ -200,8 +221,18 @@ window.isFertile = function(slave) {
} else if (slave.bellyImplant !== -1) {
return false;
} else if (slave.mpreg === 1) {
+ if (slave.womb.length > 0) { // superfetation route
+ if (slave.fertPeak !== 0) {
+ return false;
+ }
+ }
return true; /* pregmod end */
} else if (slave.ovaries === 1) {
+ if (slave.womb.length > 0) { // superfetation route
+ if (slave.fertPeak !== 0) {
+ return false;
+ }
+ }
return true;
}
return false;
@@ -232,37 +263,29 @@ window.canPenetrate = /** @param {App.Entity.SlaveState} slave */ function(slave
window.canSee = /** @param {App.Entity.SlaveState} slave */ function(slave) {
if (!slave) {
return null;
- } else if (slave.eyes > -2) {
- return true;
}
- return false;
+ return (slave.eyes > -2);
};
window.canHear = /** @param {App.Entity.SlaveState} slave */ function(slave) {
if (!slave) {
return null;
- } else if ((slave.hears > -2) && (slave.earwear !== "deafening ear plugs")) {
- return true;
}
- return false;
+ return ((slave.hears > -2) && (slave.earwear !== "deafening ear plugs"));
};
window.canSmell = /** @param {App.Entity.SlaveState} slave */ function(slave) {
if (!slave) {
return null;
- } else if (slave.smells > -1) {
- return true;
}
- return false;
+ return (slave.smells > -1);
};
window.canTaste = /** @param {App.Entity.SlaveState} slave */ function(slave) {
if (!slave) {
return null;
- } else if (slave.tastes > -1) {
- return true;
}
- return false;
+ return (slave.tastes > -1);
};
window.canWalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -321,7 +344,6 @@ window.canDoAnal = /** @param {App.Entity.SlaveState} slave */ function(slave) {
} else if (slave.chastityAnus === 1) {
return false;
}
- return true;
};
window.canDoVaginal = /** @param {App.Entity.SlaveState} slave */ function(slave) {
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 924dbdd23d39b6c783fafff62a3c316e518a822e..e16f4a4ff9cd0b162959febfe05720ee6175a1c7 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -36,7 +36,8 @@ window.SlaveSummaryUncached = (function() {
let His;
*/
- /** @param {App.Entity.SlaveState} slave
+ /**
+ * @param {App.Entity.SlaveState} slave
* @returns {string} */
function SlaveSummaryUncached(slave) {
V = State.variables;
@@ -215,7 +216,7 @@ window.SlaveSummaryUncached = (function() {
if (V.abbreviateSkills === 1) {
short_intelligence(slave);
short_sex_skills(slave);
- if (slave.combatSkill > 0) {
+ if (slave.skill.combat > 0) {
r += "C";
}
r += "</span> ";
@@ -224,7 +225,7 @@ window.SlaveSummaryUncached = (function() {
} else if (V.abbreviateSkills === 2) {
long_intelligence(slave);
long_sex_skills(slave);
- if (slave.combatSkill > 0) {
+ if (slave.skill.combat > 0) {
r += "Trained fighter.";
}
r += "</span> ";
@@ -666,6 +667,8 @@ window.SlaveSummaryUncached = (function() {
case "fertility":
r += `<strong>Di:F+</strong>`;
break;
+ default:
+ break;
}
r += `</span> `;
r += `<span class="cyan">`;
@@ -717,6 +720,8 @@ window.SlaveSummaryUncached = (function() {
case "fertility":
r += `Fertility.`;
break;
+ default:
+ break;
}
r += `</span> `;
if (slave.dietCum === 2) {
@@ -868,6 +873,8 @@ window.SlaveSummaryUncached = (function() {
case "growth stimulants":
r += `<strong>Dr:groStim</strong>`;
break;
+ default:
+ break;
}
r += `</span> `;
r += `<span class="lightgreen">`;
@@ -1874,6 +1881,9 @@ window.SlaveSummaryUncached = (function() {
case "extremely pale":
r += `E. Pal`;
break;
+ case "very pale":
+ r += `V. Pal`;
+ break;
case "light brown":
r += `L. Br`;
break;
@@ -1886,16 +1896,16 @@ window.SlaveSummaryUncached = (function() {
case "dark olive":
r += `D. Oli`;
break;
- case "lightened":
- r += `Ltnd`;
+ case "light beige":
+ r += `L. Bei`;
break;
- case "tanned":
- r += `Tan`;
+ case "dark beige":
+ r += `D. Bei`;
break;
- case "natural":
- r += `Nat`;
+ case "tan":
+ r += `Tan`;
break;
- case "bronzed":
+ case "bronze":
r += `Bron`;
break;
case "ebony":
@@ -2740,12 +2750,12 @@ window.SlaveSummaryUncached = (function() {
/** @param {App.Entity.SlaveState} slave */
function short_sex_skills(slave) {
- let _SSkills = slave.analSkill + slave.oralSkill;
+ let _SSkills = slave.skill.anal + slave.skill.oral;
r += `<span class="aquamarine">`;
- if (((_SSkills + slave.whoreSkill + slave.entertainSkill) >= 400) && ((slave.vagina < 0) || (slave.vaginalSkill >= 100))) {
+ if (((_SSkills + slave.skill.whore + slave.skill.entertainment) >= 400) && ((slave.vagina < 0) || (slave.skill.vaginal >= 100))) {
r += `MSS`;
} else {
- _SSkills += slave.vaginalSkill;
+ _SSkills += slave.skill.vaginal;
_SSkills = Math.trunc(_SSkills);
if (_SSkills > 180) {
r += `S++`;
@@ -2762,33 +2772,33 @@ window.SlaveSummaryUncached = (function() {
r += `[${_SSkills}] `;
}
r += " ";
- if (slave.whoreSkill >= 100) {
+ if (slave.skill.whore >= 100) {
r += `W+++`;
- } else if (slave.whoreSkill > 60) {
+ } else if (slave.skill.whore > 60) {
r += `W++`;
- } else if (slave.whoreSkill > 30) {
+ } else if (slave.skill.whore > 30) {
r += `W+`;
- } else if (slave.whoreSkill > 10) {
+ } else if (slave.skill.whore > 10) {
r += `W`;
}
- if (slave.whoreSkill > 10) {
+ if (slave.skill.whore > 10) {
if (V.summaryStats) {
- r += `[${slave.whoreSkill}] `;
+ r += `[${slave.skill.whore}] `;
}
}
r += " ";
- if (slave.entertainSkill >= 100) {
+ if (slave.skill.entertainment >= 100) {
r += `E+++`;
- } else if (slave.entertainSkill > 60) {
+ } else if (slave.skill.entertainment > 60) {
r += `E++`;
- } else if (slave.entertainSkill > 30) {
+ } else if (slave.skill.entertainment > 30) {
r += `E+`;
- } else if (slave.entertainSkill > 10) {
+ } else if (slave.skill.entertainment > 10) {
r += `E`;
}
- if (slave.entertainSkill > 10) {
+ if (slave.skill.entertainment > 10) {
if (V.summaryStats) {
- r += `[${slave.entertainSkill}] `;
+ r += `[${slave.skill.entertainment}] `;
}
}
}
@@ -2886,12 +2896,12 @@ window.SlaveSummaryUncached = (function() {
/** @param {App.Entity.SlaveState} slave */
function long_sex_skills(slave) {
- let _SSkills = (slave.analSkill + slave.oralSkill);
+ let _SSkills = (slave.skill.anal + slave.skill.oral);
r += `<span class="aquamarine">`;
- if (((_SSkills + slave.whoreSkill + slave.entertainSkill) >= 400) && ((slave.vagina < 0) || (slave.vaginalSkill >= 100))) {
+ if (((_SSkills + slave.skill.whore + slave.skill.entertainment) >= 400) && ((slave.vagina < 0) || (slave.skill.vaginal >= 100))) {
r += `Masterful Sex Slave. `;
} else {
- _SSkills += slave.vaginalSkill;
+ _SSkills += slave.skill.vaginal;
if (_SSkills > 180) {
r += `Sex master${V.summaryStats? `[${Math.trunc(_SSkills)}]`: ''}.`;
} else if ((_SSkills > 120) && (slave.vagina < 0)) {
@@ -2904,24 +2914,24 @@ window.SlaveSummaryUncached = (function() {
r += `Sexually unskilled${V.summaryStats? `[${Math.trunc(_SSkills)}]` : ''}.`;
}
r += " ";
- if (slave.whoreSkill >= 100) {
- r += `Masterful whore${V.summaryStats? `[${slave.whoreSkill}]`: ''}.`;
- } else if (slave.whoreSkill >= 60) {
- r += `Expert whore${V.summaryStats? `[${slave.whoreSkill}]`: ''}.`;
- } else if (slave.whoreSkill >= 30) {
- r += `Skilled whore${V.summaryStats? `[${slave.whoreSkill}]`: ''}.`;
- } else if (slave.whoreSkill >= 10) {
- r += `Basic whore${V.summaryStats? `[${slave.whoreSkill}]`: ''}.`;
+ if (slave.skill.whore >= 100) {
+ r += `Masterful whore${V.summaryStats? `[${slave.skill.whore}]`: ''}.`;
+ } else if (slave.skill.whore >= 60) {
+ r += `Expert whore${V.summaryStats? `[${slave.skill.whore}]`: ''}.`;
+ } else if (slave.skill.whore >= 30) {
+ r += `Skilled whore${V.summaryStats? `[${slave.skill.whore}]`: ''}.`;
+ } else if (slave.skill.whore >= 10) {
+ r += `Basic whore${V.summaryStats? `[${slave.skill.whore}]`: ''}.`;
}
r += " ";
- if (slave.entertainSkill >= 100) {
- r += `Masterful entertainer${V.summaryStats? `[${slave.entertainSkill}]`: ''}.`;
- } else if (slave.entertainSkill >= 60) {
- r += `Expert entertainer${V.summaryStats? `[${slave.entertainSkill}]`: ''}.`;
- } else if (slave.entertainSkill >= 30) {
- r += `Skilled entertainer${V.summaryStats? `[${slave.entertainSkill}]`: ''}.`;
- } else if (slave.entertainSkill >= 10) {
- r += `Basic entertainer${V.summaryStats? `[${slave.entertainSkill}]`: ''}.`;
+ if (slave.skill.entertainment >= 100) {
+ r += `Masterful entertainer${V.summaryStats? `[${slave.skill.entertainment}]`: ''}.`;
+ } else if (slave.skill.entertainment >= 60) {
+ r += `Expert entertainer${V.summaryStats? `[${slave.skill.entertainment}]`: ''}.`;
+ } else if (slave.skill.entertainment >= 30) {
+ r += `Skilled entertainer${V.summaryStats? `[${slave.skill.entertainment}]`: ''}.`;
+ } else if (slave.skill.entertainment >= 10) {
+ r += `Basic entertainer${V.summaryStats? `[${slave.skill.entertainment}]`: ''}.`;
}
r += " ";
}
@@ -3186,6 +3196,8 @@ window.SlaveSummaryUncached = (function() {
case "none":
r += `SP:none`;
break;
+ default:
+ break;
}
}
r += " ";
@@ -3631,6 +3643,8 @@ window.SlaveSummaryUncached = (function() {
case "none":
r += `SP: none.`;
break;
+ default:
+ break;
}
}
r += " ";
@@ -4600,6 +4614,8 @@ window.SlaveSummaryUncached = (function() {
break;
case "porcelain mask":
r += `Porcelain mask.`;
+ break
+ default:
break;
}
r += " ";
@@ -4629,6 +4645,8 @@ window.SlaveSummaryUncached = (function() {
case "an extreme corset":
r += `Extreme corsetage.`;
break;
+ default:
+ break;
}
r += " ";
}
@@ -4706,6 +4724,8 @@ window.SlaveSummaryUncached = (function() {
case "long, huge dildo":
r += `Long and wide vaginal dildo.`;
break;
+ default:
+ break;
}
}
r += " ";
@@ -4714,6 +4734,8 @@ window.SlaveSummaryUncached = (function() {
case "vibrator":
r += `Vibrating dildo.`;
break;
+ default:
+ break;
}
r += " ";
}
@@ -4731,6 +4753,8 @@ window.SlaveSummaryUncached = (function() {
case "smart bullet vibrator":
r += `Smart frenulum bullet vibrator.`;
break;
+ default:
+ break;
}
r += " ";
}
@@ -4756,6 +4780,8 @@ window.SlaveSummaryUncached = (function() {
case "long, huge plug":
r += `Enormous buttplug.`;
break;
+ default:
+ break;
}
r += " ";
switch (slave.buttplugAttachment) {
@@ -4768,6 +4794,8 @@ window.SlaveSummaryUncached = (function() {
case "fox tail":
r += `Attached fox tail. `;
break;
+ default:
+ break;
}
}
@@ -5240,7 +5268,7 @@ App.UI.slaveSummaryList = function (passageName) {
if (V.Flag === 0) {
if (V.schoolroom <= V.schoolroomSlaves) { res.pop(); continue; }
if ((_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)) {
- if ((_Slave.intelligenceImplant < 30) || (_Slave.voice !== 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.whoreSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.entertainSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.analSkill < 10 + V.schoolroomUpgradeSkills * 20) || ((_Slave.vagina >= 0) && (_Slave.vaginalSkill < 10 + V.schoolroomUpgradeSkills * 20))) {
+ if ((_Slave.intelligenceImplant < 30) || (_Slave.voice !== 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.skill.oral <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.whore <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.entertainment <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.anal < 10 + V.schoolroomUpgradeSkills * 20) || ((_Slave.vagina >= 0) && (_Slave.skill.vaginal < 10 + V.schoolroomUpgradeSkills * 20))) {
res.push(dividerAndImage(_Slave));
res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`);
} else {
@@ -5486,6 +5514,8 @@ App.UI.slaveSummaryList = function (passageName) {
res.push(dividerAndImage(_Slave));
res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`);
break;
+ default:
+ break;
}
SlaveStatClamp(_Slave);
@@ -5630,7 +5660,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
if (V.schoolroom !== 0) {
- if (V.schoolroom > V.schoolroomSlaves && (_Slave.fetish !== "mindbroken" && (_Slave.devotion >= -20 || (_Slave.devotion >= -50 && _Slave.trust < -20) || _Slave.trust < -50) && ((_Slave.intelligenceImplant < 30) || (_Slave.voice !== 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.whoreSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.entertainSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.analSkill < 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.vagina >= 0 && _Slave.vaginalSkill < 10 + V.schoolroomUpgradeSkills * 20)))) {
+ if (V.schoolroom > V.schoolroomSlaves && (_Slave.fetish !== "mindbroken" && (_Slave.devotion >= -20 || (_Slave.devotion >= -50 && _Slave.trust < -20) || _Slave.trust < -50) && ((_Slave.intelligenceImplant < 30) || (_Slave.voice !== 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.skill.oral <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.whore <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.entertainment <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.anal < 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.vagina >= 0 && _Slave.skill.vaginal < 10 + V.schoolroomUpgradeSkills * 20)))) {
transfers.push(`[[Schoolroom|Assign][$assignTo = "Schoolroom", $i = ${_ssi}]]`); /* $i = -1 tells Assign to use _Slave as-is */
} else {
transfers.push('Schoolroom');
@@ -5722,7 +5752,7 @@ App.UI.slaveSummaryList = function (passageName) {
case "Main":
continue;
case "HG Select":
- if (setup.HGCareers.includes(_Slave.career) || (_Slave.skillHG >= V.masteredXP)) {
+ if (setup.HGCareers.includes(_Slave.career) || (_Slave.skill.headGirl >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5736,13 +5766,13 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Recruiter Select":
- if (setup.recruiterCareers.includes(_Slave.career) || (_Slave.skillRC >= V.masteredXP)) {
+ if (setup.recruiterCareers.includes(_Slave.career) || (_Slave.skill.recruiter >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "BG Select":
- if (setup.bodyguardCareers.includes(_Slave.career) || (_Slave.skillBG >= V.masteredXP)) {
+ if (setup.bodyguardCareers.includes(_Slave.career) || (_Slave.skill.bodyguard >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5758,7 +5788,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Attendant Select":
- if (setup.attendantCareers.includes(_Slave.career) || (_Slave.skillAT >= V.masteredXP)) {
+ if (setup.attendantCareers.includes(_Slave.career) || (_Slave.skill.attendant >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5774,7 +5804,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Matron Select":
- if (setup.matronCareers.includes(_Slave.career) || (_Slave.skillMT >= V.masteredXP)) {
+ if (setup.matronCareers.includes(_Slave.career) || (_Slave.skill.matron >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5790,7 +5820,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Madam Select":
- if (setup.madamCareers.includes(_Slave.career) || (_Slave.skillMD >= V.masteredXP)) {
+ if (setup.madamCareers.includes(_Slave.career) || (_Slave.skill.madam >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5814,7 +5844,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "DJ Select":
- if (setup.DJCareers.includes(_Slave.career) || (_Slave.skillDJ >= V.masteredXP)) {
+ if (setup.DJCareers.includes(_Slave.career) || (_Slave.skill.DJ >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5833,7 +5863,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Nurse Select":
- if (setup.nurseCareers.includes(_Slave.career) || (_Slave.skillNU >= V.masteredXP)) {
+ if (setup.nurseCareers.includes(_Slave.career) || (_Slave.skill.nurse >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5849,7 +5879,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Schoolteacher Select":
- if (setup.schoolteacherCareers.includes(_Slave.career) || (_Slave.skillTE >= V.masteredXP)) {
+ if (setup.schoolteacherCareers.includes(_Slave.career) || (_Slave.skill.teacher >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5865,7 +5895,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Milkmaid Select":
- if (setup.milkmaidCareers.includes(_Slave.career) || (_Slave.skillMM >= V.masteredXP)) {
+ if (setup.milkmaidCareers.includes(_Slave.career) || (_Slave.skill.milkmaid >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5881,7 +5911,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Farmer Select":
- if (setup.farmerCareers.includes(_Slave.career) || (_Slave.skillFA >= V.masteredXP)) {
+ if (setup.farmerCareers.includes(_Slave.career) || (_Slave.skill.farmer >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5897,7 +5927,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Stewardess Select":
- if (setup.stewardessCareers.includes(_Slave.career) || (_Slave.skillST >= V.masteredXP)) {
+ if (setup.stewardessCareers.includes(_Slave.career) || (_Slave.skill.stewardess >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5923,7 +5953,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Wardeness Select":
- if (setup.wardenessCareers.includes(_Slave.career) || (_Slave.skillWA >= V.masteredXP)) {
+ if (setup.wardenessCareers.includes(_Slave.career) || (_Slave.skill.wardeness >= V.masteredXP)) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
@@ -5950,6 +5980,8 @@ App.UI.slaveSummaryList = function (passageName) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push(`[[Make her the main course|Dinner Party Execution][$activeSlave = $slaves[${_ssi}]]]`);
break;
+ default:
+ break;
}
}
return res.join("");
diff --git a/src/js/spanMacroJS.js b/src/js/spanMacroJS.js
index 005e6d1c7b6f0380b886b610df78d519f66902d8..19eb0a5bef19ee032a69f1dae269961c8c182db6 100644
--- a/src/js/spanMacroJS.js
+++ b/src/js/spanMacroJS.js
@@ -26,7 +26,7 @@ Macro.add('span', {
Config.debug && this.debugView.modes({block: true});
- jQuery("<span id='" + String(result) + "' />")
+ jQuery(`<span id='${ String(result) }' />`)
.wiki(payload)
.appendTo(this.output);
}
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 7420b66b7462dc2f417bf87b5c62e547c2285da0..2064a2eca9e7a3c43f76c6b2bf7ce89400da5701 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -1,31 +1,27 @@
-/* eslint-disable no-console */
-/* eslint-disable no-undef */
-/*config.history.tracking = false;*/
+/* config.history.tracking = false;*/
// State.expired.disable;
window.variableAsNumber = function(x, defaultValue, minValue, maxValue) {
x = Number(x);
- if (x !== x) {//NaN
- return defaultValue || 0;//In case the default value was not supplied.
+ if (x !== x) {// NaN
+ return defaultValue || 0;// In case the default value was not supplied.
}
- if (x < minValue) {//Works even if minValue is undefined.
+ if (x < minValue) {// Works even if minValue is undefined.
return minValue;
}
- if (x > maxValue) {//Works even if maxValue is undefined.
+ if (x > maxValue) {// Works even if maxValue is undefined.
return maxValue;
}
return x;
};
+
window.isSexuallyPure = /** @param {App.Entity.SlaveState} slave */ function (slave) {
if (!slave) {
return null;
}
- if (slave.vagina < 1 && slave.anus < 1 && !slave.analCount && !slave.vaginalCount && !slave.oralCount && !slave.mammaryCount && !slave.penetrativeCount) {
- return true;
- } else {
- return false;
- }
+ return (slave.vagina < 1 && slave.anus < 1 && !slave.analCount && !slave.vaginalCount && !slave.oralCount && !slave.mammaryCount && !slave.penetrativeCount);
};
+
if (typeof interpolate === "undefined") {
const interpolate = function(x0, y0, x1, y1, x) {
if (x <= x0) {
@@ -68,11 +64,8 @@ window.filterInPlace = function(arr, callback, thisArg) {
window.canBreed = function(slave1, slave2) {
if (!slave1 || !slave2) {
return null;
- } else if (slave1.eggType === slave2.ballType) {
- return true;
- } else {
- return false;
}
+ return (slave1.eggType === slave2.ballType);
};
/** assuming slave1 is fertile, could slave2 impregnate slave1?
@@ -149,46 +142,45 @@ window.milkAmount = /** @param {App.Entity.SlaveState} slave */ function (slave)
let calcs;
if (!slave) {
return null;
+ }
+ calcs = slave.boobs - slave.boobsImplant - slave.boobsMilk;
+ if (calcs > 40000) {
+ milk = (158 + ((calcs - 10000) / 600));
+ } else if (calcs > 25000) {
+ milk = (128 + ((calcs - 10000) / 500));
+ } else if (calcs > 10000) {
+ milk = (78 + ((calcs - 10000) / 300));
+ } else if (calcs > 5000) {
+ milk = (53 + ((calcs - 5000) / 200));
+ } else if (calcs > 2000) {
+ milk = (29 + ((calcs - 2000) / 125));
+ } else if (calcs > 800) {
+ milk = (16 + ((calcs - 800) / 80));
} else {
- calcs = slave.boobs - slave.boobsImplant - slave.boobsMilk;
- if (calcs > 40000) {
- milk = (158 + ((calcs - 10000) / 600));
- } else if (calcs > 25000) {
- milk = (128 + ((calcs - 10000) / 500));
- } else if (calcs > 10000) {
- milk = (78 + ((calcs - 10000) / 300));
- } else if (calcs > 5000) {
- milk = (53 + ((calcs - 5000) / 200));
- } else if (calcs > 2000) {
- milk = (29 + ((calcs - 2000) / 125));
- } else if (calcs > 800) {
- milk = (16 + ((calcs - 800) / 80));
- } else {
- milk = (8 + ((calcs - 400) / 50));
- }
- if (slave.lactation === 2) {
- milk *= 1.2;
- }
- milk += (milk * ((slave.devotion - 50) / 200));
- if (slave.boobsImplant > 200) {
- milk *= 0.9;
- }
- calcs = (slave.hormoneBalance / 50);
- if (slave.balls !== 0 && calcs > -2) {
- calcs -= 1;
- } else if (slave.ovaries !== 1 && calcs < 2) {
- calcs += 1;
- }
- milk *= (1 + (calcs * 0.1));
- milk *= (1 + (slave.preg / 100));
- milk *= (1 + (slave.health / 50));
- milk *= (1 + (slave.weight / 500));
- milk *= (1 + (slave.lactationAdaptation / 500));
- milk += (slave.boobsMilk / 100);
- milk = Math.trunc(milk);
- milk = Math.clamp(milk, 1, 1000000000000000000);
- return milk;
+ milk = (8 + ((calcs - 400) / 50));
}
+ if (slave.lactation === 2) {
+ milk *= 1.2;
+ }
+ milk += (milk * ((slave.devotion - 50) / 200));
+ if (slave.boobsImplant > 200) {
+ milk *= 0.9;
+ }
+ calcs = (slave.hormoneBalance / 50);
+ if (slave.balls !== 0 && calcs > -2) {
+ calcs -= 1;
+ } else if (slave.ovaries !== 1 && calcs < 2) {
+ calcs += 1;
+ }
+ milk *= (1 + (calcs * 0.1));
+ milk *= (1 + (slave.preg / 100));
+ milk *= (1 + (slave.health / 50));
+ milk *= (1 + (slave.weight / 500));
+ milk *= (1 + (slave.lactationAdaptation / 500));
+ milk += (slave.boobsMilk / 100);
+ milk = Math.trunc(milk);
+ milk = Math.clamp(milk, 1, 1000000000000000000);
+ return milk;
};
window.cumAmount = /** @param {App.Entity.SlaveState} slave */ function (slave) {
@@ -196,46 +188,45 @@ window.cumAmount = /** @param {App.Entity.SlaveState} slave */ function (slave)
let calcs = 0;
if (!slave) {
return null;
+ }
+ if (slave.drugs === "testicle enhancement") {
+ cum = ((slave.balls * 3.5) + 1);
+ } else if (slave.drugs === "hyper testicle enhancement") {
+ cum = ((slave.balls * 5) + 1);
} else {
- if (slave.drugs === "testicle enhancement") {
- cum = ((slave.balls * 3.5) + 1);
- } else if (slave.drugs === "hyper testicle enhancement") {
- cum = ((slave.balls * 5) + 1);
- } else {
- cum = ((slave.balls * 2.5) + 1);
- }
- if (slave.ballType === "sterile") {
- cum *= 0.8;
- }
- if (slave.diet === "cum production") {
- cum *= 1.2;
- }
- calcs = (slave.hormoneBalance / 50);
- cum *= (1 - (calcs * 0.1));
- if (slave.scrotum === 0) {
- cum *= 0.8;
- }
- if (slave.prostate === 0) {
- cum *= 0.2; // being generous here
- } else if (slave.prostate === 2) {
- cum *= 1.2;
- } else if (slave.prostate === 3) {
- cum *= 1.5;
- }
- if (slave.devotion > 50) {
- cum += (cum * (slave.devotion / 100));
- } else if (slave.devotion < -50) {
- cum += (cum * (slave.devotion / 100));
- }
- if (slave.health > 50) {
- cum += (cum * (slave.health / 50));
- } else if (slave.health < -50) {
- cum += (cum * (slave.health / 50));
- }
- cum = Math.trunc(cum);
- cum = Math.clamp(cum, 1, 1000000000000000000);
- return cum;
+ cum = ((slave.balls * 2.5) + 1);
+ }
+ if (slave.ballType === "sterile") {
+ cum *= 0.8;
+ }
+ if (slave.diet === "cum production") {
+ cum *= 1.2;
+ }
+ calcs = (slave.hormoneBalance / 50);
+ cum *= (1 - (calcs * 0.1));
+ if (slave.scrotum === 0) {
+ cum *= 0.8;
}
+ if (slave.prostate === 0) {
+ cum *= 0.2; // being generous here
+ } else if (slave.prostate === 2) {
+ cum *= 1.2;
+ } else if (slave.prostate === 3) {
+ cum *= 1.5;
+ }
+ if (slave.devotion > 50) {
+ cum += (cum * (slave.devotion / 100));
+ } else if (slave.devotion < -50) {
+ cum += (cum * (slave.devotion / 100));
+ }
+ if (slave.health > 50) {
+ cum += (cum * (slave.health / 50));
+ } else if (slave.health < -50) {
+ cum += (cum * (slave.health / 50));
+ }
+ cum = Math.trunc(cum);
+ cum = Math.clamp(cum, 1, 1000000000000000000);
+ return cum;
};
window.lispReplace = function (text) {
@@ -373,19 +364,19 @@ window.toJson = function(obj) {
window.nippleColor = /** @param {App.Entity.SlaveState} slave */ function (slave) {
slave = slave || State.variables.activeSlave;
- if (slave.skin === "tanned" || slave.skin === "fair") {
+ if (skinToneLevel(slave.skin) < 8) {
if (slave.preg > slave.pregData.normalBirth/4 || (slave.birthsTotal > 0 && slave.lactation > 0)) {
- return "dark brown";
+ return "brown";
} else {
return "pink";
}
- } else if ((slave.skin === "pale" || slave.race === "white")) {
+ } else if (skinToneLevel(slave.skin) < 14) {
if (slave.preg > slave.pregData.normalBirth/4 || (slave.birthsTotal > 0 && slave.lactation > 0)) {
- return "brown";
+ return "dark brown";
} else {
return "pink";
}
- } else if ((slave.skin === "brown" || slave.race === "black")) {
+ } else if (skinToneLevel(slave.skin) > 20) {
if (slave.preg > slave.pregData.normalBirth/4 || (slave.birthsTotal > 0 && slave.lactation > 0)) {
return "black";
} else {
@@ -482,6 +473,8 @@ window.SoftenBehavioralFlaw = /** @param {App.Entity.SlaveState} slave */ functi
case "liberated":
slave.behavioralQuirk = "advocate";
break;
+ default:
+ break;
}
slave.behavioralFlaw = "none";
};
@@ -515,6 +508,8 @@ window.SoftenSexualFlaw = /** @param {App.Entity.SlaveState} slave */ function S
case "judgemental":
slave.sexualQuirk = "size queen";
break;
+ default:
+ break;
}
slave.sexualFlaw = "none";
};
diff --git a/src/js/summaryWidgets.js b/src/js/summaryWidgets.js
index 5c5ccf5b4d1584d88d9ba9246bb0be650f42d25e..95f66624f929d17b5b7a630d7a28105c99ac19b1 100644
--- a/src/js/summaryWidgets.js
+++ b/src/js/summaryWidgets.js
@@ -8,29 +8,35 @@ window.SlaveStatClamp = function SlaveStatClamp(slave) {
const V = State.variables;
if (slave.devotion > 100) {
- if (slave.trust < -95)
+ if (slave.trust < -95) {
slave.trust = -100;
- else if (slave.trust < 100 && slave.trust > 20)
+ } else if (slave.trust < 100 && slave.trust > 20) {
slave.trust += Math.trunc((slave.devotion - 100) * 5) / 10;
- else
+ } else {
repX(4 * (slave.devotion - 100), "slavesViewOfPC", slave);
+ }
slave.devotion = 100;
- } else if (slave.devotion < -95)
+ } else if (slave.devotion < -95) {
slave.devotion = -100;
+ }
if (slave.trust > 100) {
- if (slave.devotion < -95)
+ if (slave.devotion < -95) {
slave.devotion = -100;
- else if (slave.devotion < 100 && slave.devotion > 20)
+ } else if (slave.devotion < 100 && slave.devotion > 20) {
slave.devotion += Math.trunc(slave.trust - 100);
- else
+ } else {
repX(4 * (slave.trust - 100), "slavesViewOfPC", slave);
+ }
slave.trust = 100;
- } else if (slave.trust < -95)
+ } else if (slave.trust < -95) {
slave.trust = -100;
- if (slave.trust < -100)
+ }
+ if (slave.trust < -100) {
slave.trust = -100;
- if (slave.devotion < -100)
+ }
+ if (slave.devotion < -100) {
slave.devotion = -100;
+ }
if (isNaN(slave.oralCount)) {
slave.oralCount = 0;
alert("Oral count has broken, report what you just did!");
@@ -51,10 +57,12 @@ window.SlaveStatClamp = function SlaveStatClamp(slave) {
slave.penetrativeCount = 0;
alert("Penetration count has broken, report what you just did!");
}
- if (slave.foreskin === undefined)
+ if (slave.foreskin === undefined) {
slave.foreskin = 0;
- if (slave.amp !== 0 && slave.heels === 1)
+ }
+ if (slave.amp !== 0 && slave.heels === 1) {
slave.heels = 0;
+ }
if (slave.vagina < 0 && slave.mpreg === 0 && slave.preg === -1) {
slave.preg = 0;
WombFlush(slave);
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index ab90e35637439342bf7db1a4342ea2be3e0a9125..930d58a6c240c6efb6c62249b1437e1afce93dd6 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
/* eslint-disable no-console */
/* eslint-disable no-undef */
/*
@@ -1213,24 +1214,24 @@ window.SkillIncrease = (function() {
let r = "";
skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
- if (slave.oralSkill <= 10) {
- if (slave.oralSkill + skillIncrease > 10) {
+ if (slave.skill.oral <= 10) {
+ if (slave.skill.oral + skillIncrease > 10) {
r = ` <span class="green">${He} now has basic knowledge about oral sex,</span> and can at least suck a dick without constant gagging.`;
}
- } else if (slave.oralSkill <= 30) {
- if (slave.oralSkill + skillIncrease > 30) {
+ } else if (slave.skill.oral <= 30) {
+ if (slave.skill.oral + skillIncrease > 30) {
r = ` <span class="green">${He} now has some oral skills,</span> and can reliably bring dicks and pussies to climax with ${his} mouth.`;
}
- } else if (slave.oralSkill <= 60) {
- if (slave.oralSkill + skillIncrease > 60) {
+ } else if (slave.skill.oral <= 60) {
+ if (slave.skill.oral + skillIncrease > 60) {
r = ` <span class="green">${He} is now an oral expert,</span> and has a delightfully experienced tongue.`;
}
- } else if (slave.oralSkill < 100) {
- if (slave.oralSkill + skillIncrease >= 100) {
+ } else if (slave.skill.oral < 100) {
+ if (slave.skill.oral + skillIncrease >= 100) {
r = ` <span class="green">${He} has mastered oral sex,</span> and can learn nothing more about sucking dick or eating pussy.`;
}
}
- slave.oralSkill += skillIncrease;
+ slave.skill.oral += skillIncrease;
return r;
}
@@ -1241,24 +1242,24 @@ window.SkillIncrease = (function() {
let r = "";
skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
- if (slave.vaginalSkill <= 10) {
- if (slave.vaginalSkill + skillIncrease > 10) {
+ if (slave.skill.vaginal <= 10) {
+ if (slave.skill.vaginal + skillIncrease > 10) {
r = `<span class="green">${He} now has basic knowledge about vaginal sex,</span> and can avoid some of the common pitfalls and turnoffs.`;
}
- } else if (slave.vaginalSkill <= 30) {
- if (slave.vaginalSkill + skillIncrease > 30) {
+ } else if (slave.skill.vaginal <= 30) {
+ if (slave.skill.vaginal + skillIncrease > 30) {
r = `<span class="green">${He} now has some vaginal sex skills,</span> and can do more than just lie there and take it.`;
}
- } else if (slave.vaginalSkill <= 60) {
- if (slave.vaginalSkill + skillIncrease > 60) {
+ } else if (slave.skill.vaginal <= 60) {
+ if (slave.skill.vaginal + skillIncrease > 60) {
r = `<span class="green">${He} is now a vaginal sex expert,</span> and has the muscular control to massage anything that's inside $him.`;
}
- } else if (slave.vaginalSkill < 100) {
- if (slave.vaginalSkill + skillIncrease >= 100) {
+ } else if (slave.skill.vaginal < 100) {
+ if (slave.skill.vaginal + skillIncrease >= 100) {
r = `<span class="green">${He} has mastered vaginal sex,</span> and can learn nothing more about tribbing or taking dick.`;
}
}
- slave.vaginalSkill += skillIncrease;
+ slave.skill.vaginal += skillIncrease;
return r;
}
@@ -1270,24 +1271,24 @@ window.SkillIncrease = (function() {
let r ="";
skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
- if (slave.analSkill <= 10) {
- if (slave.analSkill + skillIncrease > 10) {
+ if (slave.skill.anal <= 10) {
+ if (slave.skill.anal + skillIncrease > 10) {
r = `<span class="green">${He} now has basic knowledge about anal sex,</span> and can accept penetration of ${his} anus without danger.`;
}
- } else if (slave.analSkill <= 30) {
- if (slave.analSkill + skillIncrease > 30) {
+ } else if (slave.skill.anal <= 30) {
+ if (slave.skill.anal + skillIncrease > 30) {
r = `<span class="green">${He} now has some anal sex skills,</span> and needs less preparation before taking rough penetration.`;
}
- } else if (slave.analSkill <= 60) {
- if (slave.analSkill + skillIncrease > 60) {
+ } else if (slave.skill.anal <= 60) {
+ if (slave.skill.anal + skillIncrease > 60) {
r = `<span class="green">${He} is now an anal sex expert,</span> and knows how to use ${his} sphincter to please.`;
}
- } else if (slave.analSkill < 100) {
- if (slave.analSkill + skillIncrease >= 100) {
+ } else if (slave.skill.anal < 100) {
+ if (slave.skill.anal + skillIncrease >= 100) {
r = `<span class="green">${He} has mastered anal sex,</span> and can learn nothing more about taking it up the ass.`;
}
}
- slave.analSkill += skillIncrease;
+ slave.skill.anal += skillIncrease;
return r;
}
@@ -1299,24 +1300,24 @@ window.SkillIncrease = (function() {
let r ="";
skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
- if (slave.whoreSkill <= 10) {
- if (slave.whoreSkill + skillIncrease > 10) {
+ if (slave.skill.whore <= 10) {
+ if (slave.skill.whore + skillIncrease > 10) {
r = `<span class="green">${He} now has basic knowledge about how to whore,</span> and can avoid some potentially dangerous situations.`;
}
- } else if (slave.whoreSkill <= 30) {
- if (slave.whoreSkill + skillIncrease > 30) {
+ } else if (slave.skill.whore <= 30) {
+ if (slave.skill.whore + skillIncrease > 30) {
r = `<span class="green">${He} now has some skill as a whore,</span> and knows how to sell ${his} body at a good price.`;
}
- } else if (slave.whoreSkill <= 60) {
- if (slave.whoreSkill + skillIncrease > 60) {
+ } else if (slave.skill.whore <= 60) {
+ if (slave.skill.whore + skillIncrease > 60) {
r = `<span class="green">${He} is now an expert whore,</span> and can often make clients forget that $he's a prostitute they're paying for.`;
}
- } else if (slave.whoreSkill < 100) {
- if (slave.whoreSkill + skillIncrease >= 100) {
+ } else if (slave.skill.whore < 100) {
+ if (slave.skill.whore + skillIncrease >= 100) {
r = `<span class="green">${He} is now a masterful whore,</span> and can learn nothing more about prostitution.`;
}
}
- slave.whoreSkill += skillIncrease;
+ slave.skill.whore += skillIncrease;
return r;
}
@@ -1327,24 +1328,24 @@ window.SkillIncrease = (function() {
let r ="";
skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
- if (slave.entertainSkill <= 10) {
- if (slave.entertainSkill + skillIncrease > 10) {
+ if (slave.skill.entertainment <= 10) {
+ if (slave.skill.entertainment + skillIncrease > 10) {
r = `<span class="green">${He} now has basic knowledge about how to be entertaining,</span> and can usually avoid serious faux pas.`;
}
- } else if (slave.entertainSkill <= 30) {
- if (slave.entertainSkill + skillIncrease > 30) {
+ } else if (slave.skill.entertainment <= 30) {
+ if (slave.skill.entertainment + skillIncrease > 30) {
r = `<span class="green">${He} now has some skill as an entertainer,</span> and can flirt, dance, and strip acceptably.`;
}
- } else if (slave.entertainSkill <= 60) {
- if (slave.entertainSkill + skillIncrease > 60) {
+ } else if (slave.skill.entertainment <= 60) {
+ if (slave.skill.entertainment + skillIncrease > 60) {
r = `<span class="green">${He} is now an expert entertainer,</span> and can flirt engagingly, dance alluringly, and strip arousingly.`;
}
- } else if (slave.entertainSkill < 100) {
- if (slave.entertainSkill + skillIncrease >= 100) {
+ } else if (slave.skill.entertainment < 100) {
+ if (slave.skill.entertainment + skillIncrease >= 100) {
r = `<span class="green">${He} is now a masterful entertainer,</span> and can learn nothing more about flirting, dancing, or stripping.`;
}
}
- slave.entertainSkill += skillIncrease;
+ slave.skill.entertainment += skillIncrease;
return r;
}
})();
@@ -1476,12 +1477,12 @@ window.resyncSlaveToAge = function(slave) {
slave.bellyPreg = 0;
slave.ovaries = 1;
slave.anus = 0;
- slave.analSkill = 0;
- slave.oralSkill = 0;
- slave.whoreSkill = 0;
- slave.entertainSkill = 0;
- slave.combatSkill = 0;
- slave.vaginalSkill = 0;
+ slave.skill.anal = 0;
+ slave.skill.oral = 0;
+ slave.skill.whore = 0;
+ slave.skill.entertainment = 0;
+ slave.skill.combat = 0;
+ slave.skill.vaginal = 0;
slave.attrXY = 50;
slave.attrXX = 50;
slave.boobs = 200;
@@ -1544,12 +1545,12 @@ window.randomRaceSkin = function(raceName) {
skin = jsEither(["black", "brown", "dark brown"]);
break;
case "latina":
- skin = jsEither(["brown", "dark brown", "dark olive", "light olive", "tanned"]);
+ skin = jsEither(["brown", "dark brown", "dark olive", "light olive", "tan"]);
break;
case "middle eastern":
case "semitic":
case "southern european":
- skin = jsEither(["fair", "light olive", "light", "tanned"]);
+ skin = jsEither(["fair", "light olive", "light", "tan"]);
break;
case "white":
skin = jsEither(["fair", "light", "pale"]);
@@ -1569,20 +1570,22 @@ window.randomRaceEye = function(raceName) {
case "indo-aryan":
case "middle eastern":
case "pacific islander":
- eye = jsEither(["brown"]);
+ eye = jsEither(["brown", "brown", "brown", "brown", "green"]);
break;
case "amerindian":
case "latina":
- case "semitic":
- case "southern european":
- eye = jsEither(["brown", "green"]);
+ eye = jsEither(["brown", "brown", "brown", "green"]);
break;
case "malay":
+ case "southern european":
+ eye = jsEither(["blue", "brown", "brown", "brown", "brown", "brown", "brown", "green"]);
+ break;
+ case "semitic":
case "white":
- eye = jsEither(["blue", "brown", "green"]);
+ eye = jsEither(["blue", "brown", "brown", "brown", "green", "green"]);
break;
default:
- eye = jsEither(["brown", "green"]);
+ eye = jsEither(["blue", "brown", "green"]);
break;
}
return eye;
@@ -1597,16 +1600,16 @@ window.randomRaceHair = function(raceName) {
case "malay":
case "middle eastern":
case "pacific islander":
- case "semitic":
- case "southern european":
- hair = jsEither(["black"]);
+ hair = jsEither(["black", "black", "black", "black", "black", "brown"]);
break;
case "black":
case "latina":
+ case "semitic":
+ case "southern european":
hair = jsEither(["black", "black", "brown", "brown"]);
break;
case "white":
- hair = jsEither(["black", "blonde", "brown", "red"]);
+ hair = jsEither(["black", "black", "blonde", "brown", "brown", "red"]);
break;
default:
hair = jsEither(["black", "black", "black", "black", "blonde", "brown", "brown", "red"]);
@@ -1614,3 +1617,86 @@ window.randomRaceHair = function(raceName) {
}
return hair;
};
+
+window.skinToneLevel = function(skinTone) {
+ if (!setup.naturalSkins.includes(skinTone)) {
+ return undefined;
+ } else {
+ let skinNumber;
+ let skinToMelanin = {
+ "pure black": 25,
+ "ebony": 24,
+ "black": 23,
+ "dark brown": 22,
+ "brown": 21,
+ "light brown": 20,
+ "dark beige": 19,
+ "beige": 18,
+ "light beige": 17,
+ "dark": 16,
+ "dark olive": 15,
+ "bronze": 14,
+ "olive": 13,
+ "tan": 12,
+ "light olive": 11,
+ "light": 10,
+ "fair": 9,
+ "very fair": 8,
+ "extremely fair": 7,
+ "pale": 6,
+ "very pale": 5,
+ "extremely pale": 4,
+ "white": 3,
+ "ivory": 2,
+ "pure white": 1
+ };
+ skinNumber = skinToMelanin[skinTone];
+ return skinNumber;
+ }
+};
+
+window.changeSkinTone = function(skin, value) {
+ if (!setup.naturalSkins.includes(skin)) {
+ return skin;
+ } else {
+ let skinToMelanin = {
+ "pure black": 25,
+ "ebony": 24,
+ "black": 23,
+ "dark brown": 22,
+ "brown": 21,
+ "light brown": 20,
+ "dark beige": 19,
+ "beige": 18,
+ "light beige": 17,
+ "dark": 16,
+ "dark olive": 15,
+ "bronze": 14,
+ "olive": 13,
+ "tan": 12,
+ "light olive": 11,
+ "light": 10,
+ "fair": 9,
+ "very fair": 8,
+ "extremely fair": 7,
+ "pale": 6,
+ "very pale": 5,
+ "extremely pale": 4,
+ "white": 3,
+ "ivory": 2,
+ "pure white": 1
+ };
+ let newSkin = (skinToMelanin[skin] + value);
+ if (newSkin > 25) {
+ newSkin = 25;
+ } else if (newSkin < 1) {
+ newSkin = 1;
+ }
+ let prop = "";
+ for (prop in skinToMelanin) {
+ if (!skinToMelanin.hasOwnProperty(prop)) continue;
+ if (newSkin >= skinToMelanin[prop]) return prop;
+ }
+ return prop;
+ }
+};
\ No newline at end of file
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index ed98dc5241a81161dc6220b766d219ed9eb43249..6510db14122e858aed75998cf9ea6774564eb908 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -1229,7 +1229,7 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
type: "rep",
effect: -1,
});
- } else if (slave.analSkill >= 100) {
+ } else if (slave.skill.anal >= 100) {
vignettes.push({
text: `a customer was surprised by ${his} penis, so ${he} hid it and skillfully pretended to be a real girl,`,
type: "rep",
@@ -1237,7 +1237,7 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
});
}
}
- if (slave.analSkill < 100 && slave.anus > 2) {
+ if (slave.skill.anal < 100 && slave.anus > 2) {
vignettes.push({
text: `a pair of customers enticed by ${his} beauty but disappointed by ${his} loose butthole doubled up on ${his} poor anus without mercy,`,
type: "health",
@@ -1267,14 +1267,14 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
effect: -1,
});
}
- if (slave.vaginalSkill >= 100) {
+ if (slave.skill.vaginal >= 100) {
vignettes.push({
text: `${he} was hired to apply ${his} skills to a customer's virgin son,`,
type: "devotion",
effect: 0,
});
}
- if (canDoAnal(slave) && slave.analSkill < 100 && slave.anus < 2) {
+ if (canDoAnal(slave) && slave.skill.anal < 100 && slave.anus < 2) {
vignettes.push({
text: `a guy with a huge cock paid for the right to fuck ${him} in ${his} tight ass all night,`,
type: "health",
@@ -1633,7 +1633,7 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
});
}
if (V.arcologies[0].FSArabianRevivalist !== "unset") {
- if (slave.entertainSkill >= 100 && canTalk(slave) && slave.voice > 0 && slave.accent < 2) {
+ if (slave.skill.entertainment >= 100 && canTalk(slave) && slave.voice > 0 && slave.accent < 2) {
vignettes.push({
text: `${he} got repeat business from a customer who prefers prostitutes who can tell lovely stories,`,
type: "cash",
@@ -2908,7 +2908,7 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
type: "rep",
effect: -1,
});
- } else if (slave.analSkill >= 100) {
+ } else if (slave.skill.anal >= 100) {
vignettes.push({
text: `a citizen was surprised by ${his} penis, so ${he} hid it, but could barely tolerate anal without touching it`,
type: "rep",
@@ -2916,7 +2916,7 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
});
}
}
- if (slave.analSkill < 100 && slave.anus > 2) {
+ if (slave.skill.anal < 100 && slave.anus > 2) {
vignettes.push({
text: `a pair of customers enticed by ${his} beauty but disappointed by ${his} loose butthole doubled up on ${his} poor anus without mercy,`,
type: "health",
@@ -2946,14 +2946,14 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
effect: -1,
});
}
- if (slave.vaginalSkill >= 100) {
+ if (slave.skill.vaginal >= 100) {
vignettes.push({
text: `${he} was brought in to apply ${his} skills to a prominent citizen's virgin son,`,
type: "devotion",
effect: 0,
});
}
- if (canDoAnal(slave) && slave.analSkill < 100 && slave.anus < 2) {
+ if (canDoAnal(slave) && slave.skill.anal < 100 && slave.anus < 2) {
vignettes.push({
text: `a guy with a huge cock insisted on fucking ${him} in ${his} tight ass all night,`,
type: "health",
@@ -3312,7 +3312,7 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
});
}
if (V.arcologies[0].FSArabianRevivalist !== "unset") {
- if (slave.entertainSkill >= 100 && canTalk(slave) && slave.voice > 0 && slave.accent < 2) {
+ if (slave.skill.entertainment >= 100 && canTalk(slave) && slave.voice > 0 && slave.accent < 2) {
vignettes.push({
text: `${he} gratified a citizen who prefers prostitutes who can tell lovely stories,`,
type: "rep",
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 9df86de2f7c4becafa0f67f50ddd27bd87d68442..abd78acf8ed538df750741cf50c87ac0c729f902 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -263,12 +263,12 @@ The previous owner seems to have left in something of a hurry.
<<set $fixedRace = $arcologies[0].FSSupremacistRace>><<include "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
<<set $activeSlave.face = random(15,100)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
- <<set $activeSlave.entertainSkill = random(15,35)>>
+ <<set $activeSlave.skill.entertainment = random(15,35)>>
<<set $activeSlave.clothes = "uncomfortable straps", $activeSlave.collar = "uncomfortable leather", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "please you">>
<<case "Subjugationist">>
@@ -276,12 +276,12 @@ The previous owner seems to have left in something of a hurry.
<<set $fixedRace = $arcologies[0].FSSubjugationistRace>><<include "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
<<set $activeSlave.face = random(15,100)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
- <<set $activeSlave.whoreSkill = random(15,35)>>
+ <<set $activeSlave.skill.whore = random(15,35)>>
<<set $activeSlave.clothes = "uncomfortable straps", $activeSlave.collar = "uncomfortable leather", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "whore">>
<<case "GenderRadicalist">>
@@ -293,7 +293,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.boobs += 100*random(2,4)>>
<<set $activeSlave.butt += random(1,2)>>
<<set $activeSlave.attrXY = random(70,90), $activeSlave.attrXX = 0>>
- <<set $activeSlave.oralSkill = random(35,65), $activeSlave.analSkill = random(35,65), $activeSlave.whoreSkill = random(35,65)>>
+ <<set $activeSlave.skill.oral = random(35,65), $activeSlave.skill.anal = random(35,65), $activeSlave.skill.whore = random(35,65)>>
<<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.clothes = "uncomfortable straps", $activeSlave.collar = "stylish leather", $activeSlave.shoes = "heels">>
<<set $activeSlave.assignment = "whore">>
@@ -308,7 +308,7 @@ The previous owner seems to have left in something of a hurry.
<<run SetBellySize($activeSlave)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
<<set $activeSlave.clothes = "a nice maid outfit", $activeSlave.collar = "tight steel", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "be a servant">>
@@ -318,7 +318,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(55,65), $activeSlave.health = random(55,65)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.intelligence = random(0,100), $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.entertainSkill = random(15,35)>>
+ <<set $activeSlave.skill.entertainment = random(15,35)>>
<<set $activeSlave.clothes = "conservative clothing", $activeSlave.collar = "none", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "be a servant">>
<<case "Degradationist">>
@@ -331,7 +331,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.butt += random(2,3)>>
<<set $activeSlave.lips = random(2,4)>>
<<set $activeSlave.weight = random(-15,15)>>
- <<set $activeSlave.oralSkill = 0, $activeSlave.analSkill = 0, $activeSlave.vaginalSkill = 0, $activeSlave.entertainSkill = 0, $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.oral = 0, $activeSlave.skill.anal = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.whore = 0>>
<<set $activeSlave.behavioralFlaw = "none", $activeSlave.sexualFlaw = "none">>
<<set $activeSlave.clothes = "a Fuckdoll suit">>
<<set $activeSlave.assignment = "please you">>
@@ -347,12 +347,12 @@ The previous owner seems to have left in something of a hurry.
<<if $activeSlave.balls > 0>><<set $activeSlave.balls++>><</if>>
<<if $activeSlave.dick > 0>><<set $activeSlave.dick++>><</if>>
<<set $activeSlave.weight = random(15,90)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = 0, $activeSlave.anus = 0>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = 0, $activeSlave.anus = 0>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
- <<set $activeSlave.entertainSkill = random(15,35)>>
+ <<set $activeSlave.skill.entertainment = random(15,35)>>
<<set $activeSlave.clothes = "slutty jewelry", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
<<set $activeSlave.assignment = "please you">>
<<case "SlimnessEnthusiast">>
@@ -363,12 +363,12 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.boobs = 100*random(1,4)>>
<<set $activeSlave.butt = random(1,2)>>
<<set $activeSlave.weight = random(-25,-15)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = 0, $activeSlave.anus = 0>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = 0, $activeSlave.anus = 0>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
- <<set $activeSlave.entertainSkill = random(15,35)>>
+ <<set $activeSlave.skill.entertainment = random(15,35)>>
<<set $activeSlave.clothes = "a leotard", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "please you">>
<<case "TransformationFetishist">>
@@ -384,10 +384,10 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.lipsImplant = random(1,2)>>
<<set $activeSlave.lips = Math.trunc($activeSlave.lipsImplant+2,-3,3)>>
<<set $activeSlave.weight = random(-25,-15)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
<<set $activeSlave.clothes = "a string bikini", $activeSlave.collar = "shock punishment", $activeSlave.shoes = "extreme heels">>
<<set $activeSlave.assignment = "whore">>
@@ -398,10 +398,10 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.weight = random(-5,5)>>
<<set $activeSlave.muscles = random(10,25)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
<<set $activeSlave.clothes = "a nice maid outfit", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
<<set $activeSlave.assignment = "be a servant">>
@@ -416,10 +416,10 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.boobs += 100*random(1,4)>>
<<set $activeSlave.butt += random(1,2)>>
<<set $activeSlave.weight = random(-5,90)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
<<run SoftenBehavioralFlaw($activeSlave)>>
<<set $activeSlave.clothes = "a slutty maid outfit", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
@@ -433,9 +433,9 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.boobs = 100*random(1,4)>>
<<set $activeSlave.butt = random(1,3)>>
<<set $activeSlave.weight = random(-25,25)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = 0, $activeSlave.anus = 0>>
- <<if $activeSlave.vagina > -1>><<set $activeSlave.vaginalSkill = 0, $activeSlave.vagina = 0>><</if>>
- <<set $activeSlave.entertainSkill = random(15,35)>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = 0, $activeSlave.anus = 0>>
+ <<if $activeSlave.vagina > -1>><<set $activeSlave.skill.vaginal = 0, $activeSlave.vagina = 0>><</if>>
+ <<set $activeSlave.skill.entertainment = random(15,35)>>
<<set $activeSlave.clothes = "a schoolgirl outfit", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
<<set $activeSlave.assignment = "be a servant">>
<<case "Pastoralist">>
@@ -452,12 +452,12 @@ The previous owner seems to have left in something of a hurry.
<<include "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = 100>>
<<set $activeSlave.muscles = random(50,100)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
- <<set $activeSlave.whoreSkill = random(15,35)>>
+ <<set $activeSlave.skill.whore = random(15,35)>>
<<set $activeSlave.clothes = "body oil", $activeSlave.collar = "none", $activeSlave.shoes = "none">>
<<set $activeSlave.assignment = "whore">>
<<case "ChattelReligionist">>
@@ -465,7 +465,7 @@ The previous owner seems to have left in something of a hurry.
<<include "Generate New Slave">>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(55,65), $activeSlave.health = random(0,15)>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.whoreSkill = random(10,20)>>
+ <<set $activeSlave.skill.whore = random(10,20)>>
<<set $activeSlave.behavioralFlaw = "none", $activeSlave.behavioralQuirk = "sinful">>
<<set $activeSlave.clothes = "a chattel habit", $activeSlave.collar = "heavy gold", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "whore">>
@@ -476,7 +476,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.devotion = 100, $activeSlave.trust = random(55,65), $activeSlave.health = 100>>
<<set $activeSlave.face = random(0,55)>>
<<set $activeSlave.muscles = random(25,50)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.behavioralFlaw = "none", $activeSlave.behavioralQuirk = "fitness">>
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.clothes = "a toga", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "flats">>
@@ -489,7 +489,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.accent = 0>>
<<set $activeSlave.devotion = 75, $activeSlave.trust = 75, $activeSlave.health = random(-20,20)>>
<<set $activeSlave.muscles = random(50,75)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.behavioralFlaw = "malicious", $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.clothes = "a huipil", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "none">>
<<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>>
@@ -498,12 +498,12 @@ The previous owner seems to have left in something of a hurry.
<<include "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
<<set $activeSlave.face = random(15,100)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
- <<set $activeSlave.entertainSkill = random(15,35)>>
+ <<set $activeSlave.skill.entertainment = random(15,35)>>
<<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.clothes = "slutty jewelry", $activeSlave.collar = "ancient Egyptian", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "please you">>
@@ -516,7 +516,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.intelligence = random(0,100), $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.entertainSkill = 100>>
+ <<set $activeSlave.skill.entertainment = 100>>
<<set $activeSlave.clothes = "a kimono", $activeSlave.collar = "satin choker", $activeSlave.shoes = "heels">>
<<set $activeSlave.assignment = "serve the public">>
<<case "ArabianRevivalist">>
@@ -539,12 +539,12 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.face = random(0,55)>>
<<set $activeSlave.accent = 0>>
<<set $activeSlave.intelligence = 100, $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.oralSkill = 100, $activeSlave.analSkill = 100>>
+ <<set $activeSlave.skill.oral = 100, $activeSlave.skill.anal = 100>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = 100>>
+ <<set $activeSlave.skill.vaginal = 100>>
<</if>>
- <<set $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100>>
+ <<set $activeSlave.skill.entertainment = 100, $activeSlave.skill.whore = 100>>
<<run SoftenBehavioralFlaw($activeSlave)>>
<<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.clothes = "a slutty qipao", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
@@ -557,13 +557,13 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceShape = "sensual">>
- <<set $activeSlave.oralSkill = random(35,75), $activeSlave.analSkill = random(35,75)>>
+ <<set $activeSlave.skill.oral = random(35,75), $activeSlave.skill.anal = random(35,75)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<set $activeSlave.vaginalSkill = random(35,75)>>
+ <<set $activeSlave.skill.vaginal = random(35,75)>>
<</if>>
- <<set $activeSlave.entertainSkill = random(15,35)>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = random(15,35)>>
+ <<set $activeSlave.skill.whore = 0>>
<<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.clothes = "a ball gown", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "rest">>
@@ -581,7 +581,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.bellySag = 20, $activeSlave.bellySagPreg = 20>>
<<if $activeSlave.vagina > -1>>
<<set $activeSlave.vagina = 4>>
- <<set $activeSlave.vaginalSkill = random(15,35)>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
<</if>>
<<set $activeSlave.clothes = "a nice maid outfit", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "please you">>
@@ -594,9 +594,9 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.boobs += 100*random(3,6)>>
<<set $activeSlave.butt += random(2,5)>>
<<set $activeSlave.weight = random(100,200)>>
- <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35), $activeSlave.anus = 2>>
- <<if $activeSlave.vagina > -1>><<set $activeSlave.vaginalSkill = random(15,35), $activeSlave.vagina = 3>><</if>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35), $activeSlave.anus = 2>>
+ <<if $activeSlave.vagina > -1>><<set $activeSlave.skill.vaginal = random(15,35), $activeSlave.vagina = 3>><</if>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.energy = random(60,80)>>
<<set $activeSlave.behavioralFlaw = "gluttonous">>
<<set $activeSlave.clothes = "attractive lingerie", $activeSlave.shoes = "flats">>
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 8fa5040024220220592ff3d5aaa9d5ad37060a84..1ccc467cca55ce81dbdd50bc6cf1c4838600c3fa 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -29,7 +29,7 @@ Working in $activeArcology.name's penthouse office, $subSlave.slaveName gets a v
<br><br>
-_His2 question is answered when you bring $activeSlave.slaveName in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's <<= App.Desc.EyeColor $subSlave>> eyes fly open with pleased surprise, but before _he2 can speak, $activeSlave.slaveName goes first.
+_His2 question is answered when you bring $activeSlave.slaveName in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's <<= App.Desc.eyeColor $subSlave>> eyes fly open with pleased surprise, but before _he2 can speak, $activeSlave.slaveName goes first.
<<if !canTalk($activeSlave)>>
Unable to speak $himself, $he simply makes a heart shape with $his hands in view of the video call, and blows $his <<if $activeSlave.relationship == 4>>lover<<else>>wife<</if>> a kiss.
<<else>>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index 989c35a3372ea9912b7d64b87ead64d2940aae80..3e527fc6c204ded40dac91648063b7be83725d5b 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -32,7 +32,7 @@
<<set $desc = SlaveTitle($slaves[$i])>>
<<setLocalPronouns $slaves[$i]>>
-You order $slaves[$i].slaveName to come into your office for orders. The devoted $desc has no prior warning that this is anything unusual, and from the <<if $slaves[$i].energy > 95>>horny glint<<else>>glow of sexual availability<</if>> in $his <<= App.Desc.EyeColor $slaves[$i]>> eyes as $he <<if canWalk($slaves[$i])>>enters<<else>>is helped in<</if>>, $he <<if $slaves[$i].energy > 95>>seems to be hoping<<else>>wouldn't mind hearing<</if>> that you've called $him in for a quick fuck. In fact, the matter at hand is about as far as it could possibly be from that, on the spectrum of interactions between <<= properMaster()>> and slave.
+You order $slaves[$i].slaveName to come into your office for orders. The devoted $desc has no prior warning that this is anything unusual, and from the <<if $slaves[$i].energy > 95>>horny glint<<else>>glow of sexual availability<</if>> in $his <<= App.Desc.eyeColor $slaves[$i]>> eyes as $he <<if canWalk($slaves[$i])>>enters<<else>>is helped in<</if>>, $he <<if $slaves[$i].energy > 95>>seems to be hoping<<else>>wouldn't mind hearing<</if>> that you've called $him in for a quick fuck. In fact, the matter at hand is about as far as it could possibly be from that, on the spectrum of interactions between <<= properMaster()>> and slave.
<br><br>You offer $him, without preamble, agency on your behalf in $activeArcology.name. As a $woman of intelligence, $he knows the basics of such an arrangement, but $he's stunned into silence by the offer, so you outline it briefly. Having a slave lead an arcology would be too much, even for the most open minded of Free Cities societies. So, $he would be freed, albeit subject to a set of private, restrictive contracts that would allow you to recall $him if you wish, and require $him to follow your directions, if you give $him any. But other than that, $he would be the effective leader of an entire arcology. It's an unusual arrangement, but one that's becoming more common as multiple arcologies come under united control.
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index bcc9e13e48c7592e7e86662654773609e71cda70..4680bc8f0bfe7bd7aeb3b0f5e438f880a18fbc8d 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -2,9 +2,9 @@
<<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, _HS.health = 50, _HS.devotion = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "honey blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.lips = 35, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "'Miss Anne' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She speaks with the rich accent of the Old South.">>
+<<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, _HS.health = 50, _HS.devotion = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "honey blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.lips = 35, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "'Miss Anne' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She speaks with the rich accent of the Old South.">>
<<if $seeDicks != 100>>
- <<set _HS.genes = "XX", _HS.vagina = 2, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.pubertyXX = 1>>
+ <<set _HS.genes = "XX", _HS.vagina = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.pubertyXX = 1>>
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1, _HS.pubertyXY = 1>>
<</if>>
@@ -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, _HS.health = 10, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "A large letter S is branded into the back of her left hand.", _HS.customDesc = "She 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, _HS.health = 10, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.whore = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "A large letter S is branded into the back of her left hand.", _HS.customDesc = "She 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,9 +23,9 @@
//_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, _HS.health = 10, _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.skin = "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.oralSkill = 35, _HS.analSkill = 35, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "A large letter S is branded into the back of her left hand.", _HS.customDesc = "She 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, _HS.health = 10, _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.skin = "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.whore = 35, _HS.skill.entertainment = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "A large letter S is branded into the back of her left hand.", _HS.customDesc = "She 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.vaginalSkill = 35, _HS.pubertyXX = 1>>
+ <<set _HS.genes = "XX", _HS.vagina = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.pubertyXX = 1>>
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 2, _HS.balls = 2, _HS.scrotum = 2, _HS.foreskin = 2, _HS.prostate = 1, _HS.pubertyXY = 1>>
<</if>>
@@ -33,9 +33,9 @@
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Cornflower", _HS.birthName = "Alysa", _HS.ID = 990003, _HS.relation = "daughter", _HS.relationTarget = 990005, _HS.relationship = 3, _HS.relationshipTarget = 990005, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.heels = 1, _HS.voice = 0, _HS.boobs = 6000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 3, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.oralSkill = 15, _HS.analSkill = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customTat = "A pretty blue cornflower is tattooed on each of her cheeks.", _HS.customDesc = "She once spoke with the demeaning accent of slaves from the Old South.", _HS.mother = 990005>>
+<<set _HS.slaveName = "Cornflower", _HS.birthName = "Alysa", _HS.ID = 990003, _HS.relation = "daughter", _HS.relationTarget = 990005, _HS.relationship = 3, _HS.relationshipTarget = 990005, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.heels = 1, _HS.voice = 0, _HS.boobs = 6000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 3, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customTat = "A pretty blue cornflower is tattooed on each of her cheeks.", _HS.customDesc = "She once spoke with the demeaning accent of slaves from the Old South.", _HS.mother = 990005>>
<<if $seeDicks != 100>>
- <<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.pubertyXX = 1>>
+ <<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.pubertyXX = 1>>
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.dickTat = "bovine patterns", _HS.pubertyXY = 1>>
<</if>>
@@ -43,7 +43,7 @@
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.relation = "daughter", _HS.relationTarget = 990000, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 30, _HS.muscles = 50, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "straw blonde", _HS.skin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.analSkill = 35, _HS.combatSkill = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "'Miss Lily' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
+<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.relation = "daughter", _HS.relationTarget = 990000, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 30, _HS.muscles = 50, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "straw blonde", _HS.skin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "'Miss Lily' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.ovaries = 1, _HS.pubertyXX = 1>>
<<else>>
@@ -54,9 +54,9 @@
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Lilac", _HS.birthName = "Lillian", _HS.ID = 990005, _HS.relation = "mother", _HS.relationTarget = 990003, _HS.relationship = 3, _HS.relationshipTarget = 990003, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.health = 20, _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 8000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 4, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.oralSkill = 15, _HS.analSkill = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customTat = "A pretty purple lilac is tattooed on each of her cheeks.", _HS.customDesc = "She once spoke with the demeaning accent of slaves from the Old South.">>
+<<set _HS.slaveName = "Lilac", _HS.birthName = "Lillian", _HS.ID = 990005, _HS.relation = "mother", _HS.relationTarget = 990003, _HS.relationship = 3, _HS.relationshipTarget = 990003, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.health = 20, _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 8000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 4, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customTat = "A pretty purple lilac is tattooed on each of her cheeks.", _HS.customDesc = "She once spoke with the demeaning accent of slaves from the Old South.">>
<<if $seeDicks != 100>>
- <<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.pubertyXX = 1>>
+ <<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.pubertyXX = 1>>
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 5, _HS.balls = 5, _HS.scrotum = 5, _HS.foreskin = 5, _HS.prostate = 1, _HS.dickTat = "bovine patterns", _HS.pubertyXY = 1>>
<</if>>
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index dc74809f3888aa5dd2707c42621a393b92f6bd47..f1e71c000e59e1b991ca490e969dffee3023e9f2 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -2,13 +2,13 @@
<<set _i = 900000>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Rose", _HS.birthName = "Rose", _HS.origin = "She is a former maid with an unsettling obsessive streak.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 40, _HS.devotion = 100, _HS.weight = 25, _HS.hColor = "chestnut", _HS.pubicHColor = "chestnut", _HS.hLength = 30, _HS.hStyle = "shoulder-length and in a bun", _HS.boobs = 700, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 1, _HS.clothes = "a nice maid outfit", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.career = "a maid", _HS.eyes = -1, _HS.eyewear = "corrective glasses">>
+<<set _HS.slaveName = "Rose", _HS.birthName = "Rose", _HS.origin = "She is a former maid with an unsettling obsessive streak.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 40, _HS.devotion = 100, _HS.weight = 25, _HS.hColor = "chestnut", _HS.pubicHColor = "chestnut", _HS.hLength = 30, _HS.hStyle = "shoulder-length and in a bun", _HS.boobs = 700, _HS.butt = 3, _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.skill.entertainment = 1, _HS.clothes = "a nice maid outfit", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.career = "a maid", _HS.eyes = -1, _HS.eyewear = "corrective glasses">>
<<set $heroSlaves.push(_HS)>>
/*maid dress, Excellent house slave, Will return if sold*/
/*Added origin, tweaked stats, made her Submissive -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Red", _HS.birthName = "Red", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, _HS.health = 20, _HS.devotion = 100, _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "light", _HS.hStyle = "long and tied back", _HS.boobs = 400, _HS.butt = 2, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.analSkill = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Red", _HS.birthName = "Red", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, _HS.health = 20, _HS.devotion = 100, _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "light", _HS.hStyle = "long and tied back", _HS.boobs = 400, _HS.butt = 2, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.anal = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*changed eyes to blue, skin to light, double checked other stats*/
@@ -19,59 +19,59 @@
/*Added origin -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Reine", _HS.origin = "She is a former mercenary that ended up on a losing side in the byzantine Free City power games.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 60, _HS.devotion = -75, _HS.height = 190, _HS.muscles = 20, _HS.race = "white", _HS.hColor = "red", _HS.hStyle = "long and wild", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.combatSkill = 1, _HS.intelligence = -20, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishStrength = 100, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has beautiful Celtic warrior's tattoos in woad blue.", _HS.career = "a mercenary">>
+<<set _HS.slaveName = "Reine", _HS.origin = "She is a former mercenary that ended up on a losing side in the byzantine Free City power games.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 60, _HS.devotion = -75, _HS.height = 190, _HS.muscles = 20, _HS.race = "white", _HS.hColor = "red", _HS.hStyle = "long and wild", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = -20, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishStrength = 100, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has beautiful Celtic warrior's tattoos in woad blue.", _HS.career = "a mercenary">>
<<set $heroSlaves.push(_HS)>>
/*Added origin, made some assumptions about her 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), _HS.health = 20, _HS.height = 157, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.clothes = "uncomfortable straps", _HS.attrXY = 40>>
+<<set _HS.slaveName = "Luna", _HS.birthName = "Luna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.height = 157, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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 $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*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Skye", _HS.birthName = "Skye", _HS.origin = "She was fresh from the slave markets when you acquired her.", _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 = 20, _HS.weight = -20, _HS.height = 155, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 40, _HS.hStyle = "chest-length", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.nosePiercing = 2, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Skye", _HS.birthName = "Skye", _HS.origin = "She was fresh from the slave markets when you acquired her.", _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 = 20, _HS.weight = -20, _HS.height = 155, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 40, _HS.hStyle = "chest-length", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.nosePiercing = 2, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Corrected piercings, added origin -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Piggy", _HS.birthName = "Chloë", _HS.origin = "She was once a celebrity that protested the existence of slavery, but has now become a slave herself.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -75, _HS.weight = -20, _HS.eyeColor = "green", _HS.hColor = "dirty blonde", _HS.pubicHColor = "dirty blonde", _HS.skin = "white", _HS.hLength = 10, _HS.boobs = 300, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.oralSkill = 100, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishStrength = 100, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy">>
+<<set _HS.slaveName = "Piggy", _HS.birthName = "Chloë", _HS.origin = "She was once a celebrity that protested the existence of slavery, but has now become a slave herself.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -75, _HS.weight = -20, _HS.eyeColor = "green", _HS.hColor = "dirty blonde", _HS.pubicHColor = "dirty blonde", _HS.skin = "white", _HS.hLength = 10, _HS.boobs = 300, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.oral = 100, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishStrength = 100, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy">>
<<set $heroSlaves.push(_HS)>>
/*Added origin, added bitchy, corrected eye color -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sarah", _HS.birthName = "Sarah", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 20, _HS.devotion = 20, _HS.height = 175, _HS.eyeColor = "grey", _HS.hColor = "dirty blonde", _HS.pubicHColor = "dirty blonde", _HS.skin = "white", _HS.hLength = 10, _HS.boobs = 400, _HS.butt = 2, _HS.face = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.combatSkill = 1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.behavioralFlaw = "odd", _HS.customTat = "She has an abstract tattoo of flowers and vines extending from her left knee to her pelvis to cover up a surgery scar. Her full name, blood type, and medical allergies are printed in matrix barcodes on each wrist.">>
+<<set _HS.slaveName = "Sarah", _HS.birthName = "Sarah", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 20, _HS.devotion = 20, _HS.height = 175, _HS.eyeColor = "grey", _HS.hColor = "dirty blonde", _HS.pubicHColor = "dirty blonde", _HS.skin = "white", _HS.hLength = 10, _HS.boobs = 400, _HS.butt = 2, _HS.face = 15, _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.skill.combat = 1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.behavioralFlaw = "odd", _HS.customTat = "She has an abstract tattoo of flowers and vines extending from her left knee to her pelvis to cover up a surgery scar. Her full name, blood type, and medical allergies are printed in matrix barcodes on each wrist.">>
<<set $heroSlaves.push(_HS)>>
/*Pretty face, barcodes on wrists, fighter*/
/*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 = "She was a slave trader until she 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, _HS.health = 40, _HS.devotion = -100, _HS.muscles = 20, _HS.height = 183, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.clothes = "restrictive latex", _HS.shoes = "heels", _HS.intelligence = -20, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has several 'tribal' style tattoos on her arms from before her enslavement.", _HS.career = "a slaver">>
+<<set _HS.slaveName = "Cuntbitch", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "She was a slave trader until she 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, _HS.health = 40, _HS.devotion = -100, _HS.muscles = 20, _HS.height = 183, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.customTat = "She has several 'tribal' style tattoos on her arms from before her 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*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Catherine", _HS.birthName = "Catherine", _HS.origin = "She came from a wealthy background, but she sold herself into slavery to slake her desire to submit to men and dominate women.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 40, _HS.devotion = 20, _HS.nationality = "American", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.race = "white", _HS.hLength = 25, _HS.hStyle = "short and in a ponytail", _HS.boobs = 800, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.makeup = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.entertainSkill = 100, _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXX = 55, _HS.attrXY = 60, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.eyes = -1, _HS.eyewear = "corrective glasses">>
+<<set _HS.slaveName = "Catherine", _HS.birthName = "Catherine", _HS.origin = "She came from a wealthy background, but she sold herself into slavery to slake her desire to submit to men and dominate women.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 40, _HS.devotion = 20, _HS.nationality = "American", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.race = "white", _HS.hLength = 25, _HS.hStyle = "short and in a ponytail", _HS.boobs = 800, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.makeup = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.entertainment = 100, _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXX = 55, _HS.attrXY = 60, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.eyes = -1, _HS.eyewear = "corrective glasses">>
<<set $heroSlaves.push(_HS)>>
/*corrected eye color, makeup, tweaked entertainskill, added 'arrogant' -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Lilly", _HS.birthName = "Lilly", _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 = 30, _HS.height = 155, _HS.eyeColor = "green", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "extremely pale", _HS.hStyle = "long", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "degradation", _HS.anus = 3, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.attrXY = 40, _HS.hips = 2>>
+<<set _HS.slaveName = "Lilly", _HS.birthName = "Lilly", _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 = 30, _HS.height = 155, _HS.eyeColor = "green", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "extremely pale", _HS.hStyle = "long", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "degradation", _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.attrXY = 40, _HS.hips = 2>>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Erica", _HS.birthName = "Erica", _HS.origin = "She was sold into slavery after her father was killed by political rivals.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = -10, _HS.devotion = 15, _HS.weight = -20, _HS.height = 152, _HS.markings = "freckled", _HS.eyes = 1, _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "fair", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 4, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Erica", _HS.birthName = "Erica", _HS.origin = "She was sold into slavery after her father was killed by political rivals.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = -10, _HS.devotion = 15, _HS.weight = -20, _HS.height = 152, _HS.markings = "freckled", _HS.eyes = 1, _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "fair", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 4, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*corrected eyes, changed skin to 'freckled', tweaked height downward, added pseudophallus clit, added origin -BoneyM*/
/% corrected skin to fair?, changed markings to 'freckled' Bane70 %/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sylvia", _HS.birthName = "Sylvia", _HS.origin = "She was born a slave and knows no other life.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.nationality = "Stateless", _HS.health = -10, _HS.devotion = 10, _HS.hColor = "black", _HS.hLength = 10, _HS.pubicHColor = "black", _HS.skin = "tanned", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Sylvia", _HS.birthName = "Sylvia", _HS.origin = "She was born a slave and knows no other life.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.nationality = "Stateless", _HS.health = -10, _HS.devotion = 10, _HS.hColor = "black", _HS.hLength = 10, _HS.pubicHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Added origin, tweaked skills, added smart piercing set to submissive, removed buttslut -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Eryma", _HS.birthName = "Eryma", _HS.origin = "She is a former gladiator that wagered her freedom and lost.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 100, _HS.devotion = -30, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.combatSkill = 1, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant">>
+<<set _HS.slaveName = "Eryma", _HS.birthName = "Eryma", _HS.origin = "She is a former gladiator that wagered her freedom and lost.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 100, _HS.devotion = -30, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.combat = 1, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant">>
<<set $heroSlaves.push(_HS)>>
/*fighter*/
/*Added combat skill, changed eye color and rules, added origin, added arrogant -BoneyM*/
@@ -83,19 +83,19 @@
/*Tweaked obedience downwards, increased weight and face, added origin, changed eye color, changed fetish to bisexual and added 'hates men' flaw -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fio", _HS.birthName = "Fio", _HS.slaveSurname = "Rodan", _HS.birthSurname = "Rodan", _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 = -100, _HS.weight = -20, _HS.height = 175, _HS.hLength = 15, _HS.skin = "tanned", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.energy = 100, _HS.attrXY = 40, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a tribal tattoo from her right elbow up the shoulder and across her back.">>
+<<set _HS.slaveName = "Fio", _HS.birthName = "Fio", _HS.slaveSurname = "Rodan", _HS.birthSurname = "Rodan", _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 = -100, _HS.weight = -20, _HS.height = 175, _HS.hLength = 15, _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.boobs = 500, _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.energy = 100, _HS.attrXY = 40, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a tribal tattoo from her right elbow up the shoulder and across her back.">>
<<set $heroSlaves.push(_HS)>>
/*Corrected tattoo syntax, added nympho and arrogant -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kiki", _HS.birthName = "Kiki", _HS.origin = "She is a shinobi, and fanatically loyal to her master.", _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 = 100, _HS.weight = -20, _HS.height = 175, _HS.nationality = "Japanese", _HS.race = "asian", _HS.origHColor = "black", _HS.override_H_Color = 1, _HS.hColor = "light purple", _HS.pubicHColor = "light purple", _HS.hLength = 10, _HS.hStyle = "short", _HS.boobs = 500, _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.combatSkill = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.behavioralFlaw = "odd", _HS.customTat = "She has Yakuza-style tattoos across her back.">>
+<<set _HS.slaveName = "Kiki", _HS.birthName = "Kiki", _HS.origin = "She is a shinobi, and fanatically loyal to her master.", _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 = 100, _HS.weight = -20, _HS.height = 175, _HS.nationality = "Japanese", _HS.race = "asian", _HS.origHColor = "black", _HS.override_H_Color = 1, _HS.hColor = "light purple", _HS.pubicHColor = "light purple", _HS.hLength = 10, _HS.hStyle = "short", _HS.boobs = 500, _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whore = 35, _HS.skill.entertainment = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.behavioralFlaw = "odd", _HS.customTat = "She has Yakuza-style tattoos across her back.">>
<<set $heroSlaves.push(_HS)>>
/*shinobi*/
/*Tweaked devotion upwards, added origin, corrected tattoo syntax, added odd quirk, added whoring and entertaining skill -BoneyM*/
/% added combat skill 'Shinobi' means ninja so she would have combat skill by default %/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Lily", _HS.birthName = "Lily", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 10, _HS.weight = -20, _HS.height = 163, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 400, _HS.butt = 2, _HS.face = 55, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXY = 40>>
+<<set _HS.slaveName = "Lily", _HS.birthName = "Lily", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 10, _HS.weight = -20, _HS.height = 163, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 400, _HS.butt = 2, _HS.face = 55, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXY = 40>>
<<set $heroSlaves.push(_HS)>>
/*Added green eyes, increased face, changed waist -BoneyM*/
@@ -106,24 +106,24 @@
/*Added 'hates men', changed eyes to amber, made her a servant -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Feri", _HS.birthName = "Feri", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 20, _HS.devotion = -75, _HS.height = 175, _HS.hStyle = "long", _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "pale", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -20, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy">>
+<<set _HS.slaveName = "Feri", _HS.birthName = "Feri", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 20, _HS.devotion = -75, _HS.height = 175, _HS.hStyle = "long", _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "pale", _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 = -20, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy">>
<<set $heroSlaves.push(_HS)>>
/*Snarky*/
/*Added 'submissive' and 'bitchy' -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "She 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, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.skin = "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.oralSkill = 15, _HS.analSkill = 35, _HS.combatSkill = 1, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has a red star tattoo on her back, and a hammer and sickle on her right buttock.", _HS.customDesc = "She has a Slavic face with high cheekbones and a strong, pointed jaw. She is a skilled martial artist.", _HS.faceShape = "masculine", _HS.career = "a bodyguard">>
+<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "She 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, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.override_Skin = 1, _HS.skin = "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.customTat = "She has a red star tattoo on her back, and a hammer and sickle on her right buttock.", _HS.customDesc = "She has a Slavic face with high cheekbones and a strong, pointed jaw. She 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 = "She 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, _HS.health = 40, _HS.devotion = 15, _HS.height = 155, _HS.race = "latina", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.combatSkill = 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 = "She 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, _HS.health = 40, _HS.devotion = 15, _HS.height = 155, _HS.race = "latina", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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 $heroSlaves.push(_HS)>>
/*fighter*/
/*Tweaked face down, added 'hates penetration' and combat skill -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Cecilia", _HS.birthName = "Cecilia", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 20, _HS.devotion = 100, _HS.height = 178, _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "white", _HS.hLength = 10, _HS.boobs = 650, _HS.nipplesPiercing = 2, _HS.boobsTat = "tribal patterns", _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.lipsPiercing = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "tribal patterns", _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.intelligence = 10, _HS.attrXY = 40>>
+<<set _HS.slaveName = "Cecilia", _HS.birthName = "Cecilia", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 20, _HS.devotion = 100, _HS.height = 178, _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "white", _HS.hLength = 10, _HS.boobs = 650, _HS.nipplesPiercing = 2, _HS.boobsTat = "tribal patterns", _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.lipsPiercing = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "tribal patterns", _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 10, _HS.attrXY = 40>>
<<set $heroSlaves.push(_HS)>>
/*Tweaked devotion up, added arrogant -BoneyM*/
@@ -139,19 +139,19 @@
/*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, _HS.health = 20, _HS.devotion = 15, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 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, _HS.health = 20, _HS.devotion = 15, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "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 $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, she 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, _HS.health = 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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = -30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her breasts are tattooed with her implant history, showing repeated additions.", _HS.sexualFlaw = "crude">>
+<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, she 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, _HS.health = 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.customTat = "Her breasts are tattooed with her 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*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sophia", _HS.birthName = "Sophia", _HS.origin = "A former Head Girl of a rich man's harem, she is used to being in charge of others.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 20, _HS.devotion = 25, _HS.height = 175, _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "white", _HS.hLength = 35, _HS.hStyle = "shoulder length", _HS.boobs = 1000, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXX = 0, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.behavioralFlaw = "arrogant">>
+<<set _HS.slaveName = "Sophia", _HS.birthName = "Sophia", _HS.origin = "A former Head Girl of a rich man's harem, she is used to being in charge of others.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 20, _HS.devotion = 25, _HS.height = 175, _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "white", _HS.hLength = 35, _HS.hStyle = "shoulder length", _HS.boobs = 1000, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXX = 0, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.behavioralFlaw = "arrogant">>
<<set $heroSlaves.push(_HS)>>
/*dislikes women*/
/*Added 'arrogant' and origin -BoneyM*/
@@ -163,112 +163,112 @@
/*Added big clit, increased nipple piercing, added clit piercing -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Jones", _HS.birthName = "Jones", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 40, _HS.devotion = 25, _HS.height = 175, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hLength = 40, _HS.hStyle = "long curls back in a ponytail", _HS.boobs = 400, _HS.butt = 1, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.combatSkill = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a large yakuza tattoo over her shoulder, depicting roses and koi fishes swimming upstream.">>
+<<set _HS.slaveName = "Jones", _HS.birthName = "Jones", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 40, _HS.devotion = 25, _HS.height = 175, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hLength = 40, _HS.hStyle = "long curls back in a ponytail", _HS.boobs = 400, _HS.butt = 1, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a large yakuza tattoo over her shoulder, depicting roses and koi fishes swimming upstream.">>
<<set $heroSlaves.push(_HS)>>
/*violent nymphomania, buttslut*/
/*Tweaked health upwards, corrected tattoo syntax, added combat skill -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Slave", _HS.birthName = "Vanessa", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = -75, _HS.height = 157, _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1200, _HS.butt = 3, _HS.lipsTat = "permanent makeup", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.oralSkill = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a barcode tattooed on her abdomen, and 'cut here' lines on her arms and legs.", _HS.sexualFlaw = "self hating">>
+<<set _HS.slaveName = "Slave", _HS.birthName = "Vanessa", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = -75, _HS.height = 157, _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1200, _HS.butt = 3, _HS.lipsTat = "permanent makeup", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a barcode tattooed on her abdomen, and 'cut here' lines on her arms and legs.", _HS.sexualFlaw = "self hating">>
<<set $heroSlaves.push(_HS)>>
/*permashackles*/
/*Changed eyes to blue, added tattoos -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Carol", _HS.birthName = "Carol", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 60, _HS.weight = -20, _HS.height = 155, _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 400, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a cherry blossom tattooed on her forearm.", _HS.customDesc = "She is unnaturally flexible.">>
+<<set _HS.slaveName = "Carol", _HS.birthName = "Carol", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 60, _HS.weight = -20, _HS.height = 155, _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 400, _HS.butt = 4, _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.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a cherry blossom tattooed on her forearm.", _HS.customDesc = "She is unnaturally flexible.">>
<<set $heroSlaves.push(_HS)>>
/*red contacts*/
/*Reduced weight, changed eyes to blue, corrected tattoo syntax, added flexibility in customdesc, changed skin to pale -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Jennifer", _HS.birthName = "Jennifer", _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 = 60, _HS.race = "white", _HS.hColor = "brunette", _HS.pubicHColor = "brunette", _HS.skin = "fair", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.entertainSkill = 35, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.height = 173>>
+<<set _HS.slaveName = "Jennifer", _HS.birthName = "Jennifer", _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 = 60, _HS.race = "white", _HS.hColor = "brunette", _HS.pubicHColor = "brunette", _HS.skin = "fair", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.entertainment = 35, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.height = 173>>
<<set $heroSlaves.push(_HS)>>
/*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, _HS.health = 20, _HS.devotion = 90, _HS.race = "middle eastern", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.entertainSkill = 35, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has 'Charity' tattooed in cursive across the back of her 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, _HS.health = 20, _HS.devotion = 90, _HS.race = "middle eastern", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.customTat = "She has 'Charity' tattooed in cursive across the back of her neck.">>
<<set $heroSlaves.push(_HS)>>
/*Changed her to Arabic, corrected tattoo syntax, added entertain skill -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Riya", _HS.birthName = "Riya", _HS.origin = "She grew up in a well-to-do family and discovered her fetish for servitude in college, and she decided to become the world's best slave and slave trainer in one.", _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 = 40, _HS.weight = -20, _HS.height = 155, _HS.race = "indo-aryan", _HS.eyeColor = "grey", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a barcode of her identifying information tattooed on her left shoulder.", _HS.career = "a slaver">>
+<<set _HS.slaveName = "Riya", _HS.birthName = "Riya", _HS.origin = "She grew up in a well-to-do family and discovered her fetish for servitude in college, and she decided to become the world's best slave and slave trainer in one.", _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 = 40, _HS.weight = -20, _HS.height = 155, _HS.race = "indo-aryan", _HS.eyeColor = "grey", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a barcode of her identifying information tattooed on her left shoulder.", _HS.career = "a slaver">>
<<set $heroSlaves.push(_HS)>>
/*Changed eyes to grey, reduced height and weight, added origin, smart piercing, entertain and whore skill (representing theoretical knowledge from being a trainer), added ear piercings -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Alice", _HS.birthName = "Alice", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 60, _HS.height = 155, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 300, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a scar on her abdomen from kidney surgery in her youth.", _HS.sexualFlaw = "crude">>
+<<set _HS.slaveName = "Alice", _HS.birthName = "Alice", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 60, _HS.height = 155, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 300, _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.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a scar on her abdomen from kidney surgery in her youth.", _HS.sexualFlaw = "crude">>
<<set $heroSlaves.push(_HS)>>
/*sexual one-upper*/
/*Changed eyes, added scar -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Raven", _HS.birthName = "Raven", _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 = 20, _HS.weight = -20, _HS.race = "white", _HS.eyeColor = "green", _HS.override_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "black with blue highlights", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.nails = 2, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Raven", _HS.birthName = "Raven", _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 = 20, _HS.weight = -20, _HS.race = "white", _HS.eyeColor = "green", _HS.override_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "black with blue highlights", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.nails = 2, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*likes toys*/
/*Reduced weight, changed eyes, added nail polish -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kino", _HS.birthName = "Kino", _HS.origin = "She was formerly owned by someone who fancied themselves a geneticist, where she acquired permanently discolored hair and odd fetishes.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = -75, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue-green", _HS.override_H_Color = 1, _HS.hColor = "blue", _HS.pubicHColor = "blue", _HS.skin = "tanned", _HS.hLength = 30, _HS.hStyle = "short, spiky, with a long shoulder-length lock leading from her temples down, one on each side", _HS.boobs = 650, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.combatSkill = 1, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a vertical scar through her right eye, is a dabbling artist, and is an oviposition fetishist.">>
+<<set _HS.slaveName = "Kino", _HS.birthName = "Kino", _HS.origin = "She was formerly owned by someone who fancied themselves a geneticist, where she acquired permanently discolored hair and odd fetishes.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = -75, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue-green", _HS.override_H_Color = 1, _HS.hColor = "blue", _HS.pubicHColor = "blue", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 30, _HS.hStyle = "short, spiky, with a long shoulder-length lock leading from her temples down, one on each side", _HS.boobs = 650, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a vertical scar through her right eye, is a dabbling artist, and is an oviposition fetishist.">>
<<set $heroSlaves.push(_HS)>>
/*Added combat skill, increased health, added origin -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Vivienne", _HS.birthName = "Vivienne", _HS.origin = "She is a former soldier who was sold into slavery after losing her leg to an IED.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 39, _HS.physicalAge = 39, _HS.visualAge = 39, _HS.ovaryAge = 39, _HS.health = 20, _HS.devotion = 90, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.combatSkill = 1, _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXY = 1, _HS.fetishKnown = 1, _HS.customTat = "She has a military tattoo on her back.", _HS.customDesc = "Her left leg is artificial, and she has a number of scars on her thigh and shoulder and a burn near her temple.">>
+<<set _HS.slaveName = "Vivienne", _HS.birthName = "Vivienne", _HS.origin = "She is a former soldier who was sold into slavery after losing her leg to an IED.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 39, _HS.physicalAge = 39, _HS.visualAge = 39, _HS.ovaryAge = 39, _HS.health = 20, _HS.devotion = 90, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.combat = 1, _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXY = 1, _HS.fetishKnown = 1, _HS.customTat = "She has a military tattoo on her back.", _HS.customDesc = "Her left leg is artificial, and she has a number of scars on her thigh and shoulder and a burn near her temple.">>
<<set $heroSlaves.push(_HS)>>
/*missing left leg, burn scar, low sex drive, fighter*/
/*Added customdesc, fixed tattoo syntax, added combat skill, eye color and origin -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Lexi", _HS.birthName = "Lexi", _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 = 25, _HS.weight = -20, _HS.height = 157, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "bleached blonde", _HS.pubicHColor = "bleached blonde", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.oralSkill = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Lexi", _HS.birthName = "Lexi", _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 = 25, _HS.weight = -20, _HS.height = 157, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "bleached blonde", _HS.pubicHColor = "bleached blonde", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Changed eyes to blue -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Blue", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, _HS.health = 60, _HS.devotion = 35, _HS.height = 165, _HS.muscles = 20, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "white", _HS.hStyle = "short", _HS.pubicHStyle = "bushy", _HS.boobs = 400, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 50, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.backTat = "She has angel wings across her back.", _HS.underArmHStyle = "bushy", _HS.clothes = "a comfortable bodysuit", _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug">>
+<<set _HS.slaveName = "Blue", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, _HS.health = 60, _HS.devotion = 35, _HS.height = 165, _HS.muscles = 20, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "white", _HS.hStyle = "short", _HS.pubicHStyle = "bushy", _HS.boobs = 400, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 50, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.backTat = "She has angel wings across her back.", _HS.underArmHStyle = "bushy", _HS.clothes = "a comfortable bodysuit", _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug">>
<<set $heroSlaves.push(_HS)>>
/*Fixed tattoo syntax -BoneyM "She has hairy, unshaven armpits, bush and asscrack."*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Maya", _HS.birthName = "Maya", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 40, _HS.devotion = 100, _HS.height = 190, _HS.markings = "freckled", _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "light", _HS.hLength = 10, _HS.boobs = 800, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.legsTat = "Her right thigh reads 'Fuck Me' in flowery script.", _HS.stampTat = "She has a fairly generic tramp stamp.">>
+<<set _HS.slaveName = "Maya", _HS.birthName = "Maya", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 40, _HS.devotion = 100, _HS.height = 190, _HS.markings = "freckled", _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "light", _HS.hLength = 10, _HS.boobs = 800, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.legsTat = "Her right thigh reads 'Fuck Me' in flowery script.", _HS.stampTat = "She has a fairly generic tramp stamp.">>
<<set $heroSlaves.push(_HS)>>
/*Corrected tattoo syntax, changed skin to freckled, eyes to green, increased height -BoneyM*/
/% Corrected skin to light?, and changed markings to freckled Bane70 %/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Alexis", _HS.birthName = "Alexis", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 20, _HS.devotion = 60, _HS.muscles = 20, _HS.height = 150, _HS.race = "mixed race", _HS.eyeColor = "hazel", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "ebony", _HS.hStyle = "long", _HS.boobs = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clit = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -20, _HS.energy = 100, _HS.attrXY = 75, _HS.attrXX = 75, _HS.fetishKnown = 1, _HS.customDesc = "She has a feminine personality despite her high testosterone.", _HS.areolae = 2, _HS.nipples = "huge", _HS.voice = 1, _HS.navelPiercing = 1, _HS.tonguePiercing = 1>>
+<<set _HS.slaveName = "Alexis", _HS.birthName = "Alexis", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 20, _HS.devotion = 60, _HS.muscles = 20, _HS.height = 150, _HS.race = "mixed race", _HS.eyeColor = "hazel", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "ebony", _HS.hStyle = "long", _HS.boobs = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clit = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.intelligence = -20, _HS.energy = 100, _HS.attrXY = 75, _HS.attrXX = 75, _HS.fetishKnown = 1, _HS.customDesc = "She has a feminine personality despite her high testosterone.", _HS.areolae = 2, _HS.nipples = "huge", _HS.voice = 1, _HS.navelPiercing = 1, _HS.tonguePiercing = 1>>
<<set $heroSlaves.push(_HS)>>
/*big clit*/
/*Changed eyes to hazel, increased clit, added a lot of piercings, changed fetish to nympho, fixed customdesc syntax -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Anneliese", _HS.birthName = "Anneliese", _HS.origin = "She is a former Head Girl that fetishizes her own degradation.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, _HS.health = 20, _HS.devotion = 100, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "golden", _HS.pubicHColor = "golden", _HS.skin = "pale", _HS.hStyle = "long", _HS.boobs = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.anus = 2, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.clothes = "slutty jewelry", _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.customDesc = "She has the air of a princess.">>
+<<set _HS.slaveName = "Anneliese", _HS.birthName = "Anneliese", _HS.origin = "She is a former Head Girl that fetishizes her own degradation.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, _HS.health = 20, _HS.devotion = 100, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "golden", _HS.pubicHColor = "golden", _HS.skin = "pale", _HS.hStyle = "long", _HS.boobs = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.anus = 2, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.clothes = "slutty jewelry", _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.customDesc = "She has the air of a princess.">>
<<set $heroSlaves.push(_HS)>>
/*Changed eyes to blue, added origin, pierced ears, fixed customdesc syntax -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Riley", _HS.birthName = "Riley", _HS.origin = "She sold herself into slavery in an attempt to sate her incredible sex drive.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 75, _HS.weight = -20, _HS.height = 180, _HS.hColor = "black", _HS.pubicHStyle = "black", _HS.skin = "pale", _HS.hLength = 10, _HS.pubicHStyle = "bald", _HS.underArmHStyle = "bald", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lipsPiercing = 2, _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clitPiercing = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 100, _HS.fetishKnown = 1, _HS.customDesc = "She has a scar on the back of her head, concealed by her hair.">>
+<<set _HS.slaveName = "Riley", _HS.birthName = "Riley", _HS.origin = "She sold herself into slavery in an attempt to sate her incredible sex drive.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 75, _HS.weight = -20, _HS.height = 180, _HS.hColor = "black", _HS.pubicHStyle = "black", _HS.skin = "pale", _HS.hLength = 10, _HS.pubicHStyle = "bald", _HS.underArmHStyle = "bald", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lipsPiercing = 2, _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clitPiercing = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 100, _HS.fetishKnown = 1, _HS.customDesc = "She has a scar on the back of her head, concealed by her hair.">>
<<set $heroSlaves.push(_HS)>>
/*compulsive masturbation*/
/*Moved customdesc to origin, added scar to customdesc, reduced weight, added nympho, added nipple and clit piercings -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Victoria", _HS.birthName = "Victoria", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = -7, _HS.devotion = 25, _HS.race = "white", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 650, _HS.boobsTat = "degradation", _HS.buttTat = "degradation", _HS.lipsTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaTat = "degradation", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "degradation", _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.addict = 999, _HS.intelligence = -90, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She is a permanent, irrecoverable aphrodisiac addict.">>
+<<set _HS.slaveName = "Victoria", _HS.birthName = "Victoria", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = -7, _HS.devotion = 25, _HS.race = "white", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 650, _HS.boobsTat = "degradation", _HS.buttTat = "degradation", _HS.lipsTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaTat = "degradation", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "degradation", _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.addict = 999, _HS.intelligence = -90, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She is a permanent, irrecoverable aphrodisiac addict.">>
<<set $heroSlaves.push(_HS)>>
/*Corrected customdesc syntax -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Aveline", _HS.birthName = "Aveline", _HS.origin = "She was sold into slavery from a remote, primitive village.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 20, _HS.devotion = -75, _HS.skin = "tanned", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 400, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.stampTat = "She has a barcode tattooed above her butt.">>
+<<set _HS.slaveName = "Aveline", _HS.birthName = "Aveline", _HS.origin = "She was sold into slavery from a remote, primitive village.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 20, _HS.devotion = -75, _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 400, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.stampTat = "She has a barcode tattooed above her butt.">>
<<set $heroSlaves.push(_HS)>>
/*Added barcode tattoo and origin -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Emm", _HS.birthName = "Emm", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 40, _HS.weight = 20, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "strawberry blonde", _HS.pubicHColor = "strawberry blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 650, _HS.butt = 5, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.customDesc = "She is friendly, clever, and quick.">>
+<<set _HS.slaveName = "Emm", _HS.birthName = "Emm", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 40, _HS.weight = 20, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "strawberry blonde", _HS.pubicHColor = "strawberry blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 650, _HS.butt = 5, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.customDesc = "She is friendly, clever, and quick.">>
<<set $heroSlaves.push(_HS)>>
/*fluctuating weight*/
/*Increased weight, added entertain and whore skill, added ear piercing, changed eyes -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Twenty", _HS.birthName = "Twenty", _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 = 40, _HS.weight = 20, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "light", _HS.hStyle = "long", _HS.boobs = 800, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = -50, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a paw print tattoo on her left buttock.", _HS.customDesc = "She constantly uses 'pussy' and 'kitty' puns when permitted.", _HS.clothes = "kitty lingerie">>
+<<set _HS.slaveName = "Twenty", _HS.birthName = "Twenty", _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 = 40, _HS.weight = 20, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "light", _HS.hStyle = "long", _HS.boobs = 800, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.intelligence = -50, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a paw print tattoo on her left buttock.", _HS.customDesc = "She constantly uses 'pussy' and 'kitty' puns when permitted.", _HS.clothes = "kitty lingerie">>
<<set $heroSlaves.push(_HS)>>
/*Fixed tattoo and customdesc syntax -BoneyM*/
@@ -278,18 +278,18 @@
/*Increased health, added origin, fixed customdesc syntax -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kinsey", _HS.birthName = "Kinsey", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 20, _HS.devotion = 10, _HS.height = 145, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.hLength = 15, _HS.hStyle = "short, with the left side shaved", _HS.boobs = 500, _HS.butt = 4, _HS.buttImplant = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 2, _HS.nosePiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 100, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Kinsey", _HS.birthName = "Kinsey", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 20, _HS.devotion = 10, _HS.height = 145, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.hLength = 15, _HS.hStyle = "short, with the left side shaved", _HS.boobs = 500, _HS.butt = 4, _HS.buttImplant = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 2, _HS.nosePiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 100, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Added nose piercing, reduced height, changed fetish to bisexual -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sammy", _HS.birthName = "Sammy", _HS.origin = "She chose to be a slave because the romanticized view of it she had turns her on.", _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 = 25, _HS.weight = 20, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 80, _HS.hStyle = "ass-length", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 100, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "She has fetishes for wedgies, spanking and herms.">>
+<<set _HS.slaveName = "Sammy", _HS.birthName = "Sammy", _HS.origin = "She chose to be a slave because the romanticized view of it she had turns her on.", _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 = 25, _HS.weight = 20, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 80, _HS.hStyle = "ass-length", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "She has fetishes for wedgies, spanking and herms.">>
<<set $heroSlaves.push(_HS)>>
/*laid back*/
/*Added origin, increased weight, pierced ears, added customdesc -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Klara", _HS.birthName = "Klara", _HS.origin = "She was forced into slavery and rather brutally broken in.", _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 = -75, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long and braided", _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "'Cum slut' is branded on her right ass cheek, and 'bitch whore' is tattooed on her inner left thigh.">>
+<<set _HS.slaveName = "Klara", _HS.birthName = "Klara", _HS.origin = "She was forced into slavery and rather brutally broken in.", _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 = -75, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long and braided", _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 35, _HS.skill.entertainment = 35, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "'Cum slut' is branded on her right ass cheek, and 'bitch whore' is tattooed on her inner left thigh.">>
<<set $heroSlaves.push(_HS)>>
/*Fixed typo in customdesc, increased whore and entertainskill, changed eye color -BoneyM*/
@@ -300,66 +300,66 @@
/*Added odd, changed eye color -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Mandy", _HS.birthName = "Mandy", _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 = 60, _HS.hStyle = "long", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.clothes = "attractive lingerie", _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Mandy", _HS.birthName = "Mandy", _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 = 60, _HS.hStyle = "long", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.clothes = "attractive lingerie", _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Couldn't find this slave in the thread or the submission page on the blog -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Dharma", _HS.birthName = "Dharma", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 20, _HS.devotion = -100, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "dark brown", _HS.pubicHColor = "dark brown", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.analArea = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a henna tattoo on her left forearm, and a butterfly tattoo on her right calf.", _HS.customDesc = "She has high cheekbones on a heart shaped face.", _HS.faceShape = "cute", _HS.sexualQuirk = "size queen">>
+<<set _HS.slaveName = "Dharma", _HS.birthName = "Dharma", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 20, _HS.devotion = -100, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "dark brown", _HS.pubicHColor = "dark brown", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.analArea = 1, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a henna tattoo on her left forearm, and a butterfly tattoo on her right calf.", _HS.customDesc = "She has high cheekbones on a heart shaped face.", _HS.faceShape = "cute", _HS.sexualQuirk = "size queen">>
<<set $heroSlaves.push(_HS)>>
/*Fetish was set to 'arrogant' instead of quirk, corrected tattoo syntax -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Aya", _HS.birthName = "Aya", _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 = -25, _HS.race = "white", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "red", _HS.hColor = "bright red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.analSkill = 15, _HS.clothes = "attractive lingerie", _HS.intelligence = random(96,99), _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.customDesc = "She has piercings along her collarbones and corset piercings with red ribbons down her lower back and thighs.", _HS.height = 168>>
+<<set _HS.slaveName = "Aya", _HS.birthName = "Aya", _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 = -25, _HS.race = "white", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "red", _HS.hColor = "bright red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.clothes = "attractive lingerie", _HS.intelligence = random(96,99), _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.customDesc = "She has piercings along her collarbones and corset piercings with red ribbons down her lower back and thighs.", _HS.height = 168>>
<<set $heroSlaves.push(_HS)>>
/*masochist*/
/*Added piercings, corrected customdesc syntax, added bitchy to fit with her smart-ass masochist personality. -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Mikayla", _HS.birthName = "Mikayla", _HS.origin = "She was previously owned by a creative sadist, who has left a variety of mental scars on her.", _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 = -25, _HS.weight = 20, _HS.height = 157, _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -35, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customDesc = "She is extremely claustrophobic.">>
+<<set _HS.slaveName = "Mikayla", _HS.birthName = "Mikayla", _HS.origin = "She was previously owned by a creative sadist, who has left a variety of mental scars on her.", _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 = -25, _HS.weight = 20, _HS.height = 157, _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.intelligence = -35, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customDesc = "She is extremely claustrophobic.">>
<<set $heroSlaves.push(_HS)>>
/*claustrophobia, pride*/
/*Fixed customdesc syntax, added pierced ears, corrected hair color, added origin and arrogant -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Xendra", _HS.birthName = "Xendra", _HS.origin = "She was a hermit until she became a slave, and went along with it out of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 75, _HS.height = 175, _HS.race = "black", _HS.origEye = "brown", _HS.override_Eye_Color = 1, _HS.override_H_Color = 1, _HS.eyeColor = "purple", _HS.hColor = "white", _HS.skin = "dark", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.combatSkill = 1, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.customTat = "She has a pair of full sleeve tattoos.", _HS.customDesc = "She has many scars, and is skilled with plants.">>
+<<set _HS.slaveName = "Xendra", _HS.birthName = "Xendra", _HS.origin = "She was a hermit until she became a slave, and went along with it out of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 75, _HS.height = 175, _HS.race = "black", _HS.origEye = "brown", _HS.override_Eye_Color = 1, _HS.override_H_Color = 1, _HS.eyeColor = "purple", _HS.hColor = "white", _HS.skin = "dark", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.combat = 1, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.customTat = "She has a pair of full sleeve tattoos.", _HS.customDesc = "She has many scars, and is skilled with plants.">>
<<set $heroSlaves.push(_HS)>>
/*toned, snuff, fighter*/
/*Increased health, added combatskill, bitchy and pierced ears, fixed tattoo and customdesc syntax, corrected skin color from 'white' to 'dark' -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Gwen", _HS.birthName = "Gwen", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 1, _HS.devotion = 60, _HS.race = "asian", _HS.hColor = "dark", _HS.pubicHColor = "dark", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 1, _HS.face = 60, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "off", _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 35, _HS.chastityVagina = 1, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "She has 'Use Backdoor' tattooed above her vagina and, in tribal tattoos, 'Anal Slut' on her back.", _HS.customDesc = "She wears a dog collar with lights that indicate her arousal and was bought wearing a vaginal chastity belt.", _HS.height = 183>>
+<<set _HS.slaveName = "Gwen", _HS.birthName = "Gwen", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 1, _HS.devotion = 60, _HS.race = "asian", _HS.hColor = "dark", _HS.pubicHColor = "dark", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 1, _HS.face = 60, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "off", _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.chastityVagina = 1, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "She has 'Use Backdoor' tattooed above her vagina and, in tribal tattoos, 'Anal Slut' on her back.", _HS.customDesc = "She wears a dog collar with lights that indicate her arousal and was bought wearing a vaginal chastity belt.", _HS.height = 183>>
<<set $heroSlaves.push(_HS)>>
/* set nipples to pierced, changed fetish from bisexual to submissive, increased anal skill, dunno how to handle all the techno-implants her 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, _HS.health = 20, _HS.devotion = 60, _HS.weight = -20, _HS.nationality = "Russian", _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has many girly tattoos.", _HS.customDesc = "She 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, _HS.health = 20, _HS.devotion = 60, _HS.weight = -20, _HS.nationality = "Russian", _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.customTat = "She has many girly tattoos.", _HS.customDesc = "She loves hair play.", _HS.navelPiercing = 1>>
<<set $heroSlaves.push(_HS)>>
/*Reduced weight, increased face and faceimplant, added piercings, corrected tattoo and customdesc syntax -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Emily", _HS.birthName = "Emily", _HS.origin = "Before she was made a slave, she was a wealthy, popular honor student.", _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 = -25, _HS.height = 155, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hLength = 10, _HS.boobs = 400, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = random(96,100), _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customDesc = "She has a short nose and is very intelligent.">>
+<<set _HS.slaveName = "Emily", _HS.birthName = "Emily", _HS.origin = "Before she was made a slave, she was a wealthy, popular honor student.", _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 = -25, _HS.height = 155, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hLength = 10, _HS.boobs = 400, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.intelligence = random(96,100), _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customDesc = "She has a short nose and is very intelligent.">>
<<set $heroSlaves.push(_HS)>>
/*Added origin, reduced age, fetish was 'arrogant', changed it to quirk, fixed customdesc syntax. -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Bitch", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = -75, _HS.height = 155, _HS.eyeColor = "dark", _HS.pupil = "almond-shaped", _HS.hColor = "dark", _HS.skin = "pale", _HS.waist = -55, _HS.boobs = 300, _HS.butt = 5, _HS.lips = 35, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.eyebrowPiercing = 1, _HS.oralSkill = 35, _HS.intelligence = -60, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a heart shaped face and many scars.", _HS.faceShape = "cute", _HS.hips = 3, _HS.markings = "beauty">>
+<<set _HS.slaveName = "Bitch", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = -75, _HS.height = 155, _HS.eyeColor = "dark", _HS.pupil = "almond-shaped", _HS.hColor = "dark", _HS.skin = "pale", _HS.waist = -55, _HS.boobs = 300, _HS.butt = 5, _HS.lips = 35, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.oral = 35, _HS.intelligence = -60, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a heart shaped face and many scars.", _HS.faceShape = "cute", _HS.hips = 3, _HS.markings = "beauty">>
<<set $heroSlaves.push(_HS)>>
/*Fixed customdesc syntax, changed eye color, added piercings, increased waist -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Nala", _HS.birthName = "Nala", _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 = 10, _HS.muscles = 20, _HS.height = 180, _HS.hColor = "black", _HS.hStyle = "long and in a ponytail", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Nala", _HS.birthName = "Nala", _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 = 10, _HS.muscles = 20, _HS.height = 180, _HS.hColor = "black", _HS.hStyle = "long and in a ponytail", _HS.boobs = 500, _HS.butt = 3, _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.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*First slave that didn't need fixing -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Ervona", _HS.birthName = "Ervona", _HS.origin = "She was groomed just for you and believes herself to be madly in love with you.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 100, _HS.height = 178, _HS.override_H_Color = 1, _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "bronzed", _HS.hLength = 25, _HS.hStyle = "chin length", _HS.boobs = 500, _HS.nipples = "inverted", _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.clitPiercing = 1, _HS.ovaries = 1, _HS.clothes = "attractive lingerie", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40>>
+<<set _HS.slaveName = "Ervona", _HS.birthName = "Ervona", _HS.origin = "She was groomed just for you and believes herself to be madly in love with you.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 100, _HS.height = 178, _HS.override_H_Color = 1, _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "bronze", _HS.hLength = 25, _HS.hStyle = "chin length", _HS.boobs = 500, _HS.nipples = "inverted", _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.clitPiercing = 1, _HS.ovaries = 1, _HS.clothes = "attractive lingerie", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40>>
<<set $heroSlaves.push(_HS)>>
/*love*/
/*Added origin, removed it from customdesc. Increased health.*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Koko", _HS.birthName = "Koko", _HS.origin = "She may originally be from an island nation.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 60, _HS.devotion = -25, _HS.height = 175, _HS.override_H_Color = 1, _HS.race = "asian", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "brown", _HS.hLength = 10, _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 15, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She is trim and fit.">>
+<<set _HS.slaveName = "Koko", _HS.birthName = "Koko", _HS.origin = "She may originally be from an island nation.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 60, _HS.devotion = -25, _HS.height = 175, _HS.override_H_Color = 1, _HS.race = "asian", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "brown", _HS.hLength = 10, _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She is trim and fit.">>
<<set $heroSlaves.push(_HS)>>
/*genki*/
/*Pierced ears, added origin, corrected customdesc syntax. -BoneyM*/
@@ -381,131 +381,131 @@
/*Increased height, reduced weight, reduced butt, fixed customdesc syntax -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "No Name", _HS.birthName = "No Name", _HS.origin = "A previous owner cultivated her desire to escape slavery for his own amusement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 50, _HS.devotion = -100, _HS.height = 165, _HS.weight = -20, _HS.muscles = 20, _HS.race = "mixed race", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.pubicHStyle = "neat", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.anus = 2, _HS.ovaries = 1, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.customDesc = "She is fit and athletic.", _HS.behavioralFlaw = "arrogant", _HS.hips = 1>>
+<<set _HS.slaveName = "No Name", _HS.birthName = "No Name", _HS.origin = "A previous owner cultivated her desire to escape slavery for his own amusement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 50, _HS.devotion = -100, _HS.height = 165, _HS.weight = -20, _HS.muscles = 20, _HS.race = "mixed race", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.pubicHStyle = "neat", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.anus = 2, _HS.ovaries = 1, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.customDesc = "She is fit and athletic.", _HS.behavioralFlaw = "arrogant", _HS.hips = 1>>
<<set $heroSlaves.push(_HS)>>
*//*hypno-anal/cum*/
/*Reduced weight, changed eyes, corrected customdesc syntax, added origin, increased rebelliousness, changed clitsetting to oral. -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sara", _HS.birthName = "Sara", _HS.origin = "She sold herself into slavery after a pregnancy scare, desiring to give up control of her life to someone better suited to running it.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 60, _HS.height = 155, _HS.nationality = "Mexican", _HS.race = "latina", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "dark red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "masochist", _HS.fetishKnown = 1, _HS.customTat = "She has her medical allergies tattooed around her wrist.", _HS.customDesc = "She has either or both of a masochistic streak or a self-harm habit.">>
+<<set _HS.slaveName = "Sara", _HS.birthName = "Sara", _HS.origin = "She sold herself into slavery after a pregnancy scare, desiring to give up control of her life to someone better suited to running it.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 60, _HS.height = 155, _HS.nationality = "Mexican", _HS.race = "latina", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "dark red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "white", _HS.hStyle = "long", _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 = -40, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "masochist", _HS.fetishKnown = 1, _HS.customTat = "She has her medical allergies tattooed around her wrist.", _HS.customDesc = "She has either or both of a masochistic streak or a self-harm habit.">>
<<set $heroSlaves.push(_HS)>>
/*likes pain*/
/*Corrected tattoo syntax, added origin and customdesc, increased health -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Falcon", _HS.birthName = "Jamie", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 25, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.clothes = "a slave gown", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has an implanted GPS tracker to find her in case her habit of stalking pretty girls gets the better of her.">>
+<<set _HS.slaveName = "Falcon", _HS.birthName = "Jamie", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 25, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.clothes = "a slave gown", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has an implanted GPS tracker to find her in case her habit of stalking pretty girls gets the better of her.">>
<<set $heroSlaves.push(_HS)>>
/*proactive stalker hypnosis masseuse*/
/*Corrected birthname (was 'Jasmine'), changed eye color, added customdesc -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Beatrice (No. 525)", _HS.birthName = "Beatrice", _HS.origin = "She comes from old money and sold herself into slavery to satisfy her obsession with the practice, believing her family would buy her back out of slavery later.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 30, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue-green", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "red", _HS.hColor = "bright red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pure white", _HS.hLength = 80, _HS.hStyle = "long and wavy, and down past her ass", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a slave gown", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a fine, intricate vine-like tattoo around her right ankle.">>
+<<set _HS.slaveName = "Beatrice (No. 525)", _HS.birthName = "Beatrice", _HS.origin = "She comes from old money and sold herself into slavery to satisfy her obsession with the practice, believing her family would buy her back out of slavery later.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 30, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue-green", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "red", _HS.hColor = "bright red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pure white", _HS.hLength = 80, _HS.hStyle = "long and wavy, and down past her ass", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.clothes = "a slave gown", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a fine, intricate vine-like tattoo around her right ankle.">>
<<set $heroSlaves.push(_HS)>>
/*contraception but breeder naturally, well trained*/
/*Fetish was 'arrogant', changed it to flaw. Added origin, whore and entertainskill. Changed eye color, corrected tattoo syntax, pierced ears, reduced weight -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Yuuki", _HS.birthName = "Yuuki", _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 = 45, _HS.height = 145, _HS.race = "asian", _HS.override_Eye_Color = 1, _HS.override_H_Color = 1, _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "fair", _HS.hStyle = "long and curly", _HS.waist = -55, _HS.boobs = 1000, _HS.butt = 5, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.oralSkill = 100, _HS.entertainSkill = 35, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.sexualFlaw = "crude ">>
+<<set _HS.slaveName = "Yuuki", _HS.birthName = "Yuuki", _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 = 45, _HS.height = 145, _HS.race = "asian", _HS.override_Eye_Color = 1, _HS.override_H_Color = 1, _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "fair", _HS.hStyle = "long and curly", _HS.waist = -55, _HS.boobs = 1000, _HS.butt = 5, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.oral = 100, _HS.skill.entertainment = 35, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.sexualFlaw = "crude ">>
<<set $heroSlaves.push(_HS)>>
/*mischievous tease*/
/*Reduced height, added entertainskill, added bitchy, changed eyes -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Elisa", _HS.birthName = "Elisa", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 145, _HS.race = "white", _HS.eyeColor = "bright blue", _HS.hColor = "white-blonde", _HS.pubicHColor = "white-blonde", _HS.skin = "extremely pale", _HS.hStyle = "in a long braid", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.face = 55, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates penetration", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, she still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly, and sweet in comparison to her natural brother, Martin, she has a lovely singing voice. She prays quite often, if allowed to.", _HS.mother = -9997, _HS.father = -9996>>
+<<set _HS.slaveName = "Elisa", _HS.birthName = "Elisa", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 145, _HS.race = "white", _HS.eyeColor = "bright blue", _HS.hColor = "white-blonde", _HS.pubicHColor = "white-blonde", _HS.skin = "extremely pale", _HS.hStyle = "in a long braid", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.face = 55, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.skill.combat = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates penetration", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, she still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly, and sweet in comparison to her natural brother, Martin, she has a lovely singing voice. She prays quite often, if allowed to.", _HS.mother = -9997, _HS.father = -9996>>
<<set $heroSlaves.push(_HS)>>
/*also hates pen*/
/*martin's sibling*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Yvonne", _HS.birthName = "Yvonne", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 100, _HS.height = 190, _HS.eyeColor = "hazel", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "lightened", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 700, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.face = 55, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.attrXY = 40, _HS.fetish = "pregnancy">>
+<<set _HS.slaveName = "Yvonne", _HS.birthName = "Yvonne", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 100, _HS.height = 190, _HS.eyeColor = "hazel", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "light", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 700, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.face = 55, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.attrXY = 40, _HS.fetish = "pregnancy">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Terminatrix' Heaven", _HS.birthName = "Gabrielle", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 80, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "brown", _HS.skin = "black", _HS.hLength = 5, _HS.hStyle = "very short and a poor emulation of a military cut", _HS.boobs = 250, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttTat = "tribal patterns", _HS.lipsPiercing = 1, _HS.lipsTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaTat = "tribal patterns", _HS.clit = 2, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.navelPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "tribal patterns", _HS.legsTat = "tribal patterns", _HS.stampTat = "tribal patterns", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 35, _HS.entertainSkill = 15, _HS.combatSkill = 1, _HS.clothes = "a comfortable bodysuit", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "Amongst the scars that decorate her body, one in the shape of a heart can be made out on the top of her right hand.">>
+<<set _HS.slaveName = "'Terminatrix' Heaven", _HS.birthName = "Gabrielle", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 80, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "brown", _HS.skin = "black", _HS.hLength = 5, _HS.hStyle = "very short and a poor emulation of a military cut", _HS.boobs = 250, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttTat = "tribal patterns", _HS.lipsPiercing = 1, _HS.lipsTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaTat = "tribal patterns", _HS.clit = 2, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.navelPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "tribal patterns", _HS.legsTat = "tribal patterns", _HS.stampTat = "tribal patterns", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 35, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a comfortable bodysuit", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "Amongst the scars that decorate her body, one in the shape of a heart can be made out on the top of her right hand.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Lilliana", _HS.birthName = "Zuzanna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 13, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 190, _HS.eyeColor = "white", _HS.eyes = -2, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "white with red stripes", _HS.eyebrowHColor = "white", _HS.pubicHColor = "white", _HS.underArmHColor = "white", _HS.skin = "tanned", _HS.hLength = 100, _HS.hStyle = "back in a large ass length braid", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.face = 15, _HS.faceImplant = 65, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.combatSkill = 1, _HS.clothes = "nice business attire", _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Lilliana", _HS.birthName = "Zuzanna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 13, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 190, _HS.eyeColor = "white", _HS.eyes = -2, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "white with red stripes", _HS.eyebrowHColor = "white", _HS.pubicHColor = "white", _HS.underArmHColor = "white", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 100, _HS.hStyle = "back in a large ass length braid", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.face = 15, _HS.faceImplant = 65, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "nice business attire", _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Blind*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Jenna", _HS.birthName = "Jenna", _HS.ID = _i++, _HS.assignment = "please you", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 30, _HS.devotion = 60, _HS.height = 145, _HS.skin = "pale", _HS.eyeColor = "violet", _HS.hColor = "red-blonde", _HS.pubicHColor = "red-blonde", _HS.hStyle = "waist-length", _HS.waist = -55, _HS.boobs = 650, _HS.butt = 6, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.oralSkill = 100, _HS.clothes = "a string bikini", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Her name is tattooed in flowing cursive script across her upper back. ">>
+<<set _HS.slaveName = "Jenna", _HS.birthName = "Jenna", _HS.ID = _i++, _HS.assignment = "please you", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 30, _HS.devotion = 60, _HS.height = 145, _HS.skin = "pale", _HS.eyeColor = "violet", _HS.hColor = "red-blonde", _HS.pubicHColor = "red-blonde", _HS.hStyle = "waist-length", _HS.waist = -55, _HS.boobs = 650, _HS.butt = 6, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.skill.oral = 100, _HS.clothes = "a string bikini", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Her name is tattooed in flowing cursive script across her upper back. ">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Asspussy' Miss Julie O", _HS.birthName = "Leah", _HS.origin = "She 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, _HS.health = 70, _HS.devotion = 100, _HS.height = 155, _HS.markings = "none", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.vaginalSkill = 15, _HS.oralSkill = 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.customDesc = "Her pale skin is lightly freckled, and her nipples are dark tan. She used to be sexually repressed, and used to hate anal sex.">>
+<<set _HS.slaveName = "'Asspussy' Miss Julie O", _HS.birthName = "Leah", _HS.origin = "She 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, _HS.health = 70, _HS.devotion = 100, _HS.height = 155, _HS.markings = "none", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.customDesc = "Her pale skin is lightly freckled, and her nipples are dark tan. She used to be sexually repressed, and used to hate anal sex.">>
<<set $heroSlaves.push(_HS)>>
/*huge nips*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Golden Cobra", _HS.birthName = "Auyala", _HS.origin = "She was captured from West Central Africa.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 30, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Central African", _HS.race = "black", _HS.eyes = 1, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.eyeColor = "green", _HS.hColor = "golden blonde with copper streaks", _HS.eyebrowHColor = "blonde", _HS.pubicHColor = "blonde", _HS.underArmHColor = "blonde", _HS.skin = "brown", _HS.hLength = 35, _HS.hStyle = "shoulder-length, plaited in cornrow braids; a single thin braid adorned with several colorful feathers and fearsome fang of unknown origin is hanging aside her left eye", _HS.pubicHStyle = "in a strip", _HS.waist = -55, _HS.boobs = 1450, _HS.nipplesPiercing = 2, _HS.butt = 5, _HS.lips = 55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 2, _HS.clitPiercing = 2, _HS.clitSetting = "lesbian", _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.clothes = "slutty jewelry", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has tattoo of cobra wrapping around her neck, which head with wide open maw and inflated hood tattooed right at her throat.", _HS.customDesc = "She has a streak of ritual scars resembling some very complex snake skin pattern running down her spine from nape to tail-bone.">>
+<<set _HS.slaveName = "Golden Cobra", _HS.birthName = "Auyala", _HS.origin = "She was captured from West Central Africa.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 30, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Central African", _HS.race = "black", _HS.eyes = 1, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.eyeColor = "green", _HS.hColor = "golden blonde with copper streaks", _HS.eyebrowHColor = "blonde", _HS.pubicHColor = "blonde", _HS.underArmHColor = "blonde", _HS.skin = "brown", _HS.hLength = 35, _HS.hStyle = "shoulder-length, plaited in cornrow braids; a single thin braid adorned with several colorful feathers and fearsome fang of unknown origin is hanging aside her left eye", _HS.pubicHStyle = "in a strip", _HS.waist = -55, _HS.boobs = 1450, _HS.nipplesPiercing = 2, _HS.butt = 5, _HS.lips = 55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 2, _HS.clitPiercing = 2, _HS.clitSetting = "lesbian", _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.combat = 1, _HS.clothes = "slutty jewelry", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has tattoo of cobra wrapping around her neck, which head with wide open maw and inflated hood tattooed right at her throat.", _HS.customDesc = "She has a streak of ritual scars resembling some very complex snake skin pattern running down her spine from nape to tail-bone.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Top' Lillium", _HS.birthName = "Sarah", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 90, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "green", _HS.origHColor = "red", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "deep red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "fair", _HS.hLength = 20, _HS.hStyle = "short and pleasantly frames her face", _HS.waist = -55, _HS.boobs = 900, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 1, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a small, grinning harlequin tattoo on her inner thigh.", _HS.customDesc = "In place of her left hand's pinkie finger is a large pink scar that crosses the entire back of her hand.">>
+<<set _HS.slaveName = "'Top' Lillium", _HS.birthName = "Sarah", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 90, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "green", _HS.origHColor = "red", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "deep red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "fair", _HS.hLength = 20, _HS.hStyle = "short and pleasantly frames her face", _HS.waist = -55, _HS.boobs = 900, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a small, grinning harlequin tattoo on her inner thigh.", _HS.customDesc = "In place of her left hand's pinkie finger is a large pink scar that crosses the entire back of her hand.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Cammy", _HS.birthName = "Viktoriya", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 80, _HS.devotion = 70, _HS.muscles = 75, _HS.height = 145, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hStyle = "tied back into two long braids", _HS.boobs = 800, _HS.butt = 2.5, _HS.face = 15, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.customDesc = "She has a long horizontal scar on her left cheek.">>
+<<set _HS.slaveName = "Cammy", _HS.birthName = "Viktoriya", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 80, _HS.devotion = 70, _HS.muscles = 75, _HS.height = 145, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hStyle = "tied back into two long braids", _HS.boobs = 800, _HS.butt = 2.5, _HS.face = 15, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.customDesc = "She has a long horizontal scar on her left cheek.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sheena", _HS.birthName = "Penelope", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 80, _HS.devotion = 90, _HS.height = 155, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "black with deep red highlights", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pale", _HS.hStyle = "long and disheveled", _HS.waist = -55, _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.clitSetting = "anal", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 35, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a slutty outfit", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has been heavily tattooed, with her chest, thighs and both arms covered in various punk-style pieces. The biggest and most impressive piece is the large logo of a legendary late 20th century punk band.">>
+<<set _HS.slaveName = "Sheena", _HS.birthName = "Penelope", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 80, _HS.devotion = 90, _HS.height = 155, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "black with deep red highlights", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pale", _HS.hStyle = "long and disheveled", _HS.waist = -55, _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.clitSetting = "anal", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 35, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.clothes = "a slutty outfit", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has been heavily tattooed, with her chest, thighs and both arms covered in various punk-style pieces. The biggest and most impressive piece is the large logo of a legendary late 20th century punk band.">>
<<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, _HS.health = -10, _HS.devotion = 90, _HS.height = 175, _HS.nationality = "Korean", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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 = "SLUT ", _HS.brandLocation = "breasts", _HS.oralSkill = 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, _HS.health = -10, _HS.devotion = 90, _HS.height = 175, _HS.nationality = "Korean", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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 = "SLUT ", _HS.brandLocation = "breasts", _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()>>
-<<set _HS.slaveName = "Sakura", _HS.birthName = "Sakura", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.race = "asian", _HS.skin = "dark", _HS.hLength = 25, _HS.hStyle = "short and held back by a white bandana", _HS.boobs = 600, _HS.butt = 4, _HS.faceImplant = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 1, _HS.clothes = "a slutty outfit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.customDesc = "She is an enthusiastic high school graduate, eager to make her teacher proud by becoming the greatest slave known to any owner.", _HS.career = "a student">>
+<<set _HS.slaveName = "Sakura", _HS.birthName = "Sakura", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.race = "asian", _HS.skin = "dark", _HS.hLength = 25, _HS.hStyle = "short and held back by a white bandana", _HS.boobs = 600, _HS.butt = 4, _HS.faceImplant = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.clothes = "a slutty outfit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.customDesc = "She is an enthusiastic high school graduate, eager to make her teacher proud by becoming the greatest slave known to any owner.", _HS.career = "a student">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Miss Maree", _HS.birthName = "Tina", _HS.origin = "A former headmistress, she was sentenced to slavery after she was caught training her 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, _HS.health = 100, _HS.devotion = -50, _HS.weight = 20, _HS.height = 155, _HS.nationality = "American", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "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.vaginalSkill = 15, _HS.oralSkill = 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.customDesc = "She absolutely detests men.", _HS.career = "a principal">>
+<<set _HS.slaveName = "Miss Maree", _HS.birthName = "Tina", _HS.origin = "A former headmistress, she was sentenced to slavery after she was caught training her 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, _HS.health = 100, _HS.devotion = -50, _HS.weight = 20, _HS.height = 155, _HS.nationality = "American", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "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.customDesc = "She 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 = "She was once a rising free cities politician who argued for compulsory female enslavement, but she 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, _HS.health = 60, _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.entertainSkill = 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.customTat = "She has a tattoo down her left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.customDesc = "Since becoming a slave she has been turned into a little bimbo.">>
+<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She was once a rising free cities politician who argued for compulsory female enslavement, but she 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, _HS.health = 60, _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "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.whore = 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.customTat = "She has a tattoo down her left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.customDesc = "Since becoming a slave she 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 = "She 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, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "lightened", _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.births = 1, _HS.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 35, _HS.combatSkill = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.face = 0, _HS.intelligence = 0>>
+<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "She 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, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "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.births = 1, _HS.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 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>>
<<set $heroSlaves.push(_HS)>>
<</if>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Horsepussy", _HS.birthName = "Amber", _HS.origin = "She 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 = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 80, _HS.devotion = 55.7, _HS.height = 170, _HS.race = "white", _HS.nationality = "American", _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hLength = 10, _HS.boobs = 500, _HS.butt = 5, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 3, _HS.clitSetting = "vanilla", _HS.anus = 3, _HS.ovaries = 1, _HS.anusPiercing = 1, _HS.makeup = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 35, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 96, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Her nickname, 'Horsepussy,' is tattooed on her forehead.", _HS.customDesc = "Her pussy has been extensively surgically altered. Her labia are large and puffy, sticking out nearly an inch from her crotch. Her cunt is exquisitely pink at the center, but her large labia are dark at the edges, almost black.", _HS.labia = 3>>
+<<set _HS.slaveName = "Horsepussy", _HS.birthName = "Amber", _HS.origin = "She 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 = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 80, _HS.devotion = 55.7, _HS.height = 170, _HS.race = "white", _HS.nationality = "American", _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hLength = 10, _HS.boobs = 500, _HS.butt = 5, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 3, _HS.clitSetting = "vanilla", _HS.anus = 3, _HS.ovaries = 1, _HS.anusPiercing = 1, _HS.makeup = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 35, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 96, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Her nickname, 'Horsepussy,' is tattooed on her forehead.", _HS.customDesc = "Her pussy has been extensively surgically altered. Her labia are large and puffy, sticking out nearly an inch from her crotch. Her cunt is exquisitely pink at the center, but her large labia are dark at the edges, almost black.", _HS.labia = 3>>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sakura", _HS.birthName = "Mei", _HS.origin = "She is the winner of a martial arts slave tournament. You won her in a bet.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 80, _HS.devotion = 40, _HS.muscles = 20, _HS.nationality = "Japanese", _HS.race = "asian", _HS.hColor = "black", _HS.hStyle = "long, tied into a neat ponytail", _HS.boobs = 300, _HS.butt = 1, _HS.face = 15, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.analArea = 1, _HS.ovaries = 1, _HS.combatSkill = 1, _HS.clothes = "choosing her own clothes", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "She has a tattoo of falling cherry petals on her back, starting at her shoulder blades, down to her butt.", _HS.customDesc = "She has a small scar on the back of her right hand. She was injured while participating in the finals of the national kendo tournament, and decided to keep the scar to remind her of her achievements.">>
+<<set _HS.slaveName = "Sakura", _HS.birthName = "Mei", _HS.origin = "She is the winner of a martial arts slave tournament. You won her in a bet.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 80, _HS.devotion = 40, _HS.muscles = 20, _HS.nationality = "Japanese", _HS.race = "asian", _HS.hColor = "black", _HS.hStyle = "long, tied into a neat ponytail", _HS.boobs = 300, _HS.butt = 1, _HS.face = 15, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.analArea = 1, _HS.ovaries = 1, _HS.skill.combat = 1, _HS.clothes = "choosing her own clothes", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "She has a tattoo of falling cherry petals on her back, starting at her shoulder blades, down to her butt.", _HS.customDesc = "She has a small scar on the back of her right hand. She was injured while participating in the finals of the national kendo tournament, and decided to keep the scar to remind her of her achievements.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Zhao Li", _HS.birthName = "Zhao Li", _HS.origin = "She was caught and enslaved while working undercover.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.race = "asian", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long, but tied into Chinese buns.", _HS.pubicHStyle = "in a strip", _HS.boobs = 755, _HS.butt = 4, _HS.face = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.entertainSkill = 15, _HS.combatSkill = 1, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishStrength = 100, _HS.fetishKnown = 1, _HS.customDesc = "She was once a skilled police investigator. Even at her age, her long, enticing legs are proof that she still retains her natural strength and beauty.", _HS.career = "a police detective">>
+<<set _HS.slaveName = "Zhao Li", _HS.birthName = "Zhao Li", _HS.origin = "She was caught and enslaved while working undercover.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.race = "asian", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long, but tied into Chinese buns.", _HS.pubicHStyle = "in a strip", _HS.boobs = 755, _HS.butt = 4, _HS.face = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishStrength = 100, _HS.fetishKnown = 1, _HS.customDesc = "She was once a skilled police investigator. Even at her age, her long, enticing legs are proof that she still retains her natural strength and beauty.", _HS.career = "a police detective">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Virago' Kissa", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "In spite of the great demand for her kind, she has apparently eluded enslavement until recently.", _HS.career = "a wanderer", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a natural albino.", _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Ugandan", _HS.race = "black", _HS.eyeColor = "pale grey", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 100, _HS.hStyle = "extremely long and bushy", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 600, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 3, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.collar = "pretty jewelry", _HS.shoes = "flats", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.geneticQuirks = {albinism: 2}, _HS.customTat = "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.", _HS.customDesc = "Her eyes are unsettling; though her irises are a pale grey color, in some lights the whole eye takes on a red cast.">>
+<<set _HS.slaveName = "'Virago' Kissa", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "In spite of the great demand for her kind, she has apparently eluded enslavement until recently.", _HS.career = "a wanderer", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a natural albino.", _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Ugandan", _HS.race = "black", _HS.eyeColor = "pale grey", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 100, _HS.hStyle = "extremely long and bushy", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 600, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.skill.oral = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 3, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.collar = "pretty jewelry", _HS.shoes = "flats", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.geneticQuirks = {albinism: 2}, _HS.customTat = "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.", _HS.customDesc = "Her eyes are unsettling; though her irises are a pale grey color, in some lights the whole eye takes on a red cast.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Annabelle", _HS.birthName = "Annabelle", _HS.origin = "She came to be a slave not long after fleeing farm life for the Free Cities.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -65, _HS.height = 155, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hStyle = "braided into pigtails", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.whoreSkill = 15, _HS.attrXY = 40, _HS.behavioralFlaw = "hates women", _HS.customDesc = "The pale skin within her tan lines is lightly freckled.", _HS.markings = "freckles">>
+<<set _HS.slaveName = "Annabelle", _HS.birthName = "Annabelle", _HS.origin = "She came to be a slave not long after fleeing farm life for the Free Cities.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -65, _HS.height = 155, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hStyle = "braided into pigtails", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.whore = 15, _HS.attrXY = 40, _HS.behavioralFlaw = "hates women", _HS.customDesc = "The pale skin within her tan lines is lightly freckled.", _HS.markings = "freckles">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Vampire' Elvira", _HS.birthName = "Elvira", _HS.career = "service worker", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 90, _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "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 = "your initials", _HS.brandLocation = "buttocks", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 15, _HS.livingRules = "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, _HS.health = 90, _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.skin = "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 = "your initials", _HS.brandLocation = "buttocks", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 15, _HS.livingRules = "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()>>
-<<set _HS.slaveName = "'Creamy' Mayu", _HS.birthName = "Mayu", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 100, _HS.devotion = 100, _HS.weight = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 7500, _HS.nipples = "huge", _HS.areolae = 3, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 7, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaTat = "bovine patterns", _HS.births = 1, _HS.birthsTotal = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bovine patterns", _HS.earPiercing = 1, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.relationshipRules = "permissive", _HS.clothes = "a nice maid outfit", _HS.collar = "leather with cowbell", _HS.shoes = "flats", _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customDesc = "She is quite sweaty, often soaking though any clothing she is wearing.">>
+<<set _HS.slaveName = "'Creamy' Mayu", _HS.birthName = "Mayu", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 100, _HS.devotion = 100, _HS.weight = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 7500, _HS.nipples = "huge", _HS.areolae = 3, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 7, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaTat = "bovine patterns", _HS.births = 1, _HS.birthsTotal = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bovine patterns", _HS.earPiercing = 1, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.relationshipRules = "permissive", _HS.clothes = "a nice maid outfit", _HS.collar = "leather with cowbell", _HS.shoes = "flats", _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customDesc = "She is quite sweaty, often soaking though any clothing she is wearing.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Submissive' Cindy", _HS.birthName = "Cindy", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 175, _HS.nationality = "Indonesian", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald, with a barcode tattooed on the top of her head", _HS.pubicHStyle = "bushy", _HS.boobs = 600, _HS.nipplesPiercing = 1, _HS.boobsTat = "tribal patterns", _HS.butt = 2, _HS.buttTat = "tribal patterns", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsPiercing = 1, _HS.lipsTat = "tribal patterns", _HS.tonguePiercing = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "tribal patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.ovaries = 1, _HS.anusPiercing = 1, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.navelPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "tribal patterns", _HS.legsTat = "tribal patterns", _HS.stampTat = "tribal patterns", _HS.oralSkill = 35, _HS.combatSkill = 1, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.relationshipRules = "permissive", _HS.clothes = "attractive lingerie", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -70, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "Her skin is unnaturally perfect, totally without blemishes. She radiates unnatural health and resilience.">>
+<<set _HS.slaveName = "'Submissive' Cindy", _HS.birthName = "Cindy", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 175, _HS.nationality = "Indonesian", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald, with a barcode tattooed on the top of her head", _HS.pubicHStyle = "bushy", _HS.boobs = 600, _HS.nipplesPiercing = 1, _HS.boobsTat = "tribal patterns", _HS.butt = 2, _HS.buttTat = "tribal patterns", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsPiercing = 1, _HS.lipsTat = "tribal patterns", _HS.tonguePiercing = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "tribal patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.ovaries = 1, _HS.anusPiercing = 1, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.navelPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "tribal patterns", _HS.legsTat = "tribal patterns", _HS.stampTat = "tribal patterns", _HS.skill.oral = 35, _HS.skill.combat = 1, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.relationshipRules = "permissive", _HS.clothes = "attractive lingerie", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -70, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "Her skin is unnaturally perfect, totally without blemishes. She radiates unnatural health and resilience.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -521,7 +521,7 @@
/*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 her from her previous owner, she 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.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -50, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "Her amputation sites have titanium rings that go through to the bone. She has been chemically blinded.">>
+<<set _HS.slaveName = "Box", _HS.birthName = "Box", _HS.origin = "When you took her from her previous owner, she 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.customDesc = "Her amputation sites have titanium rings that go through to the bone. She has been chemically blinded.">>
<<set $heroSlaves.push(_HS)>>
/* put some of her custom description in her origin (box stuff), tagged as amp, lowered obedience, increased weight but lowered health, changed skin color from white to pale */
@@ -532,42 +532,42 @@
<<if $seePreg != 0>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "She sold herself 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.births = 2, _HS.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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 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 = "She sold herself 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.births = 2, _HS.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.whore = 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>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'DoL Toy' Allie", _HS.birthName = "Aliana", _HS.origin = "She is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 33, _HS.physicalAge = 33, _HS.visualAge = 33, _HS.ovaryAge = 33, _HS.health = 80, _HS.devotion = 65, _HS.height = 155, _HS.nationality = "Mexican", _HS.race = "latina", _HS.override_H_Color = 1, _HS.hColor = "raven black with red highlights", _HS.skin = "brown", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 700, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.bellyAccessory = "an extreme corset", _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.anus = 2, _HS.ovaries = 1, _HS.stampTat = "degradation", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 35, _HS.entertainSkill = 15, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Her left butt cheek is tattooed with a small shield bearing the words 'Daughter of Liberty' with a large red 'not' symbol added over it.">>
+<<set _HS.slaveName = "'DoL Toy' Allie", _HS.birthName = "Aliana", _HS.origin = "She is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 33, _HS.physicalAge = 33, _HS.visualAge = 33, _HS.ovaryAge = 33, _HS.health = 80, _HS.devotion = 65, _HS.height = 155, _HS.nationality = "Mexican", _HS.race = "latina", _HS.override_H_Color = 1, _HS.hColor = "raven black with red highlights", _HS.skin = "brown", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 700, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.bellyAccessory = "an extreme corset", _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.anus = 2, _HS.ovaries = 1, _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 35, _HS.skill.entertainment = 15, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Her left butt cheek is tattooed with a small shield bearing the words 'Daughter of Liberty' with a large red 'not' symbol added over it.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Onahole' Lian the Liberty Whore", _HS.birthName = "Lian", _HS.origin = "She 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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 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 = "She 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.whore = 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()>>
-<<set _HS.slaveName = "'Quiet' Fay", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "Having always been a mute with no desire to communicate her origin, you aren't sure where she's from or how she ended up here.", _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 = -100, _HS.height = 145, _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "white", _HS.hStyle = "long and disheveled", _HS.boobs = 400, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.oralSkill = 15, _HS.clothes = "a nice maid outfit", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.customTat = "There's an X imprinted on her throat where her larynx would be.", _HS.customDesc = "She earned her name from her permanent silence and fae physique.", _HS.voice = 0>>
+<<set _HS.slaveName = "'Quiet' Fay", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "Having always been a mute with no desire to communicate her origin, you aren't sure where she's from or how she ended up here.", _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 = -100, _HS.height = 145, _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "white", _HS.hStyle = "long and disheveled", _HS.boobs = 400, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.clothes = "a nice maid outfit", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.customTat = "There's an X imprinted on her throat where her larynx would be.", _HS.customDesc = "She earned her name from her permanent silence and fae physique.", _HS.voice = 0>>
<<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.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 35, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.customDesc = "She 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.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.customDesc = "She fits perfectly into a pillowcase.">>
<<set $heroSlaves.push(_HS)>>
/*bitchy arrogant*/
/*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, _HS.health = -10, _HS.devotion = 10, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 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, _HS.health = -10, _HS.devotion = 10, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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 $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 she 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, _HS.health = 20, _HS.devotion = 60, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.customDesc = "She has many surgical scars and something seems off about her.", _HS.scars = 2>>
+<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person she 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, _HS.health = 20, _HS.devotion = 60, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "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.customDesc = "She has many surgical scars and something seems off about her.", _HS.scars = 2>>
<<set $heroSlaves.push(_HS)>>
/*heels*/
/*Added origin, makeup and nails, changed eyes -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Whore", _HS.birthName = "Whore", _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.height = 155, _HS.skin = "white", _HS.hStyle = "long and in a braid", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.customDesc = "She is a complete mental blank; to her, there is only the Master.">>
+<<set _HS.slaveName = "Whore", _HS.birthName = "Whore", _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.height = 155, _HS.skin = "white", _HS.hStyle = "long and in a braid", _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.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.customDesc = "She is a complete mental blank; to her, there is only the Master.">>
<<set $heroSlaves.push(_HS)>>
/*Fixed customdesc syntax, changed hair from blue -BoneyM*/
@@ -576,17 +576,17 @@
<<if $familyTesting == 1>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Camille", _HS.birthName = "Camille", _HS.ID = _i++, _HS.origin = "She is half of a famous musical duo, along with her twin sister. They fled to the Free Cities.", _HS.career = "an aspiring pop star", _HS.prestige = 1, _HS.prestigeDesc = "She is a famed singer; citizens would pay top prices to feel her mouth around their dicks.", _HS.birthWeek = 16, _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 40, _HS.weight = -10, _HS.muscles = 10, _HS.height = 170, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "neat, with thick luxurious bangs.", _HS.waist = -55, _HS.voice = 2, _HS.boobs = 300, _HS.boobShape = "perky", _HS.butt = 2, _HS.face = 100, _HS.lips = 25, _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.entertainSkill = 100, _HS.energy = 50, _HS.attrXX = 80, _HS.fetish = "boobs", _HS.fetishStrength = 70, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates men", _HS.customDesc = "She has an identical twin sister named Kennerly, from whom she hates to be parted. They're from the former United States.", _HS.mother = -9999, _HS.father = -9998>>
+<<set _HS.slaveName = "Camille", _HS.birthName = "Camille", _HS.ID = _i++, _HS.origin = "She is half of a famous musical duo, along with her twin sister. They fled to the Free Cities.", _HS.career = "an aspiring pop star", _HS.prestige = 1, _HS.prestigeDesc = "She is a famed singer; citizens would pay top prices to feel her mouth around their dicks.", _HS.birthWeek = 16, _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 40, _HS.weight = -10, _HS.muscles = 10, _HS.height = 170, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "neat, with thick luxurious bangs.", _HS.waist = -55, _HS.voice = 2, _HS.boobs = 300, _HS.boobShape = "perky", _HS.butt = 2, _HS.face = 100, _HS.lips = 25, _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.skill.entertainment = 100, _HS.energy = 50, _HS.attrXX = 80, _HS.fetish = "boobs", _HS.fetishStrength = 70, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates men", _HS.customDesc = "She has an identical twin sister named Kennerly, from whom she hates to be parted. They're from the former United States.", _HS.mother = -9999, _HS.father = -9998>>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kennerly", _HS.birthName = "Kennerly", _HS.ID = _i++, _HS.origin = "She is half of a famous musical duo, along with her twin sister. They fled to the Free Cities.", _HS.career = "an aspiring pop star", _HS.prestige = 1, _HS.prestigeDesc = "She is a famed singer; citizens would pay top prices to feel her mouth around their dicks.", _HS.birthWeek = 16, _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 40, _HS.weight = 10, _HS.height = 167, _HS.nationality = "American", _HS.race = "white", _HS.markings = "beauty mark", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "neat, with thick luxurious bangs.", _HS.waist = -55, _HS.voice = 2, _HS.boobs = 500, _HS.boobShape = "perky", _HS.butt = 2, _HS.face = 100, _HS.lips = 15, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.oralSkill = 15, _HS.entertainSkill = 100, _HS.energy = 50, _HS.attrXX = 80, _HS.fetish = "boobs", _HS.fetishStrength = 70, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates men", _HS.customDesc = "She has an identical twin sister named Camille, from whom she hates to be parted. They're from the former United States.", _HS.mother = -9999, _HS.father = -9998>>
+<<set _HS.slaveName = "Kennerly", _HS.birthName = "Kennerly", _HS.ID = _i++, _HS.origin = "She is half of a famous musical duo, along with her twin sister. They fled to the Free Cities.", _HS.career = "an aspiring pop star", _HS.prestige = 1, _HS.prestigeDesc = "She is a famed singer; citizens would pay top prices to feel her mouth around their dicks.", _HS.birthWeek = 16, _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 40, _HS.weight = 10, _HS.height = 167, _HS.nationality = "American", _HS.race = "white", _HS.markings = "beauty mark", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "neat, with thick luxurious bangs.", _HS.waist = -55, _HS.voice = 2, _HS.boobs = 500, _HS.boobShape = "perky", _HS.butt = 2, _HS.face = 100, _HS.lips = 15, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.skill.oral = 15, _HS.skill.entertainment = 100, _HS.energy = 50, _HS.attrXX = 80, _HS.fetish = "boobs", _HS.fetishStrength = 70, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates men", _HS.customDesc = "She has an identical twin sister named Camille, from whom she hates to be parted. They're from the former United States.", _HS.mother = -9999, _HS.father = -9998>>
<<set $heroSlaves.push(_HS)>>
<</if>>
/*
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "STANDARD", _HS.birthName = "STANDARD", _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 = 60, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.anusTat = "bleached", _HS.vaginalSkill = 0, _HS.oralSkill = 0, _HS.analSkill = 0, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "STANDARD", _HS.birthName = "STANDARD", _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 = 60, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.anusTat = "bleached", _HS.skill.vaginal = 0, _HS.skill.oral = 0, _HS.skill.anal = 0, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
*/
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 23e4e74bb80983b46294cd20b3660a2edfadc074..c5fcce7085c2d426a291e5421fceaa40d6e31e43 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -2,7 +2,7 @@
<<set _i = 800000>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Marylynne", _HS.birthName = "Tyson", _HS.genes = "XY", _HS.origin = "She is a life-long house slave who has always tried to be the perfect woman, despite her dick.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 20, _HS.devotion = 100, _HS.skin = "white", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.areolae = 1, _HS.butt = 5, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 3, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.oralSkill = 35, _HS.analSkill = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "She is extremely self-conscious about her dick.", _HS.sexualFlaw = "shamefast", _HS.behavioralQuirk = "insecure">>
+<<set _HS.slaveName = "Marylynne", _HS.birthName = "Tyson", _HS.genes = "XY", _HS.origin = "She is a life-long house slave who has always tried to be the perfect woman, despite her dick.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 20, _HS.devotion = 100, _HS.skin = "white", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.areolae = 1, _HS.butt = 5, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 3, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 35, _HS.skill.anal = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "She is extremely self-conscious about her dick.", _HS.sexualFlaw = "shamefast", _HS.behavioralQuirk = "insecure">>
<<set $heroSlaves.push(_HS)>>
/*Increased areolae, added origin and customdesc -BoneyM*/
@@ -12,13 +12,13 @@
/*Changed assignment -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Adrian", _HS.birthName = "Adrian", _HS.genes = "XY", _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 = 75, _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd">>
+<<set _HS.slaveName = "Adrian", _HS.birthName = "Adrian", _HS.genes = "XY", _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 = 75, _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd">>
<<set $heroSlaves.push(_HS)>>
/*switch*/
/*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, _HS.health = 20, _HS.devotion = 35, _HS.height = 175, _HS.skin = "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.oralSkill = 15, _HS.analSkill = 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, _HS.health = 20, _HS.devotion = 35, _HS.height = 175, _HS.skin = "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 $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 = "She was once a successful drug lord, but was turned into her 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, _HS.health = 100, _HS.devotion = 75, _HS.muscles = 20, _HS.height = 175, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.oralSkill = 100, _HS.analSkill = 100, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a brand of a former master on her left testicle.", _HS.brand = "a brand of a former master", _HS.stampTat = "She has a fairly generic tramp stamp.", _HS.career = "a gang leader">>
+<<set _HS.slaveName = "'Mrs.' Maria", _HS.birthName = "Maria", _HS.genes = "XY", _HS.origin = "She was once a successful drug lord, but was turned into her 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, _HS.health = 100, _HS.devotion = 75, _HS.muscles = 20, _HS.height = 175, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "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.customTat = "She has a brand of a former master on her left testicle.", _HS.brand = "a brand of a former master", _HS.stampTat = "She 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, _HS.health = 20, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "platinum blonde", _HS.skin = "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.oralSkill = 100, _HS.analSkill = 100, _HS.clothes = "slutty jewelry", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.customDesc = "She 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, _HS.health = 20, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "platinum blonde", _HS.skin = "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.customDesc = "She is as dumb as a bag of hammers.">>
<<set $heroSlaves.push(_HS)>>
/*also buttslut*/
/*Added customdesc, changed eye color -BoneyM*/
@@ -45,7 +45,7 @@
/*Added origin -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Julia", _HS.birthName = "Julia", _HS.genes = "XY", _HS.origin = "She was homeless and willing to do anything for food, which in the end resulted in her becoming a slave.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 30, _HS.skin = "white", _HS.hLength = 10, _HS.hStyle = "short", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.clothes = "a slave gown", _HS.intelligence = -20, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has beautiful eyes and some scars.">>
+<<set _HS.slaveName = "Julia", _HS.birthName = "Julia", _HS.genes = "XY", _HS.origin = "She was homeless and willing to do anything for food, which in the end resulted in her becoming a slave.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 30, _HS.skin = "white", _HS.hLength = 10, _HS.hStyle = "short", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.clothes = "a slave gown", _HS.intelligence = -20, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has beautiful eyes and some scars.">>
<<set $heroSlaves.push(_HS)>>
/*love*/
/*Added origin, corrected customdesc syntax, increased cock and balls size to average -BoneyM*/
@@ -57,7 +57,7 @@
/*Added bitchy, increased cock and balls size to average -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Harry", _HS.birthName = "Harry", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 20, _HS.devotion = 25, _HS.height = 175, _HS.heightImplant = 1, _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "a medium length", _HS.boobs = 300, _HS.butt = 5, _HS.face = 15, _HS.faceImplant = 15, _HS.lipsTat = "permanent makeup", _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.clothes = "attractive lingerie", _HS.intelligence = -20, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Harry", _HS.birthName = "Harry", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 20, _HS.devotion = 25, _HS.height = 175, _HS.heightImplant = 1, _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "a medium length", _HS.boobs = 300, _HS.butt = 5, _HS.face = 15, _HS.faceImplant = 15, _HS.lipsTat = "permanent makeup", _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.clothes = "attractive lingerie", _HS.intelligence = -20, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*light makeup tats*/
/*Added makeup tattoos, added facial surgery, changed eye color, added height and heightimplant -BoneyM*/
@@ -69,12 +69,12 @@
/*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, _HS.health = 20, _HS.devotion = 60, _HS.height = 191, _HS.nationality = "Russian", _HS.race = "white", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.oralSkill = 35, _HS.analSkill = 15, _HS.clothes = "restrictive latex", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has many girly tattoos.", _HS.customDesc = "She 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, _HS.health = 20, _HS.devotion = 60, _HS.height = 191, _HS.nationality = "Russian", _HS.race = "white", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.customTat = "She has many girly tattoos.", _HS.customDesc = "She likes hair play.", _HS.navelPiercing = 1>>
<<set $heroSlaves.push(_HS)>>
/*Increased height and balls size -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Mackenzie", _HS.birthName = "Mackenzie", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 60, _HS.markings = "freckled", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "pale", _HS.hStyle = "long", _HS.boobs = 1800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customDesc = "She has a slim and perfectly feminine frame except for big feet and ears. She's very intelligent and well learned.">>
+<<set _HS.slaveName = "Mackenzie", _HS.birthName = "Mackenzie", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 60, _HS.markings = "freckled", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "pale", _HS.hStyle = "long", _HS.boobs = 1800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.intelligence = random(96,99), _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customDesc = "She has a slim and perfectly feminine frame except for big feet and ears. She's very intelligent and well learned.">>
<<set $heroSlaves.push(_HS)>>
/*intelligent, classy, devoted to Master*/
/*Increased ball size, changed eye color, changed skin to freckled, increased health, corrected customdesc syntax -BoneyM*/
@@ -85,77 +85,77 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Nikole", _HS.birthName = "Nikole", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 80, _HS.devotion = 100, _HS.race = "white", _HS.markings = "freckled", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "long and in a ponytail", _HS.boobs = 200, _HS.butt = 5, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.analSkill = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a tattoo of a black widow's hourglass pattern on her ballsack.">>
+<<set _HS.slaveName = "Nikole", _HS.birthName = "Nikole", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 80, _HS.devotion = 100, _HS.race = "white", _HS.markings = "freckled", _HS.eyeColor = "green", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "long and in a ponytail", _HS.boobs = 200, _HS.butt = 5, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a tattoo of a black widow's hourglass pattern on her ballsack.">>
<<set $heroSlaves.push(_HS)>>
/% Put the freckles from custDesc to markings Bane70 %/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Exta", _HS.birthName = "Exta", _HS.genes = "XY", _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 = 60, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "brown", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hLength = 15, _HS.hStyle = "short, and in a boyish cut", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.prostate = 1, _HS.balls = 1, _HS.anusTat = "bleached", _HS.oralSkill = 15, _HS.combatSkill = 1, _HS.intelligence = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a raised circuitry pattern on the nape of her neck.", _HS.sexualFlaw = "shamefast", _HS.career = "a businessman">>
+<<set _HS.slaveName = "Exta", _HS.birthName = "Exta", _HS.genes = "XY", _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 = 60, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "brown", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hLength = 15, _HS.hStyle = "short, and in a boyish cut", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.prostate = 1, _HS.balls = 1, _HS.anusTat = "bleached", _HS.skill.oral = 15, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a raised circuitry pattern on the nape of her neck.", _HS.sexualFlaw = "shamefast", _HS.career = "a businessman">>
<<set $heroSlaves.push(_HS)>>
/*business skill*/
/*likes mods - gave internal testicles as such PM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Martin", _HS.birthName = "Martin", _HS.genes = "XY", _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 = -55, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "bright blue", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 15, _HS.hStyle = "short and in a boyish cut", _HS.waist = -55, _HS.boobs = 100, _HS.butt = 4, _HS.face = 55, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, she still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly, and sweet in comparison to her natural sister, Elisa, she has a lovely singing voice. She prays quite often, if allowed to.", _HS.mother = -9997, _HS.father = -9996, _HS.sexualFlaw = "hates penetration">>
+<<set _HS.slaveName = "Martin", _HS.birthName = "Martin", _HS.genes = "XY", _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 = -55, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "bright blue", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 15, _HS.hStyle = "short and in a boyish cut", _HS.waist = -55, _HS.boobs = 100, _HS.butt = 4, _HS.face = 55, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.skill.combat = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, she still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly, and sweet in comparison to her natural sister, Elisa, she has a lovely singing voice. She prays quite often, if allowed to.", _HS.mother = -9997, _HS.father = -9996, _HS.sexualFlaw = "hates penetration">>
<<set $heroSlaves.push(_HS)>>
/*also hates pen*/
/*elisa's sibling*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Steven", _HS.birthName = "Steven", _HS.genes = "XY", _HS.origin = "She was forced into slavery due to extreme debt.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, _HS.health = 20, _HS.devotion = -55, _HS.weight = 40, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.race = "white", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.boobs = 200, _HS.butt = 3, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.oralSkill = 15, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates penetration">>
+<<set _HS.slaveName = "Steven", _HS.birthName = "Steven", _HS.genes = "XY", _HS.origin = "She was forced into slavery due to extreme debt.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, _HS.health = 20, _HS.devotion = -55, _HS.weight = 40, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.race = "white", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.boobs = 200, _HS.butt = 3, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.skill.oral = 15, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates penetration">>
<<set $heroSlaves.push(_HS)>>
/*also hates pen*/
/*wide dick*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Selene", _HS.birthName = "Selene", _HS.genes = "XY", _HS.origin = "Once she was an arcology security officer, lured to aphrodisiacs addiction and feminized by her boss (and former wife), to whom she was sold as a slave to satisfy her spousal maintenance after divorce.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 32, _HS.physicalAge = 32, _HS.visualAge = 32, _HS.ovaryAge = 32, _HS.health = 20, _HS.devotion = 40, _HS.muscles = 20, _HS.height = 175, _HS.race = "latina", _HS.eyeColor = "ice blue", _HS.hColor = "ashen with black streaks", _HS.pubicHColor = "ashen", _HS.skin = "brown", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.waist = -55, _HS.boobs = 1400, _HS.butt = 1, _HS.face = 55, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 2, _HS.dickPiercing = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.addict = 50, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customDesc = "She has a large police badge made of polished silver pinned right to the skin with several barbell piercings just above her left nipple. She wears two pairs of handcuffs as bracelets (one pair on each wrist); the handcuff keyholes are welded, so they cannot be unlocked and removed in any normal way.", _HS.career = "a security guard">>
+<<set _HS.slaveName = "Selene", _HS.birthName = "Selene", _HS.genes = "XY", _HS.origin = "Once she was an arcology security officer, lured to aphrodisiacs addiction and feminized by her boss (and former wife), to whom she was sold as a slave to satisfy her spousal maintenance after divorce.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 32, _HS.physicalAge = 32, _HS.visualAge = 32, _HS.ovaryAge = 32, _HS.health = 20, _HS.devotion = 40, _HS.muscles = 20, _HS.height = 175, _HS.race = "latina", _HS.eyeColor = "ice blue", _HS.hColor = "ashen with black streaks", _HS.pubicHColor = "ashen", _HS.skin = "brown", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.waist = -55, _HS.boobs = 1400, _HS.butt = 1, _HS.face = 55, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 2, _HS.dickPiercing = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.skill.anal = 100, _HS.skill.combat = 1, _HS.addict = 50, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customDesc = "She has a large police badge made of polished silver pinned right to the skin with several barbell piercings just above her left nipple. She wears two pairs of handcuffs as bracelets (one pair on each wrist); the handcuff keyholes are welded, so they cannot be unlocked and removed in any normal way.", _HS.career = "a security guard">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Buns' Jones", _HS.birthName = "Jones", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.devotion = 31, _HS.nationality = "Chinese", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "dark brown with bleached highlights", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "long and braided into a ponytail", _HS.waist = -55, _HS.boobs = 200, _HS.butt = 8, _HS.lips = 35, _HS.vagina = -1, _HS.vaginaTat = "rude words", _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusTat = "flowers", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "rude words", _HS.stampTat = "rude words", _HS.oralSkill = 100, _HS.entertainSkill = 15, _HS.clothes = "a slutty outfit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "A palm sized ring adorns the end of her braid, perfect for grabbing and pulling during any occasion.">>
+<<set _HS.slaveName = "'Buns' Jones", _HS.birthName = "Jones", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.devotion = 31, _HS.nationality = "Chinese", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "dark brown with bleached highlights", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 60, _HS.hStyle = "long and braided into a ponytail", _HS.waist = -55, _HS.boobs = 200, _HS.butt = 8, _HS.lips = 35, _HS.vagina = -1, _HS.vaginaTat = "rude words", _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusTat = "flowers", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "rude words", _HS.stampTat = "rude words", _HS.skill.oral = 100, _HS.skill.entertainment = 15, _HS.clothes = "a slutty outfit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "A palm sized ring adorns the end of her braid, perfect for grabbing and pulling during any occasion.">>
<<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), _HS.health = 70, _HS.devotion = 100, _HS.eyeColor = "black", _HS.hColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.skin = "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.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 = "SLUT", _HS.brandLocation = "buttocks", _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.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 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.customTat = "She has tattoos of teasing, enticing messages begging others to come taste her addictive milk.", _HS.customDesc = "Her musky milky aura drives men and women around her giggly and dumb with lust.">>
+<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 70, _HS.devotion = 100, _HS.eyeColor = "black", _HS.hColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "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.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 = "SLUT", _HS.brandLocation = "buttocks", _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.whore = 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.customTat = "She has tattoos of teasing, enticing messages begging others to come taste her addictive milk.", _HS.customDesc = "Her musky milky aura drives men and women around her giggly and dumb with lust.">>
<<set $heroSlaves.push(_HS)>>
/*Dropped desc = She has two cute horns protruding from her forehead. A few addicted milkslaves of her own tag along behind her. */
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Joan", _HS.birthName = "Mila", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 100, _HS.devotion = 25, _HS.weight = 20, _HS.height = 175, _HS.hColor = "dark brown", _HS.pubicHColor = "brown", _HS.skin = "pale", _HS.hLength = 30, _HS.hStyle = "shoulder-length, done up in a ponytail", _HS.pubicHStyle = "bushy", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.areolae = 2, _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 7, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 5, _HS.scrotum = 4, _HS.anusPiercing = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.entertainSkill = 35, _HS.clothes = "cutoffs and a t-shirt", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "She has a blood red, faux brand tattoo on her left ass cheek.", _HS.customDesc = "She has a nearly faded pockmark on the skin above her left eyebrow, the last reminder of her awkward past.">>
+<<set _HS.slaveName = "Joan", _HS.birthName = "Mila", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 100, _HS.devotion = 25, _HS.weight = 20, _HS.height = 175, _HS.hColor = "dark brown", _HS.pubicHColor = "brown", _HS.skin = "pale", _HS.hLength = 30, _HS.hStyle = "shoulder-length, done up in a ponytail", _HS.pubicHStyle = "bushy", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.areolae = 2, _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 7, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 5, _HS.scrotum = 4, _HS.anusPiercing = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.entertainment = 35, _HS.clothes = "cutoffs and a t-shirt", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "She has a blood red, faux brand tattoo on her left ass cheek.", _HS.customDesc = "She has a nearly faded pockmark on the skin above her left eyebrow, the last reminder of her awkward past.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.", _HS.pubicHStyle = "waxed">>
+<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "light", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.entertainment = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.", _HS.pubicHStyle = "waxed">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Laura", _HS.birthName = "Rolan", _HS.genes = "XY", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a high-ranking spy who was captured while trying to obtain secrets about the defenses of one the Free Cities.", _HS.birthWeek = random(0,51), _HS.health = -10, _HS.devotion = 5, _HS.height = 155, _HS.race = "middle eastern", _HS.override_H_Color = 1, _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "dark", _HS.hLength = 60, _HS.hStyle = "long and tied in a bun using a pearl chain", _HS.heels = 1, _HS.boobs = 200, _HS.butt = 2, _HS.vagina = -1, _HS.preg = -2, _HS.bellyAccessory = "a corset", _HS.dick = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.oralSkill = 15, _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.career = "a spy">>
+<<set _HS.slaveName = "Laura", _HS.birthName = "Rolan", _HS.genes = "XY", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a high-ranking spy who was captured while trying to obtain secrets about the defenses of one the Free Cities.", _HS.birthWeek = random(0,51), _HS.health = -10, _HS.devotion = 5, _HS.height = 155, _HS.race = "middle eastern", _HS.override_H_Color = 1, _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "dark", _HS.hLength = 60, _HS.hStyle = "long and tied in a bun using a pearl chain", _HS.heels = 1, _HS.boobs = 200, _HS.butt = 2, _HS.vagina = -1, _HS.preg = -2, _HS.bellyAccessory = "a corset", _HS.dick = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.skill.oral = 15, _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.career = "a spy">>
<<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 = "She is a former Kkangpae gang member who was sold into slavery by her former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She 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, _HS.health = 50, _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "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.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 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.customTat = "She has two neon-blue butterflies tattooed on her right temple and one more right above right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on her right leg.", _HS.customDesc = "She is almost never seen without her long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in her chignon.", _HS.career = "a gang member">>
+<<set _HS.slaveName = "'Dragon Goddess' Chae-won", _HS.genes = "XY", _HS.birthName = "Chae-won", _HS.origin = "She is a former Kkangpae gang member who was sold into slavery by her former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She 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, _HS.health = 50, _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.override_Skin = 1, _HS.skin = "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.whore = 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.customTat = "She has two neon-blue butterflies tattooed on her right temple and one more right above right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on her right leg.", _HS.customDesc = "She is almost never seen without her long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in her 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 = "She was sold to your predecessor by her 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, _HS.health = 50, _HS.devotion = -50, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.oralSkill = 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 = "She was sold to your predecessor by her 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, _HS.health = 50, _HS.devotion = -50, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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 $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Mistress' Ingrid", _HS.birthName = "Ingrid", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "white", _HS.nationality = "Norwegian", _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "pale", _HS.hLength = 90, _HS.hStyle = "ass-length with Nordic braids throughout", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 5, _HS.face = 55, _HS.lips = 35, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 15, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.combatSkill = 1, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has the style of Gothic royalty, and the demeanor to match.">>
+<<set _HS.slaveName = "'Mistress' Ingrid", _HS.birthName = "Ingrid", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "white", _HS.nationality = "Norwegian", _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "pale", _HS.hLength = 90, _HS.hStyle = "ass-length with Nordic braids throughout", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 5, _HS.face = 55, _HS.lips = 35, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.skill.whore = 35, _HS.skill.entertainment = 35, _HS.skill.combat = 1, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has the style of Gothic royalty, and the demeanor to match.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "Her origins are unknown, but rumor has it that she is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 60, _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eyeColor = "green", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.vaginalSkill = 15, _HS.oralSkill = 100, _HS.analSkill = 15, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.combatSkill = 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, _HS.pupil = "demonic">>
+<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "Her origins are unknown, but rumor has it that she is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 60, _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eyeColor = "green", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "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.whore = 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, _HS.pupil = "demonic">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fuckmeat", _HS.birthName = "Alva", _HS.genes = "XY", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She 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, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 145, _HS.race = "white", _HS.nationality = "Swedish", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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 = "a penis symbol", _HS.brandLocation = "cheek", _HS.shouldersTat = "rude words", _HS.armsTat = "rude words", _HS.legsTat = "rude words", _HS.stampTat = "rude words", _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 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.customTat = "She has a swastika tattooed on her ballsack.">>
+<<set _HS.slaveName = "Fuckmeat", _HS.birthName = "Alva", _HS.genes = "XY", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She 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, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 145, _HS.race = "white", _HS.nationality = "Swedish", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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 = "a penis symbol", _HS.brandLocation = "cheek", _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.whore = 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.customTat = "She has a swastika tattooed on her ballsack.">>
<<set $heroSlaves.push(_HS)>>
<<if $seeExtreme == 1>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fjola", _HS.birthName = "Fjola", _HS.genes = "XY", _HS.origin = "She was born into a slave ring that practiced heavy hormone manipulation to alter slaves from a very young age.", _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 = 10, _HS.weight = 20, _HS.height = 160, _HS.eyeColor = "grey", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 30, _HS.hStyle = "curly and shoulder length", _HS.boobs = 1000, _HS.butt = 3, _HS.vagina = 1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customDesc = "She has a small scar on her cheek, and many larger ones on her back.">>
+<<set _HS.slaveName = "Fjola", _HS.birthName = "Fjola", _HS.genes = "XY", _HS.origin = "She was born into a slave ring that practiced heavy hormone manipulation to alter slaves from a very young age.", _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 = 10, _HS.weight = 20, _HS.height = 160, _HS.eyeColor = "grey", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 30, _HS.hStyle = "curly and shoulder length", _HS.boobs = 1000, _HS.butt = 3, _HS.vagina = 1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customDesc = "She has a small scar on her cheek, and many larger ones on her back.">>
<<set $heroSlaves.push(_HS)>>
/*tsundere, grey eyes, unhappy to be herm*/
/*Changed eye color, added customdesc and origin -BoneyM*/
@@ -167,20 +167,20 @@
/*Made a post-op to match the bio as closely as possible in-universe, added origin, added hates penetration. -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Janine", _HS.birthName = "Janine", _HS.genes = "XY", _HS.origin = "She was enslaved after she fell into debt to you.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 90, _HS.devotion = 100, _HS.nationality = "German", _HS.eyeColor = "blue", _HS.hColor = "golden blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 10, _HS.hStyle = "flowing gently just past her cheek, framing her face beautifully", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 3.5, _HS.face = 15, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 1, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.clothes = "a penitent nuns habit", _HS.collar = "tight steel", _HS.shoes = "heels", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customDesc = "She has a beauty mark just above her lip, on an otherwise flawless face.">>
+<<set _HS.slaveName = "Janine", _HS.birthName = "Janine", _HS.genes = "XY", _HS.origin = "She was enslaved after she fell into debt to you.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 90, _HS.devotion = 100, _HS.nationality = "German", _HS.eyeColor = "blue", _HS.hColor = "golden blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 10, _HS.hStyle = "flowing gently just past her cheek, framing her face beautifully", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 3.5, _HS.face = 15, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 1, _HS.anusTat = "bleached", _HS.skill.oral = 100, _HS.clothes = "a penitent nuns habit", _HS.collar = "tight steel", _HS.shoes = "heels", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customDesc = "She has a beauty mark just above her lip, on an otherwise flawless face.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Buck", _HS.birthName = "Buck", _HS.genes = "XY", _HS.origin = "She was a soldier before being enslaved.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 90, _HS.devotion = -100, _HS.muscles = 50, _HS.height = 190, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "tanned", _HS.hLength = 0, _HS.prostate = 1, _HS.hStyle = "shaved", _HS.waist = -55, _HS.boobs = 100, _HS.nipplesPiercing = 1, _HS.butt = 1, _HS.face = 15, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.analArea = 1, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.combatSkill = 1, _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.behavioralFlaw = "bitchy">>
+<<set _HS.slaveName = "Buck", _HS.birthName = "Buck", _HS.genes = "XY", _HS.origin = "She was a soldier before being enslaved.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 90, _HS.devotion = -100, _HS.muscles = 50, _HS.height = 190, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 0, _HS.prostate = 1, _HS.hStyle = "shaved", _HS.waist = -55, _HS.boobs = 100, _HS.nipplesPiercing = 1, _HS.butt = 1, _HS.face = 15, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.analArea = 1, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.skill.combat = 1, _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.behavioralFlaw = "bitchy">>
<<set $heroSlaves.push(_HS)>>
/*dickskilled*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Udders' Erika", _HS.birthName = "Erika", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = -10, _HS.devotion = 55, _HS.height = 145, _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.boobs = 1250, _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 2, _HS.buttTat = "bovine patterns", _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsTat = "bovine patterns", _HS.vagina = -1, _HS.vaginaTat = "bovine patterns", _HS.preg = -3, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.dick = 1, _HS.dickTat = "bovine patterns", _HS.prostate = 1, _HS.anusTat = "bovine patterns", _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.oralSkill = 100, _HS.analSkill = 100, _HS.entertainSkill = 35, _HS.collar = "leather with cowbell", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customDesc = "Though her vocal cords have been altered to keep her from speaking, she is still capable of the occasional moo.">>
+<<set _HS.slaveName = "'Udders' Erika", _HS.birthName = "Erika", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = -10, _HS.devotion = 55, _HS.height = 145, _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.boobs = 1250, _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 2, _HS.buttTat = "bovine patterns", _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsTat = "bovine patterns", _HS.vagina = -1, _HS.vaginaTat = "bovine patterns", _HS.preg = -3, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.dick = 1, _HS.dickTat = "bovine patterns", _HS.prostate = 1, _HS.anusTat = "bovine patterns", _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.entertainment = 35, _HS.collar = "leather with cowbell", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customDesc = "Though her vocal cords have been altered to keep her from speaking, she is still capable of the occasional moo.">>
<<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 her parents, she 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.skin = "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.oralSkill = 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 her parents, she 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 $heroSlaves.push(_HS)>>
/* needed an amputated slave for debug reasons -prndev */
@@ -188,6 +188,6 @@
/*
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "STANDARD", _HS.birthName = "STANDARD", _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 = 60, _HS.skin = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.hLength = 20, _HS.boobs = 300, _HS.butt = 1, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.anusTat = "bleached", _HS.oralSkill = 15, _HS.analSkill = 15, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "STANDARD", _HS.birthName = "STANDARD", _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 = 60, _HS.skin = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.hLength = 20, _HS.boobs = 300, _HS.butt = 1, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.anusTat = "bleached", _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
*/
diff --git a/src/npc/databases/dfSlavesDatabase.tw b/src/npc/databases/dfSlavesDatabase.tw
index 62e84706a51497fa4df20e84ea45f9458ab3d35d..1ca124f0c95cbb1c2218d9502f03bbee5cbbe675 100644
--- a/src/npc/databases/dfSlavesDatabase.tw
+++ b/src/npc/databases/dfSlavesDatabase.tw
@@ -2,48 +2,48 @@
<<set _i = 700000>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Cherry", _HS.birthName = "Cherry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 75, _HS.actualAge = 18, _HS.physicalAge = 18, _HS.visualAge = 18, _HS.ovaryAge = 18, _HS.eyeColor = "light brown", _HS.pubicHColor = "black", _HS.skin = "white", _HS.hColor = "black", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Two cherries are tattooed in her right butt cheek and in her left cheek.", _HS.clitPiercing = 2, _HS.birthsTotal = 1>>
+<<set _HS.slaveName = "Cherry", _HS.birthName = "Cherry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 75, _HS.actualAge = 18, _HS.physicalAge = 18, _HS.visualAge = 18, _HS.ovaryAge = 18, _HS.eyeColor = "light brown", _HS.pubicHColor = "black", _HS.skin = "white", _HS.hColor = "black", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Two cherries are tattooed in her right butt cheek and in her left cheek.", _HS.clitPiercing = 2, _HS.birthsTotal = 1>>
/*vag implant, vibe nips*/
<<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, _HS.health = 20, _HS.devotion = 40, _HS.height = 175, _HS.eyeColor = "dark brown", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.customTat = "Strawberries are tattooed on her right buttock and on her left cheek.", _HS.clitPiercing = 2, _HS.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, _HS.health = 20, _HS.devotion = 40, _HS.height = 175, _HS.eyeColor = "dark brown", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "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.customTat = "Strawberries are tattooed on her right buttock and on her left cheek.", _HS.clitPiercing = 2, _HS.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, _HS.health = 20, _HS.devotion = 50, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "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.vaginalSkill = 15, _HS.oralSkill = 100, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Watermelons are tattooed on her buttocks and on her face.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.lipsPiercing = 2, _HS.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, _HS.health = 20, _HS.devotion = 50, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.skin = "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.customTat = "Watermelons are tattooed on her buttocks and on her face.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.lipsPiercing = 2, _HS.birthsTotal = 1>>
/*vibe nips, saliva implant*/
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 20, _HS.devotion = 90, _HS.height = 175, _HS.eyeColor = "light green", _HS.hColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "Carambolas — starfruits — are tattooed on her buttocks and on her face.", _HS.clitPiercing = 2, _HS.tonguePiercing = 1, _HS.clothes = "no clothing", _HS.collar = "bell collar", _HS.heels = 1>>
+<<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 20, _HS.devotion = 90, _HS.height = 175, _HS.eyeColor = "light green", _HS.hColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "Carambolas — starfruits — are tattooed on her buttocks and on her face.", _HS.clitPiercing = 2, _HS.tonguePiercing = 1, _HS.clothes = "no clothing", _HS.collar = "bell collar", _HS.heels = 1>>
/*vibe nips, saliva implant lube*/
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Banana", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 20, _HS.devotion = 65, _HS.race = "latina", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.lips = 35, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 35, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Bananas are tattooed on her buttocks and on her face.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.hips = 1, _HS.labia = 2, _HS.clit = 1, _HS.bald = 1, _HS.hStyle = "bald", _HS.pubicHStyle = "bald", _HS.underArmHStyle = "bald", _HS.intelligence = -30>>
+<<set _HS.slaveName = "Banana", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 20, _HS.devotion = 65, _HS.race = "latina", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.lips = 35, _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 = 100, _HS.skill.anal = 35, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Bananas are tattooed on her buttocks and on her face.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.hips = 1, _HS.labia = 2, _HS.clit = 1, _HS.bald = 1, _HS.hStyle = "bald", _HS.pubicHStyle = "bald", _HS.underArmHStyle = "bald", _HS.intelligence = -30>>
/*vibe nips, big pusslips+clit*/
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Green Grape", _HS.birthName = "Green Grape", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 40, _HS.actualAge = 18, _HS.physicalAge = 18, _HS.visualAge = 18, _HS.ovaryAge = 18, _HS.race = "mixed race", _HS.eyeColor = "green", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Green grapes are tattooed on her buttocks and on her face.", _HS.mother = -9995, _HS.father = -9994, _HS.clitPiercing = 2, _HS.intelligence = -60>>
+<<set _HS.slaveName = "Green Grape", _HS.birthName = "Green Grape", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 40, _HS.actualAge = 18, _HS.physicalAge = 18, _HS.visualAge = 18, _HS.ovaryAge = 18, _HS.race = "mixed race", _HS.eyeColor = "green", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Green grapes are tattooed on her buttocks and on her face.", _HS.mother = -9995, _HS.father = -9994, _HS.clitPiercing = 2, _HS.intelligence = -60>>
/*vibe nips, implant link to sister*/
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Purple Grape", _HS.birthName = "Purple Grape", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 40, _HS.race = "mixed race", _HS.eyeColor = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 60, _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Purple grapes are tattooed on her buttocks and on her face.", _HS.mother = -9995, _HS.father = -9994, _HS.clitPiercing = 2, _HS.intelligence = -60>>
+<<set _HS.slaveName = "Purple Grape", _HS.birthName = "Purple Grape", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 40, _HS.race = "mixed race", _HS.eyeColor = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 60, _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Purple grapes are tattooed on her buttocks and on her face.", _HS.mother = -9995, _HS.father = -9994, _HS.clitPiercing = 2, _HS.intelligence = -60>>
/*vibe nips, implant link to sister
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Apple", _HS.birthName = "Apple", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 20, _HS.devotion = 75, _HS.muscles = 20, _HS.eyeColor = "dark brown", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hColor = "black", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 55, _HS.lipsTat = "permanent makeup", _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Cored apples are tattooed on her buttocks and on her face.", _HS.intelligence = -60, _HS.clitPiercing = 2>>
+<<set _HS.slaveName = "Apple", _HS.birthName = "Apple", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 20, _HS.devotion = 75, _HS.muscles = 20, _HS.eyeColor = "dark brown", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hColor = "black", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 55, _HS.lipsTat = "permanent makeup", _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Cored apples are tattooed on her buttocks and on her face.", _HS.intelligence = -60, _HS.clitPiercing = 2>>
/*vibe nips, stupid, sensitive, no masturb implant*/
<<set $heroSlaves.push(_HS)>>
<<if $seeExtreme == 1>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Plum", _HS.birthName = "Plum", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 20, _HS.devotion = 75, _HS.muscles = 30, _HS.weight = 20, _HS.eyeColor = "brown", _HS.hColor = "brown", _HS.skin = "pale", _HS.hLength = 20, _HS.hStyle = "short and wavy", _HS.pubicHStyle = "waxed", _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.lips = 35, _HS.vagina = 4, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Cored plums are tattooed on her buttocks and on her face.", _HS.customDesc = "She has massive C-clamp piercings in her back that allow her to act as furniture, and a truly enormous vagina.", _HS.clitPiercing = 2, _HS.corsetPiercing = 1, _HS.sexualFlaw = "self hating", _HS.clothes = "no clothing", _HS.vaginalAccessory = "long, huge dildo">>
+<<set _HS.slaveName = "Plum", _HS.birthName = "Plum", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 20, _HS.devotion = 75, _HS.muscles = 30, _HS.weight = 20, _HS.eyeColor = "brown", _HS.hColor = "brown", _HS.skin = "pale", _HS.hLength = 20, _HS.hStyle = "short and wavy", _HS.pubicHStyle = "waxed", _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.lips = 35, _HS.vagina = 4, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Cored plums are tattooed on her buttocks and on her face.", _HS.customDesc = "She has massive C-clamp piercings in her back that allow her to act as furniture, and a truly enormous vagina.", _HS.clitPiercing = 2, _HS.corsetPiercing = 1, _HS.sexualFlaw = "self hating", _HS.clothes = "no clothing", _HS.vaginalAccessory = "long, huge dildo">>
/*vibe nips, can act as furniture*/
<<set $heroSlaves.push(_HS)>>
<</if>>
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index d02470336760556ba153e3cf5701789442150eae..ff9e278a2cfd8bcf3ccaac12a9bf2019b24c2bcd 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -151,11 +151,11 @@ You tell $activeSlave.slaveName to
<</if>>
<<if ($activeSlave.teeth == "pointy") || ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>>
- <<if ($activeSlave.oralSkill >= 100)>>
+ <<if ($activeSlave.skill.oral >= 100)>>
$He's so orally skilled that $he had the confidence to lightly graze you with $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> on occasion, a delightfully scary sensation.
- <<elseif ($activeSlave.oralSkill > 30)>>
+ <<elseif ($activeSlave.skill.oral > 30)>>
$He's sufficiently orally skilled that $he managed to accomplish all that without $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> contacting your <<if ($PC.dick == 1)>>dick<<else>>pussy<</if>> once.
- <<elseif ($activeSlave.oralSkill > 10)>>
+ <<elseif ($activeSlave.skill.oral > 10)>>
With $his basic oral skills, $he accidentally grazed you with $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> a few times, leaving your <<if ($PC.dick == 1)>>dick<<else>>pussy<</if>> slightly the worse for wear.
<<else>>
Since $he is orally unskilled, you were sporting with your <<if ($PC.dick == 1)>>dick<<else>>pussy<</if>> by using $his mouth. $He did $his best to keep $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> off you, but you're bleeding a bit down there.
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index 5c09c43f8ad95f26af14782ae9f8edfe7ff6f37b..cb24899cb2a3c2e6019137c8ba48e5be0150f9e6 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -5,15 +5,15 @@
<<if ($activeSlave.ID == $Bodyguard.ID)>>
<<if ($activeSlave.fetish == "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 95)>>
Knowing how much your bodyguard likes being hurt, you decide to reward $him in $his own particular way.
- <<elseif ($activeSlave.muscles < -5) && ($activeSlave.combatSkill == 0)>>
+ <<elseif ($activeSlave.muscles < -5) && ($activeSlave.skill.combat == 0)>>
Looking at your bodyguard, you think $he doesn't seem that dangerous, as $he can barely hold a weapon up. You order $him to spar with you, and you quickly overpower $him without even breaking a sweat. Afterwards, you take the pretext of punishing $him to satisfy your urges.
- <<elseif ($activeSlave.muscles >= -5 && $activeSlave.muscles <= 5) && ($activeSlave.combatSkill != 0)>>
+ <<elseif ($activeSlave.muscles >= -5 && $activeSlave.muscles <= 5) && ($activeSlave.skill.combat != 0)>>
You glance at your bodyguard. $He looks like $he can handle $himself, and you know $he does, but $his lack of musculature makes $him look somewhat frail. You inform $him that $he isn't muscular enough, and that you'll punish $him yourself for neglecting $his physique.
- <<elseif ($activeSlave.muscles > 30) && ($activeSlave.combatSkill == 0)>>
+ <<elseif ($activeSlave.muscles > 30) && ($activeSlave.skill.combat == 0)>>
Your bodyguard may look strong and powerful, you know $he can't really handle $his weapon. You order $him to spar with you, and you use $his own muscles against $him, winning easily. Afterwards, you take the pretext of punishing $him to satisfy your urges.
- <<elseif ($activeSlave.muscles > 5) && ($activeSlave.combatSkill != 0)>>
+ <<elseif ($activeSlave.muscles > 5) && ($activeSlave.skill.combat != 0)>>
Your bodyguard stands at your side. $He is definitely a force to be reckoned with. You know you'd have a hard time besting $him, and do not wish to get hurt, so you'll just inform $him $he'll be undertaking some particular training.
- <<elseif ($activeSlave.muscles > 5) && ($activeSlave.combatSkill == 0)>>
+ <<elseif ($activeSlave.muscles > 5) && ($activeSlave.skill.combat == 0)>>
Your bodyguard may look fit, you know $he can't really handle $his weapon. You order $him to spar with you; while $he may be quick, $he mostly just flails $his weapon around allowing you an easy win. Afterwards, you take the pretext of punishing $him to satisfy your urges.
<</if>>
<</if>>
@@ -420,15 +420,15 @@ Even though $he's in a somewhat bad shape, $he still jumps back to $his feet and
<</if>>
<<if ($activeSlave.ID == $Bodyguard.ID)>>
- <<if ($activeSlave.muscles <= 5) && ($activeSlave.combatSkill == 0)>>
+ <<if ($activeSlave.muscles <= 5) && ($activeSlave.skill.combat == 0)>>
Your bodyguard accepts this as a punishment for $his uselessness.
- <<elseif ($activeSlave.muscles <= 5) && ($activeSlave.combatSkill != 0)>>
+ <<elseif ($activeSlave.muscles <= 5) && ($activeSlave.skill.combat != 0)>>
Your bodyguard accepts this as a punishment for $his lack of muscles
- <<elseif ($activeSlave.muscles > 30) && ($activeSlave.combatSkill == 0)>>
+ <<elseif ($activeSlave.muscles > 30) && ($activeSlave.skill.combat == 0)>>
Your bodyguard accepts this as a punishment for $his lack of combat skills
- <<elseif ($activeSlave.muscles > 5) && ($activeSlave.combatSkill != 0)>>
+ <<elseif ($activeSlave.muscles > 5) && ($activeSlave.skill.combat != 0)>>
Your bodyguard just admits it as a part of $his body training.
- <<elseif ($activeSlave.muscles > 5) && ($activeSlave.combatSkill == 0)>>
+ <<elseif ($activeSlave.muscles > 5) && ($activeSlave.skill.combat == 0)>>
Your bodyguard accepts this as a punishment for $his lack of expertise
<</if>>
<<if ($activeSlave.fetish == "masochist") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index dd0461a40fec31fd1f46e0294eee7a74b4e1af39..8f3c821c380eeb6fdef962bdc24f12ddcd520ea6 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -1070,25 +1070,25 @@ My favorite part of my body i<<s>>
Being a <<s>>e<<x>> <<s>>lave i<<s>> hard work.
<</switch>>
-<<if (($activeSlave.oralSkill + $activeSlave.analSkill) >= 120) && ($activeSlave.vagina == -1)>>
+<<if (($activeSlave.skill.oral + $activeSlave.skill.anal) >= 120) && ($activeSlave.vagina == -1)>>
I'm really proud of my <<s>>e<<x>> <<s>>kill<<s>>, it'<<s>> ni<<c>>e to be good at what you do. Without a cunt my poor <<if $activeSlave.anus > 2>>a<<ss>>pu<<ss>>y<<elseif $activeSlave.anus == 2>>butthole<<else>>little anu<<s>><</if>> doe<<s>> double duty, but I can take it.
-<<elseif ($activeSlave.oralSkill + $activeSlave.vaginalSkill + $activeSlave.analSkill) >= 180>>
+<<elseif ($activeSlave.skill.oral + $activeSlave.skill.vaginal + $activeSlave.skill.anal) >= 180>>
I'm really proud of my <<s>>e<<x>> <<s>>kill<<s>>, it'<<s>> ni<<c>>e to be good at what you do.
-<<elseif ($activeSlave.whoreSkill >= 100)>>
+<<elseif ($activeSlave.skill.whore >= 100)>>
I'm really proud of my whoring <<s>>kill<<s>>, pro<<s>>titution i<<s>> ju<<s>>t a job like any other to me.
-<<elseif ($activeSlave.entertainSkill >= 100)>>
+<<elseif ($activeSlave.skill.entertainment >= 100)>>
I'm really proud of my <<s>>kill<<s>>, I feel like I can make anyone want me.
-<<elseif ($activeSlave.analSkill >= 100)>>
+<<elseif ($activeSlave.skill.anal >= 100)>>
<<if ($activeSlave.vagina == -1)>>
I'm really proud of my anal <<s>>kill<<s>>, I can take a dick a<<s>> well a<<s>> anyone.
<<else>>
I'm really proud of my anal <<s>>kill<<s>>, it'<<s>> fun having three fuckhole<<s>>.
<</if>>
-<<elseif ($activeSlave.analSkill <= 30) && ($activeSlave.anus > 0)>>
+<<elseif ($activeSlave.skill.anal <= 30) && ($activeSlave.anus > 0)>>
I wi<<sh>> I were better at anal, if I could learn to rela<<x>> getting buttfucked wouldn't hurt <<s>>o much.
-<<elseif ($activeSlave.vaginalSkill <= 30) && ($activeSlave.vagina > 0)>>
+<<elseif ($activeSlave.skill.vaginal <= 30) && ($activeSlave.vagina > 0)>>
I wi<<sh>> I were better at <<s>>e<<x>>, <<s>>ometime<<s>> all I can think to do i<<s>> ju<<s>>t lie there.
-<<elseif ($activeSlave.oralSkill <= 30)>>
+<<elseif ($activeSlave.skill.oral <= 30)>>
I wi<<sh>> I were better at blowjob<<s>>, it would be ni<<c>>e not to gag <<s>>o much.
<</if>>
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index 60d3bf1df4d4371e41f1afc0b065011436ba8bce..4c4d902e74cec8955639f4aee4faa9fc8a75c1e3 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -40,7 +40,7 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.relationship == -2)>>
$He hurriedly complies, happy to be near the object of $his longing. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
<<else>>
upon $his face. $He senses the intense look from the _womanP $he loves and finds it overwhelming, and after a moment glances away.
<</if>>
@@ -51,28 +51,28 @@ You tell $activeSlave.slaveName to
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
$He complies in a wifely fashion, moving $his body as $he approaches to best catch your desire. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
<<else>>
upon $his face. $He senses the intense look from the _womanP $he's married to and finds it affirming, and looks down with a smile.
<</if>>
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
$He complies. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and quickly breaks eye contact.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and quickly breaks eye contact.
<<else>>
upon $his face. $He senses the intense look from the _womanP $he's forcibly married to and finds it disturbing, and quickly turns $his face away.
<</if>>
<<elseif $activeSlave.devotion < -20>>
$He complies fearfully. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his tearing <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to horrifying, and quickly breaks eye contact.
+ into $his tearing <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to horrifying, and quickly breaks eye contact.
<<else>>
upon $his tear-streaked face. $He senses the intense look from the _womanP $he's forcibly married to and finds it horrifying, and quickly turns $his face away.
<</if>>
<<else>>
$He complies obediently. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
<<else>>
upon $his face. $He senses the intense look from the _womanP $he's married to and finds it reassuring, and looks down with a slight smile.
<</if>>
@@ -80,7 +80,7 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.devotion > 75)>>
$He hurriedly complies, happy to be near you. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster($activeSlave)>> disconcerting, and $his eyes flick downward after a moment.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster($activeSlave)>> disconcerting, and $his eyes flick downward after a moment.
<<else>>
upon $his face. $He senses the intense look from $his beloved <<= WrittenMaster()>> and finds it disconcerting, and after a moment glances away.
<</if>>
@@ -88,35 +88,35 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.devotion > 50)>>
$He hurriedly complies, happy to be near you. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
<<else>>
upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>>disconcerting, and $he looks down after a moment, blushing.
<</if>>
<<elseif ($activeSlave.devotion > 20)>>
$He hurriedly complies, happy to be near you. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
<<else>>
upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
<</if>>
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<else>>
upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and turns away after a moment, $his lower lip trembling with nervousness.
<</if>>
<<elseif ($activeSlave.trust < -20)>>
The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. After a mere instant of locked gazes, $he looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
+ into $his <<= App.Desc.eyeColor>> eyes. After a mere instant of locked gazes, $he looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
<<else>>
upon $his face. After a mere instant of locked faces, $he looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
<</if>>
<<else>>
$He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
+ into $his <<= App.Desc.eyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
<<else>>
upon $his face. $He faces you defiantly, but after a few moments $he loses the contest of wills and looks down.
<</if>>
@@ -135,16 +135,16 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
<<if $activeSlave.fetish == "mindbroken">>
$His mouth opens to accept the kiss, and is compliant with your questing tongue. You kiss your broken wife deeply. $His posture remains completely unchanged. Being kissed affects $him as little as being penetrated, being struck, being loved, or being your wife: not at all. When you pull away,
<<if canSee($activeSlave)>>
- $his <<= App.Desc.EyeColor>> eyes track you carefully, awaiting further use of $his body.
+ $his <<= App.Desc.eyeColor>> eyes track you carefully, awaiting further use of $his body.
<<else>>
$he exposes $himself to you, awaiting further use of $his body.
<</if>>
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
$His mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around $his sharp dentition.)<</if>> $He melts into you, sighing ever so gently. When you finally break the kiss, $his mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his mouth to trace $his lips where yours last touched.<</if>>
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+ $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.
<<else>>
@@ -169,7 +169,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
$He asks nervously before cringing, "I-i<<s>> that it, <<Master>>?"
<</if>>
<<else>>
- $He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a wife by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
+ $He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a wife by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
<<elseif !canTalk($activeSlave)>>
@@ -181,16 +181,16 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
<<elseif ($activeSlave.fetish == "mindbroken")>>
$His mouth opens to accept the kiss, and is compliant with your questing tongue. $His posture remains completely unchanged. Being kissed affects $him as little as being penetrated, being struck, or being loved: not at all. When you pull away,
<<if canSee($activeSlave)>>
- $his <<= App.Desc.EyeColor>> eyes track you carefully, awaiting further use of $his body.
+ $his <<= App.Desc.eyeColor>> eyes track you carefully, awaiting further use of $his body.
<<else>>
$he exposes $himself to you, awaiting further use of $his body.
<</if>>
<<elseif ($activeSlave.relationship == -2)>>
$His mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around $his sharp dentition.)<</if>> $He melts into you, sighing ever so gently. When you finally break the kiss, $his mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his mouth to trace $his lips where yours last touched.<</if>>
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+ $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.
<<else>>
@@ -199,9 +199,9 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
$He giggles into you and kisses you back with vigor, $his head pressing insistently forward. The two of you make out rather aggressively<<if ($activeSlave.teeth == "pointy")>>, $his sharp teeth drawing a bit of blood from your lips and tongue<</if>>. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, $his active tongue only retreating when yours presses against it. When you finally shove $him away, $he's breathing hard through $his grin.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+ $He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he liked that.
<<else>>
@@ -210,9 +210,9 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
$He stiffens with arousal. $His sexuality is complex, focusing on cum, but with a heavy layer of oral fixation. As your tongue plunders $his mouth, $he reacts almost as though $he's receiving oral, whimpering and moaning into you and pressing $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you tire of making out with $him.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+ $He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he liked that.
<<else>>
@@ -221,16 +221,16 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
<<elseif ($activeSlave.devotion > 50)>>
$His mouth accepts yours with devotion, matching itself carefully to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> $He is exquisitely careful to keep $his sharp teeth clear of you.<</if>> $He presses $himself against you, $his warmth wonderful against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally break the kiss, $he runs $his tongue rapturously across $his moistened lips<<if ($activeSlave.amp != 1)>> and then runs a finger across them as well<</if>>, an openly sexual look on $his $activeSlave.skin face.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
+ $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.
<<else>>
"I love you, <<Master>>," $he <<say>>s forthrightly.
<</if>>
<<elseif ($activeSlave.devotion > 20)>>
- $He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
+ $He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
<<elseif !canTalk($activeSlave)>>
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index 00fd451c59a35019294b90eb074bd22310ce4bf1..d00e421c47449dabe72038101f38bdaccd3a2722 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -79,12 +79,12 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
<<set $activeSlave.oralCount += 2, $slaves[$partner].oralCount += 2, $oralTotal += 2>>
<<= PartnerVCheck()>>
<<elseif canDoVaginal($activeSlave) && canDoVaginal($slaves[$partner]) && canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 50) && (_activeSlaveRel == "twin")>>
- $activeSlave.slaveName and $slaves[$partner].slaveName are such devoted sex slaves that they've long since lost any hesitations about their partnership, and generally approach sex as though their bodies were interchangeable. (This means that they almost never masturbate, for one thing, preferring to have sex with each other, instead.) Giggling and kissing each other, they eagerly kneel before your chair and give you simultaneous oral sex, making an effort to play with their symmetry. They kiss around your <<if ($PC.dick == 0)>>pussy<<else>>cock, making a complete seal around you with their lips<</if>>, one on each side. Then they jump up on your desk and press their <<if ($activeSlave.dick > 0) && ($slaves[$partner].dick > 0)>>cocks<<elseif ($activeSlave.dick > 0) || ($slaves[$partner].dick > 0)>>cock and pussy<<else>>pussies<</if>> against one another<<if ($PC.dick == 0)>> while you don a strap-on<</if>>, spreading their legs to offer you everything. You switch back and forth, with the twin you're not in rubbing and grinding against their sister, until both of $slaves[$partner].slaveName and $activeSlave.slaveName are lying on the desk<<if ($PC.dick == 1)>> with cum dripping out of them<</if>>, making out tiredly.
+ $activeSlave.slaveName and $slaves[$partner].slaveName are such devoted sex slaves that they've long since lost any hesitations about their partnership, and generally approach sex as though their bodies were interchangeable. (This means that they almost never masturbate, for one thing, preferring to have sex with each other, instead.) Giggling and kissing each other, they eagerly kneel before your chair and give you simultaneous oral sex, making an effort to play with their symmetry. They kiss around your <<if ($PC.dick == 0)>>pussy<<else>>cock, making a complete seal around you with their lips<</if>>, one on each side. Then they jump up on your desk and press their <<if ($activeSlave.dick > 0) && ($slaves[$partner].dick > 0)>>cocks<<elseif ($activeSlave.dick > 0) || ($slaves[$partner].dick > 0)>>cock and pussy<<else>>pussies<</if>> against one another<<if ($PC.dick == 0)>> while you don a strap-on<</if>>, spreading their legs to offer you everything. You switch back and forth, with the twin you're not in rubbing and grinding against their <<print relativeTerm($activeSlave, $slaves[$partner])>>, until both of $slaves[$partner].slaveName and $activeSlave.slaveName are lying on the desk<<if ($PC.dick == 1)>> with cum dripping out of them<</if>>, making out tiredly.
<<set $slaves[$partner].oralCount++, $activeSlave.oralCount++, $oralTotal++>>
<<= BothVCheck()>>
<<= PartnerVCheck()>>
<<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && (_activeSlaveRel == "sister" || _activeSlaveRel == "half-sister")>>
- You call $activeSlave.slaveName's _activeSlaveRel $slaves[$partner].slaveName in for some incestuous fun, but see no reason to wait for _him2. When _he2 arrives, it's to the <<if canSee($slaves[$partner])>>sight<<else>>scene<</if>> of $activeSlave.slaveName sitting on the couch with $his legs spread with you <<if ($activeSlave.vagina > -1)>>gently fucking $his pussy<<else>>using $his asshole<</if>><<if ($PC.dick == 0)>> with a strap-on<</if>>. You pull out and order $slaves[$partner].slaveName to orally service _his2 sister. _He2 gets down before the spread-eagled slave $girl to get to work. After watching $activeSlave.slaveName enjoy the attention for a while, you move behind the busy $slaves[$partner].slaveName and pull _him2 into a good position so you can fuck _him2 while _he2 sucks. After a few thrusts, $activeSlave.slaveName's eyes roll back. <<if ($activeSlave.voice == 0) || ($activeSlave.accent >= 3)>>$He gestures that it feels really good when you make $his sister moan into $him.<<else>>"Oh <<Master>>," $he squeals, "it feel<<s>> <<s>>o good when you make _him2 moan into me!"<</if>>
+ You call $activeSlave.slaveName's _activeSlaveRel $slaves[$partner].slaveName in for some incestuous fun, but see no reason to wait for _him2. When _he2 arrives, it's to the <<if canSee($slaves[$partner])>>sight<<else>>scene<</if>> of $activeSlave.slaveName sitting on the couch with $his legs spread with you <<if ($activeSlave.vagina > -1)>>gently fucking $his pussy<<else>>using $his asshole<</if>><<if ($PC.dick == 0)>> with a strap-on<</if>>. You pull out and order $slaves[$partner].slaveName to orally service _his2 <<print relativeTerm($slaves[$partner], $activeSlave)>>. _He2 gets down before the spread-eagled slave $girl to get to work. After watching $activeSlave.slaveName enjoy the attention for a while, you move behind the busy $slaves[$partner].slaveName and pull _him2 into a good position so you can fuck _him2 while _he2 sucks. After a few thrusts, $activeSlave.slaveName's eyes roll back. <<if ($activeSlave.voice == 0) || ($activeSlave.accent >= 3)>>$He gestures that it feels really good when you make $his <<print relativeTerm($activeSlave, $slaves[$partner])>> moan into $him.<<else>>"Oh <<Master>>," $he squeals, "it feel<<s>> <<s>>o good when you make _him2 moan into me!"<</if>>
<<set $slaves[$partner].oralCount++, $activeSlave.oralCount++, $oralTotal++>>
<<= BothVCheck()>>
<<= PartnerVCheck()>>
diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw
index 6d06a2f25fca2fd488aa77fb0c90ff36c9580be9..4e3baf27c16a47fb6b348e3f6480029f14a3310c 100644
--- a/src/npc/rgASDump.tw
+++ b/src/npc/rgASDump.tw
@@ -41,7 +41,7 @@
<<if $applyCareerBonus == 1>>
<<set _seed = 2>>
<<if $PC.career == "capitalist">>
- <<if $activeSlave.whoreSkill < 60>><<set $activeSlave.whoreSkill += 20>><</if>>
+ <<if $activeSlave.skill.whore < 60>><<set $activeSlave.skill.whore += 20>><</if>>
<<elseif $PC.career == "mercenary">>
<<set $activeSlave.trust += 10>>
<<elseif $PC.career == "slaver">>
@@ -49,14 +49,14 @@
<<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>>
<<elseif $PC.career == "celebrity">>
- <<if $activeSlave.entertainSkill < 60>><<set $activeSlave.entertainSkill += 20>><</if>>
+ <<if $activeSlave.skill.entertainment < 60>><<set $activeSlave.skill.entertainment += 20>><</if>>
<<elseif $PC.career == "servant">>
<<set $activeSlave.trust += 10>>
<<set $activeSlave.devotion += 10>>
<<elseif $PC.career == "gang">>
<<set $activeSlave.health += 5>>
- <<if $activeSlave.combatSkill < 1>>
- <<set $activeSlave.combatSkill += 1>>
+ <<if $activeSlave.skill.combat < 1>>
+ <<set $activeSlave.skill.combat += 1>>
<</if>>
<<elseif $PC.career == "BlackHat">>
<<set $activeSlave.intelligence += 40>>
@@ -64,43 +64,43 @@
<<set $activeSlave.intelligence = 100>>
<</if>>
<<elseif $PC.career == "escort">>
- <<if $activeSlave.entertainSkill < 60>>
- <<set $activeSlave.entertainSkill += 20>>
+ <<if $activeSlave.skill.entertainment < 60>>
+ <<set $activeSlave.skill.entertainment += 20>>
<</if>>
- <<if $activeSlave.whoreSkill < 60>>
- <<set $activeSlave.whoreSkill += 20>>
+ <<if $activeSlave.skill.whore < 60>>
+ <<set $activeSlave.skill.whore += 20>>
<</if>>
- <<if ($activeSlave.oralSkill < 60)>>
- <<set $activeSlave.oralSkill += 20, _seed-->>
+ <<if ($activeSlave.skill.oral < 60)>>
+ <<set $activeSlave.skill.oral += 20, _seed-->>
<</if>>
- <<if ($activeSlave.analSkill < 60) && (($activeSlave.anus > 0) || ($activeSlave.analSkill <= 10))>>
- <<set $activeSlave.analSkill += 20, _seed-->>
+ <<if ($activeSlave.skill.anal < 60) && (($activeSlave.anus > 0) || ($activeSlave.skill.anal <= 10))>>
+ <<set $activeSlave.skill.anal += 20, _seed-->>
<</if>>
- <<if (_seed > 0) && ($activeSlave.vaginalSkill < 60) && ($activeSlave.vagina > -1) && (($activeSlave.vagina > 0) || ($activeSlave.vaginalSkill <= 10))>>
- <<set $activeSlave.vaginalSkill += 20, _seed-->>
+ <<if (_seed > 0) && ($activeSlave.skill.vaginal < 60) && ($activeSlave.vagina > -1) && (($activeSlave.vagina > 0) || ($activeSlave.skill.vaginal <= 10))>>
+ <<set $activeSlave.skill.vaginal += 20, _seed-->>
<</if>>
<<elseif $PC.career == "wealth">>
- <<if ($activeSlave.oralSkill < 60)>>
- <<set $activeSlave.oralSkill += 20, _seed-->>
+ <<if ($activeSlave.skill.oral < 60)>>
+ <<set $activeSlave.skill.oral += 20, _seed-->>
<</if>>
- <<if ($activeSlave.analSkill < 60) && (($activeSlave.anus > 0) || ($activeSlave.analSkill <= 10))>>
- <<set $activeSlave.analSkill += 20, _seed-->>
+ <<if ($activeSlave.skill.anal < 60) && (($activeSlave.anus > 0) || ($activeSlave.skill.anal <= 10))>>
+ <<set $activeSlave.skill.anal += 20, _seed-->>
<</if>>
- <<if (_seed > 0) && ($activeSlave.vaginalSkill < 60) && ($activeSlave.vagina > -1) && (($activeSlave.vagina > 0) || ($activeSlave.vaginalSkill <= 10))>>
- <<set $activeSlave.vaginalSkill += 20>>
+ <<if (_seed > 0) && ($activeSlave.skill.vaginal < 60) && ($activeSlave.vagina > -1) && (($activeSlave.vagina > 0) || ($activeSlave.skill.vaginal <= 10))>>
+ <<set $activeSlave.skill.vaginal += 20>>
<</if>>
<<else>>
<<set $activeSlave.devotion += 10>>
- <<if $activeSlave.whoreSkill < 60>><<set $activeSlave.whoreSkill += 20>><</if>>
- <<if $activeSlave.entertainSkill < 60>><<set $activeSlave.entertainSkill += 20>><</if>>
- <<if ($activeSlave.oralSkill < 60)>>
- <<set $activeSlave.oralSkill += 20, _seed-->>
+ <<if $activeSlave.skill.whore < 60>><<set $activeSlave.skill.whore += 20>><</if>>
+ <<if $activeSlave.skill.entertainment < 60>><<set $activeSlave.skill.entertainment += 20>><</if>>
+ <<if ($activeSlave.skill.oral < 60)>>
+ <<set $activeSlave.skill.oral += 20, _seed-->>
<</if>>
- <<if ($activeSlave.analSkill < 60) && (($activeSlave.anus > 0) || ($activeSlave.analSkill <= 10))>>
- <<set $activeSlave.analSkill += 20, _seed-->>
+ <<if ($activeSlave.skill.anal < 60) && (($activeSlave.anus > 0) || ($activeSlave.skill.anal <= 10))>>
+ <<set $activeSlave.skill.anal += 20, _seed-->>
<</if>>
- <<if (_seed > 0) && ($activeSlave.vaginalSkill < 60) && ($activeSlave.vagina > -1) && (($activeSlave.vagina > 0) || ($activeSlave.vaginalSkill <= 10))>>
- <<set $activeSlave.vaginalSkill += 20>>
+ <<if (_seed > 0) && ($activeSlave.skill.vaginal < 60) && ($activeSlave.vagina > -1) && (($activeSlave.vagina > 0) || ($activeSlave.skill.vaginal <= 10))>>
+ <<set $activeSlave.skill.vaginal += 20>>
<</if>>
<</if>>
<<set $careerBonusApplied = 1>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 7daf8168e416fd4a3edea9059dc953bef88fdcec..874da2f5020545c23cc2a58b9def08af8a5325ed 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -364,17 +364,17 @@ __You are customizing this slave:__
<<set $activeSlave.father = Number($activeSlave.father) || 0>>
<<set $activeSlave.mother = Number($activeSlave.mother) || 0>>
-<<if ($activeSlave.anus > 2 && $activeSlave.analSkill <= 10) || ($activeSlave.anus == 0 && $activeSlave.analSkill > 30)>>
- <<set $activeSlave.analSkill = 15>>
+<<if ($activeSlave.anus > 2 && $activeSlave.skill.anal <= 10) || ($activeSlave.anus == 0 && $activeSlave.skill.anal > 30)>>
+ <<set $activeSlave.skill.anal = 15>>
<</if>>
<<if $activeSlave.vagina < 0>>
- <<set $activeSlave.vaginalSkill = 0>>
-<<elseif ($activeSlave.vagina > 2 && $activeSlave.vaginalSkill <= 10) || ($activeSlave.vagina == 0 && $activeSlave.vaginalSkill > 30)>>
- <<set $activeSlave.vaginalSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 0>>
+<<elseif ($activeSlave.vagina > 2 && $activeSlave.skill.vaginal <= 10) || ($activeSlave.vagina == 0 && $activeSlave.skill.vaginal > 30)>>
+ <<set $activeSlave.skill.vaginal = 15>>
<</if>>
/* Not sure the idea behind this one. The above two make some sense, but this one not so much.
-<<if ($activeSlave.intelligence + $activeSlave.intelligenceImplant > 15) && $activeSlave.entertainSkill <= 10>>
- <<set $activeSlave.entertainSkill = 15>>
+<<if ($activeSlave.intelligence + $activeSlave.intelligenceImplant > 15) && $activeSlave.skill.entertainment <= 10>>
+ <<set $activeSlave.skill.entertainment = 15>>
<</if>>
*/
@@ -736,28 +736,31 @@ __You are customizing this slave:__
<br>
<<options $activeSlave.skin>>
''Skin color:'' $activeSlave.skin
- <<option "pure white" "Pure White">>
- <<option "extremely pale" "Extremely Pale">>
- <<option "pale" "Pale">>
- <<option "extremely fair" "Extremely Fair">>
- <<option "very fair" "Very Fair">>
- <<option "fair" "Fair">>
- <<option "white" "White">>
- <<option "light" "Light">>
- <<option "lightened" "Lightened">>
- <<option "light olive" "Light Olive">>
- <<option "olive" "Olive">>
- <<option "natural" "Natural">>
- <<option "tanned" "Tanned">>
- <<option "bronzed" "Bronzed">>
- <<option "dark olive" "Dark Olive">>
- <<option "dark" "Dark">>
- <<option "light brown" "Light Brown">>
- <<option "brown" "Brown">>
- <<option "dark brown" "Dark Brown">>
- <<option "black" "Black">>
- <<option "ebony" "Ebony">>
- <<option "pure black" "Pure Black">>
+ <<option "pure white" "Pure White">>
+ <<option "ivory" "Ivory">>
+ <<option "white" "White">>
+ <<option "extremely pale" "Extremely Pale">>
+ <<option "very pale" "Very Pale">>
+ <<option "pale" "Pale">>
+ <<option "extremely fair" "Extremely Fair">>
+ <<option "very fair" "Very Fair">>
+ <<option "fair" "Fair">>
+ <<option "light" "Light">>
+ <<option "light olive" "Light Olive">>
+ <<option "tan" "Tan">>
+ <<option "olive" "Olive">>
+ <<option "bronze" "Bronze">>
+ <<option "dark olive" "Dark Olive">>
+ <<option "dark" "Dark">>
+ <<option "light beige" "Light Beige">>
+ <<option "beige" "Beige" >>
+ <<option "dark beige" "Dark Beige">>
+ <<option "light brown" "Light Brown">>
+ <<option "brown" "Brown">>
+ <<option "dark brown" "Dark Brown">>
+ <<option "black" "Black">>
+ <<option "ebony" "Ebony">>
+ <<option "pure black" "Pure Black">>
<<option>>
<<textbox2 "$activeSlave.skin" $activeSlave.skin "Starting Girls">>
<</options>>
@@ -1162,7 +1165,7 @@ __You are customizing this slave:__
//Anal virgins cannot be given anal skills//
<</options>>
<<else>>
- <<options $activeSlave.analSkill>>
+ <<options $activeSlave.skill.anal>>
''Anal sex:''
<<optionlte 10 0 "Unskilled">>Unskilled.
<<optionlte 30 15 "Basic">>@@.cyan;Basic.@@
@@ -1172,7 +1175,7 @@ __You are customizing this slave:__
<</if>>
<br>
-<<options $activeSlave.oralSkill>>
+<<options $activeSlave.skill.oral>>
''Oral sex:''
<<optionlte 10 0 "Unskilled">> Unskilled.
<<optionlte 30 15 "Basic">> @@.cyan;Basic.@@
@@ -1195,7 +1198,7 @@ __You are customizing this slave:__
//Must have a vagina to have vaginal skills//
<</options>>
<<else>>
- <<options $activeSlave.vaginalSkill>>
+ <<options $activeSlave.skill.vaginal>>
''Vaginal sex:''
<<optionlte 10 0 "Unskilled">>Unskilled.
<<optionlte 30 15 "Basic">>@@.cyan;Basic.@@
@@ -1205,7 +1208,7 @@ __You are customizing this slave:__
<</if>>
<br>
-<<options $activeSlave.whoreSkill>>
+<<options $activeSlave.skill.whore>>
''Prostitution:''
<<optionlte 10 0 "Unskilled">> Unskilled.
<<optionlte 30 15 "Basic">> @@.cyan;Basic.@@
@@ -1213,7 +1216,7 @@ __You are customizing this slave:__
<<optiondefault 65 "Expert">>@@.cyan;Expert.@@
<</options>>
-<<options $activeSlave.entertainSkill>>
+<<options $activeSlave.skill.entertainment>>
''Entertainment:''
<<optionlte 10 0 "Unskilled">> Unskilled.
<<optionlte 30 15 "Basic">> @@.cyan;Basic.@@
@@ -1222,17 +1225,17 @@ __You are customizing this slave:__
<</options>>
<br>
-<<options $activeSlave.combatSkill>>
+<<options $activeSlave.skill.combat>>
''Combat:''
<<option 0 "Unskilled">>Unskilled
<<option 1 "Skilled">>@@.cyan;Skilled.@@
<</options>>
<br>
-<<if $activeSlave.whoreSkill+$activeSlave.entertainSkill+$activeSlave.vaginalSkill+$activeSlave.analSkill+$activeSlave.oralSkill+($activeSlave.combatSkill*100) > 200>>
+<<if $activeSlave.skill.whore+$activeSlave.skill.entertainment+$activeSlave.skill.vaginal+$activeSlave.skill.anal+$activeSlave.skill.oral+($activeSlave.skill.combat*100) > 200>>
<<options>>
<<option>>
//@@.red;Starting slaves incur
- <<if $activeSlave.whoreSkill+$activeSlave.entertainSkill+$activeSlave.vaginalSkill+$activeSlave.analSkill+$activeSlave.oralSkill+($activeSlave.combatSkill*100) > 400>>
+ <<if $activeSlave.skill.whore+$activeSlave.skill.entertainment+$activeSlave.skill.vaginal+$activeSlave.skill.anal+$activeSlave.skill.oral+($activeSlave.skill.combat*100) > 400>>
a severe cost penalty at for being highly
<<else>>
an additional cost penalty for being
@@ -1596,14 +1599,14 @@ __You are customizing this slave:__
<<link "Cali Girl">>
<<set $archetyped = 1, $activeSlave.nationality = "American", $fixedNationality = "American">>
<<StartingGirlsWorkaround>>
- <<set $activeSlave.eyeColor = "blue", $activeSlave.skin = "tanned", $activeSlave.hColor = "blonde", $activeSlave.pubicHColor = "blonde", $activeSlave.markings = "none", $activeSlave.face = 95, $activeSlave.muscles = 20, $activeSlave.weight = -20, $activeSlave.height = Math.round(Height.forAge(190, $activeSlave))>>
+ <<set $activeSlave.eyeColor = "blue", $activeSlave.skin = "sun tanned", $activeSlave.override_Skin = 1, $activeSlave.hColor = "blonde", $activeSlave.pubicHColor = "blonde", $activeSlave.markings = "none", $activeSlave.face = 95, $activeSlave.muscles = 20, $activeSlave.weight = -20, $activeSlave.height = Math.round(Height.forAge(190, $activeSlave))>>
<<goto "Starting Girls">>
<</link>>
//Tall, taut, and tan//
<br>
<<link "Novice">>
<<StartingGirlsWorkaround>>
- <<set $activeSlave.analSkill = 0, $activeSlave.oralSkill = 0, $activeSlave.vaginalSkill = 0, $activeSlave.whoreSkill = 0, $activeSlave.entertainSkill = 0, $activeSlave.combatSkill = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0>>
+ <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whore = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0>>
<<goto "Starting Girls">>
<</link>>
//Train your own and save//
@@ -1618,14 +1621,14 @@ __You are customizing this slave:__
<br>
<<link "Wellspring">>
<<StartingGirlsWorkaround>>
- <<set $activeSlave.analSkill = 0, $activeSlave.oralSkill = 0, $activeSlave.vaginalSkill = 0, $activeSlave.whoreSkill = 0, $activeSlave.entertainSkill = 0, $activeSlave.combatSkill = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0, $activeSlave.health = 10, $activeSlave.intelligence = -100, $activeSlave.intelligenceImplant = 0, $activeSlave.vagina = 3, $activeSlave.anus = 3, $activeSlave.ovaries = 1, $activeSlave.dick = 5, $activeSlave.balls = 5, $activeSlave.prostate = 1, $activeSlave.lactation = 2, $activeSlave.lactationDuration = 2, $activeSlave.nipples = "huge", $activeSlave.boobs = 10000>>
+ <<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whore = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0, $activeSlave.health = 10, $activeSlave.intelligence = -100, $activeSlave.intelligenceImplant = 0, $activeSlave.vagina = 3, $activeSlave.anus = 3, $activeSlave.ovaries = 1, $activeSlave.dick = 5, $activeSlave.balls = 5, $activeSlave.prostate = 1, $activeSlave.lactation = 2, $activeSlave.lactationDuration = 2, $activeSlave.nipples = "huge", $activeSlave.boobs = 10000>>
<<goto "Starting Girls">>
<</link>>
//Capable of producing all kinds of useful fluids//
<br>
<<link "Onahole">>
<<StartingGirlsWorkaround>>
- <<set $activeSlave.analSkill = 0, $activeSlave.oralSkill = 0, $activeSlave.vaginalSkill = 0, $activeSlave.whoreSkill = 0, $activeSlave.entertainSkill = 0, $activeSlave.combatSkill = 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.whore = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetish = "mindbroken", $activeSlave.amp = 1, $activeSlave.voice = 0, $activeSlave.eyes = 1, $activeSlave.hears = 0>>
<<goto "Starting Girls">>
<</link>>
//A living cocksleeve//
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index dca3eb0fceb0736ad624170818ea0edc7ccfae16..d19764a7c3d9d20ee5d2646d1c0758125c6740af 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -146,12 +146,12 @@ armsTat: "$activeSlave.armsTat",
legsTat: "$activeSlave.legsTat",
backTat: "$activeSlave.backTat",
stampTat: "$activeSlave.stampTat",
-vaginalSkill: $activeSlave.vaginalSkill,
-oralSkill: $activeSlave.oralSkill,
-analSkill: $activeSlave.analSkill,
-whoreSkill: $activeSlave.whoreSkill,
-entertainSkill: $activeSlave.entertainSkill,
-combatSkill: $activeSlave.combatSkill,
+skill.vaginal: $activeSlave.skill.vaginal,
+skill.oral: $activeSlave.skill.oral,
+skill.anal: $activeSlave.skill.anal,
+skill.whore: $activeSlave.skill.whore,
+skill.entertainment: $activeSlave.skill.entertainment,
+skill.combat: $activeSlave.skill.combat,
livingRules: "$activeSlave.livingRules",
speechRules: "$activeSlave.speechRules",
releaseRules: "$activeSlave.releaseRules",
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index 60ec33b2b8d2b4803d239752781ae01bf558a99a..ae5a901d6a36162ea95b593e2d38338146ff5337 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -26,31 +26,31 @@ You tell $activeSlave.slaveName to
<<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment.
<<elseif ($activeSlave.relationship == -2)>>
- $He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
+ $He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
<<if $activeSlave.fetish == "mindbroken">>
- $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank <<= App.Desc.EyeColor>> eyes. $He doesn't react.
+ $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank <<= App.Desc.eyeColor>> eyes. $He doesn't react.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- $He happily complies, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+ $He happily complies, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- $He complies. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
+ $He complies. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
<<elseif $activeSlave.devotion < -20>>
- $He complies out of fear. Once $he's close, you hold $his shaking face in your palms and look into $his teary <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
+ $He complies out of fear. Once $he's close, you hold $his shaking face in your palms and look into $his teary <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
<<else>>
- $He complies obediently. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+ $He complies obediently. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
<</if>>
<<elseif ($activeSlave.devotion > 75)>>
- $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
+ $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
- $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> disconcerting, and $he looks down after a moment, blushing.
+ $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> disconcerting, and $he looks down after a moment, blushing.
<<elseif ($activeSlave.devotion > 20)>>
- $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> worrying, and $he looks down after a moment, blushing nervously.
+ $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> worrying, and $he looks down after a moment, blushing nervously.
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
- $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+ $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<elseif ($activeSlave.trust < -20)>>
- The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
+ The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
<<else>>
- $He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
+ $He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.eyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
<</if>>
You delicately lift $his head and touch your fingertips to $his chin, tenderly brushing along the line of $his mouth with your <<if $PC.title == 1>>manly<<else>>feminine<</if>> thumb.
@@ -71,17 +71,17 @@ Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<
<</if>> with your fingertips. You use your fingers and thumbs to slowly slide along $his mouth, $his chin, $his cheeks then around $his face. You use a deft touch to thoroughly explore the shape of $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face > 10>>nice<<elseif $activeSlave.face >= -10>>cute<<elseif $activeSlave.face >= -40>>fair<<else>>prominent<</if>> cheekbones. Grazing $his temple and brushing $his forehead simultaneously, you smoothly motion along $his eyelids and nose and you tenderly stroke $his face with both hands as you take $his head lightly and trace around it, gently massaging as you go. You work your way down, slowly and gradually, along $his neck with one hand, then the other, briefly pausing before continuing your path down to $his shoulders and<<if ($activeSlave.fetish != "mindbroken")>> $he starts to gasp as<<else>> starts to shudder as<</if>> you slide your hands down $his side, across $his back and along $his belly taking every moment to savor the contours of $his body before going back up again to $his face.
<<if ($activeSlave.fetish == "mindbroken")>>
- $His posture doesn't change. $He initially only reacts slightly to your physical touch but then stops reacting completely. When you stop, $his <<= App.Desc.EyeColor>> eyes track the movements of your hands briefly but then stare blankly ahead of $him, awaiting further use of $his body.
+ $His posture doesn't change. $He initially only reacts slightly to your physical touch but then stops reacting completely. When you stop, $his <<= App.Desc.eyeColor>> eyes track the movements of your hands briefly but then stare blankly ahead of $him, awaiting further use of $his body.
<<elseif ($activeSlave.relationship == -2)>>
- $His eyes gradually close and $he slowly leans $his head back, relaxing as $he feels your caress. $He gently gasps as $he feels your warm <<if $PC.title == 1>>manly<<else>>feminine<</if>> hand. When you finally stop gently caressing $him, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you, $he has an eager look on $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his face mimicking your last movements.<</if>> <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks as though $he wants much more than your mere caress.
+ $His eyes gradually close and $he slowly leans $his head back, relaxing as $he feels your caress. $He gently gasps as $he feels your warm <<if $PC.title == 1>>manly<<else>>feminine<</if>> hand. When you finally stop gently caressing $him, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you, $he has an eager look on $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his face mimicking your last movements.<</if>> <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate love with $his <<= App.Desc.eyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate love with $his <<= App.Desc.eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks as though $he wants much more than your mere caress.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- As you start to touch $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face > 10>>lovely<<elseif $activeSlave.face >= -10>>pretty<<elseif $activeSlave.face >= -40>>homely<<else>>ugly<</if>> face, $he smiles at you and takes your hand in $hers, following its movements. $He tries hard to stop $himself from losing $himself in your masterful hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate excitement with $his <<= App.Desc.EyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate excitement with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.<</if>> $He looks at you, $his eyes almost begging you to give $him more than your mere caress.
+ As you start to touch $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face > 10>>lovely<<elseif $activeSlave.face >= -10>>pretty<<elseif $activeSlave.face >= -40>>homely<<else>>ugly<</if>> face, $he smiles at you and takes your hand in $hers, following its movements. $He tries hard to stop $himself from losing $himself in your masterful hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate excitement with $his <<= App.Desc.eyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate excitement with $his <<= App.Desc.eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.<</if>> $He looks at you, $his eyes almost begging you to give $him more than your mere caress.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- $He stiffens at your touch but slowly relaxes to your fingers on $his face. As you move your fingers along $his lips, $he reacts almost as though $he's receiving oral. $He starts to gently suck your fingers, moaning into your hand and pressing $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you stop caressing $him. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.EyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s lustfully.<</if>> $He looks at you as if $he wants more than your hands touching $him.
+ $He stiffens at your touch but slowly relaxes to your fingers on $his face. As you move your fingers along $his lips, $he reacts almost as though $he's receiving oral. $He starts to gently suck your fingers, moaning into your hand and pressing $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you stop caressing $him. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.eyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s lustfully.<</if>> $He looks at you as if $he wants more than your hands touching $him.
<<elseif ($activeSlave.devotion > 50)>>
- $He accepts your touch with devotion, leaning $his head back at your gentle caress along $his face. $He leans $his body forward, pressing $himself against you, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. $He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightfully across $his face where you last touched $his<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.EyeColor>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate devotion with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s jubilantly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
+ $He accepts your touch with devotion, leaning $his head back at your gentle caress along $his face. $He leans $his body forward, pressing $himself against you, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. $He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightfully across $his face where you last touched $his<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s jubilantly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
<<elseif ($activeSlave.devotion > 20)>>
- $He accepts your touch willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch across $his face. When you finally move your hand away, $his <<= App.Desc.EyeColor>> eyes gaze into yours searchingly, looking for answers that are not there. <<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
+ $He accepts your touch willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch across $his face. When you finally move your hand away, $his <<= App.Desc.eyeColor>> eyes gaze into yours searchingly, looking for answers that are not there. <<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
$He shakes at your touch fearfully. As you move your hand along $his unresisting face, $his eagerness to avoid punishment leads $him to stiffen, $his nervousness is made apparent. You continue stroking $his cheek, enjoying $his fear, and the physical intimacy slowly does its work. $He starts to relax, $his resistance easing and $his eyes start to close. When finally move your hand away, $he looks at you for a long moment, $his eyes darting up at you, before visibly catching $himself with a reminder that $he's a slave and you're $his owner. <<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
<<elseif ($activeSlave.trust < -50)>>
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index d5d5d37e70056fef426adec9400152fc4589efc4..90eda24b6d164b1ac42ca4f560873e598e1cad8f 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -14,31 +14,31 @@ You tell $activeSlave.slaveName to
<<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
$He complies automatically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment.
<<elseif ($activeSlave.relationship == -2)>>
- $He excitedly complies, happy to be near the object of $his longing. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
+ $He excitedly complies, happy to be near the object of $his longing. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
<<if $activeSlave.fetish == "mindbroken">>
- $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank <<= App.Desc.EyeColor>> eyes. $He shows no reaction.
+ $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank <<= App.Desc.eyeColor>> eyes. $He shows no reaction.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- $He lovingly complies, hurrying to come close to the _womanP who married $him. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+ $He lovingly complies, hurrying to come close to the _womanP who married $him. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- $He complies. Once $he's close, you take your reluctant wife's head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
+ $He complies. Once $he's close, you take your reluctant wife's head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
<<elseif $activeSlave.devotion < -20>>
- $He complies out of fear. Once $he's close, you take your unwilling wife's head in your hands and gaze deeply into $his teary <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
+ $He complies out of fear. Once $he's close, you take your unwilling wife's head in your hands and gaze deeply into $his teary <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
<<else>>
- $He complies obediently. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+ $He complies obediently. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
<</if>>
<<elseif ($activeSlave.devotion > 75)>>
- $He elatedly complies, joyful at being near to you. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
+ $He elatedly complies, joyful at being near to you. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
- $He dotingly complies, being near you filling $him with delight. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
+ $He dotingly complies, being near you filling $him with delight. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
<<elseif ($activeSlave.devotion > 20)>>
- $He joyfully complies, happy to be near you. Once $he's close, you you take $his willing head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
+ $He joyfully complies, happy to be near you. Once $he's close, you you take $his willing head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
- $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take $his head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+ $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take $his head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<elseif ($activeSlave.trust < -20)>>
- The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you take $his trembling head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes for a moment. $He looks down fearfully, and begins to shake with terror, tears streaking down $his cheeks.
+ The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you take $his trembling head in your hands and gaze deeply into $his <<= App.Desc.eyeColor>> eyes for a moment. $He looks down fearfully, and begins to shake with terror, tears streaking down $his cheeks.
<<else>>
- $He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you take a moment to gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
+ $He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you take a moment to gaze deeply into $his <<= App.Desc.eyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
<</if>>
You walk around $him and put your hands around $his abdomen,<<if ($activeSlave.amp != 1)>> to gently pull $him close towards you<<else>> moving close towards $him on your desk<</if>> and then wrap your arms around $his shoulders.<<if ($activeSlave.amp != 1)>> When you press your hips against $hers,<<else>> You use your arms to prop $him up against you,<</if>> <<if ($activeSlave.trust > 20)>>letting $him lean while taking the weight of $his against you<<else>>$he tries to lean away from you, pushing against your arms<</if>>. You lovingly squeeze $him in your long, cradling embrace.
@@ -63,24 +63,24 @@ You walk around $him and put your hands around $his abdomen,<<if ($activeSlave.a
<</if>>
<<if ($activeSlave.fetish == "mindbroken")>>
- $His posture doesn't change. $He initially only reacts slightly to your physical touch but eventually $he relaxes in the warmth of your embrace against $him. You know that this may only be a physiological reaction, nothing more. For a brief moment you think you detect a spark of life in $his dull eyes but just as quickly, it is gone. When you stop, $his <<= App.Desc.EyeColor>> eyes track the movements of your hands briefly but then $he stares blankly ahead of $him, not understanding what is happening.
+ $His posture doesn't change. $He initially only reacts slightly to your physical touch but eventually $he relaxes in the warmth of your embrace against $him. You know that this may only be a physiological reaction, nothing more. For a brief moment you think you detect a spark of life in $his dull eyes but just as quickly, it is gone. When you stop, $his <<= App.Desc.eyeColor>> eyes track the movements of your hands briefly but then $he stares blankly ahead of $him, not understanding what is happening.
<<elseif ($activeSlave.relationship == -2)>>
- In the warmth of your embrace, $he turns towards you, $his passionate <<= App.Desc.EyeColor>> eyes staring intently at your face. $He leans closer to you and kisses you as you hold $him. $His heart beats faster and then gradually slows as $he grows accustomed to your body against $hers. Eventually, $he relaxes totally and $his eyes gradually close, melting in your arms. When you finally stop and relax your embrace, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you with a blissful look on $his face. <<if ($activeSlave.amp != 1)>> $His hand reaches to your arms and $he strokes them longingly.<</if>> <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks at you, almost begging you with $his eyes that $he wants much more than a mere embrace.
+ In the warmth of your embrace, $he turns towards you, $his passionate <<= App.Desc.eyeColor>> eyes staring intently at your face. $He leans closer to you and kisses you as you hold $him. $His heart beats faster and then gradually slows as $he grows accustomed to your body against $hers. Eventually, $he relaxes totally and $his eyes gradually close, melting in your arms. When you finally stop and relax your embrace, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you with a blissful look on $his face. <<if ($activeSlave.amp != 1)>> $His hand reaches to your arms and $he strokes them longingly.<</if>> <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate love with $his <<= App.Desc.eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks at you, almost begging you with $his eyes that $he wants much more than a mere embrace.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
In your soft, warm embrace, $he tries hard to stop $himself from losing $himself in your arms.
<<if ($activeSlave.amp != 1)>> $He starts to embrace you in $his arms as well. When you gently squeeze $him in your arms, $he breathes more heavily and starts to lovingly squeeze you as well, $his tendency towards sexual dominance encouraging $him to compete with you in embraces against each other.
<<else>> When you gently squeeze $him in your arms, $he breathes more heavily before relaxing against you.
<</if>>
When you finally stop and relax your embrace, $his eyes are closed and $he's smiling blissfully.
- <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate excitement with $his <<= App.Desc.EyeColor>> eyes.
+ <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate excitement with $his <<= App.Desc.eyeColor>> eyes.
<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.
<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.
<</if>>
$He eagerly looks at you, $his eyes almost seem to say that $he wants you to give $his <<Master>> more than a mere hug.
<<elseif ($activeSlave.devotion > 50)>>
- $He sighs devotedly in your arms and slowly relaxes. $He turns towards you, $his doting <<= App.Desc.EyeColor>> eyes staring intently at your face. You feel $his heart beating faster against your chest as you softly squeeze your arms tighter. $His hands reach to your arms and $he strokes them longingly as you squeeze. $He gradually closes $his eyes as $he leans $his body against yours, melting in your warm embrace, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally stop, <<if ($activeSlave.amp != 1)>>$he reaches to your face with $his hand and gently strokes your cheek<<else>>$he turns to you<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.EyeColor>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He does $his best to communicate devotion with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s elatedly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than a mere embrace.
+ $He sighs devotedly in your arms and slowly relaxes. $He turns towards you, $his doting <<= App.Desc.eyeColor>> eyes staring intently at your face. You feel $his heart beating faster against your chest as you softly squeeze your arms tighter. $His hands reach to your arms and $he strokes them longingly as you squeeze. $He gradually closes $his eyes as $he leans $his body against yours, melting in your warm embrace, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally stop, <<if ($activeSlave.amp != 1)>>$he reaches to your face with $his hand and gently strokes your cheek<<else>>$he turns to you<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s elatedly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than a mere embrace.
<<elseif ($activeSlave.devotion > 20)>>
- $He willingly gives $himself up to your embracing arms. As you are so close to $him, you sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your soft embrace against $his body. $He gradually closes $his eyes in the feeling of your gentle arms. When you finally stop and relax your embrace, $his <<= App.Desc.EyeColor>> eyes open to gaze puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this non-sexual physical contact. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
+ $He willingly gives $himself up to your embracing arms. As you are so close to $him, you sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your soft embrace against $his body. $He gradually closes $his eyes in the feeling of your gentle arms. When you finally stop and relax your embrace, $his <<= App.Desc.eyeColor>> eyes open to gaze puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this non-sexual physical contact. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
$He shakes at your touch fearfully. As you softly press $his trembling body against you, $his eagerness to avoid punishment leads $him to stiffen in your arms. While $he continues to shudder, you continue embracing $him, enjoying $his fear, and the physical intimacy slowly does its work. $He starts to relax, $his resistance easing and $his eyes start to close. When you relax your arms for a moment, $he opens $his eyes to look at you for a long moment, $his eyes darting up to your face, before visibly catching $himself with a reminder that $he's a slave and you're $his owner. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
<<elseif ($activeSlave.trust < -50)>>
diff --git a/src/player/actions/fondleBoobs.tw b/src/player/actions/fondleBoobs.tw
index b6b6afea21575667ba37d78d1e8b80e53730b74c..0c50d48bac79e9193a218e77ab4af3f84cdc3e1d 100644
--- a/src/player/actions/fondleBoobs.tw
+++ b/src/player/actions/fondleBoobs.tw
@@ -150,15 +150,15 @@ You call $him over so you can fondle $his
<</if>>
You both alternate between taking your mouth to $his<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples and $hers to yours, gently nuzzling and nibbling while simultaneously fondling each other all the while. Both of you continue to passionately lick, nibble, stroke and fondle one other until tiredly, $he slows down. When you eventually stop, $he looks up at you happily.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>, since $he does not speak $language well enough to express $himself.
+ $He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>.
+ $He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he liked that.
<<else>>
"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.
<</if>>
- $He looks at you with $his <<= App.Desc.EyeColor>> eyes, smiling.
+ $He looks at you with $his <<= App.Desc.eyeColor>> eyes, smiling.
<<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
$He eagerly comes over to you, to stand between you and your desk. You lean over while $he submissively lies down upon it, face up, with $his breasts pointed to the air. You place your hands on $his
<<if ($activeSlave.boobs >= 20000)>>
@@ -199,9 +199,9 @@ You call $him over so you can fondle $his
<</if>>
$He moans passionately at the continued stimulation of $his breasts and nipples. When you finally stop, $he reaches up to your face with $his hand and lovingly strokes it, a blissful look on $his $activeSlave.skin face.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
+ $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
- $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>.
+ $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.
<<else>>
@@ -248,9 +248,9 @@ You call $him over so you can fondle $his
<</if>>
$He moans passionately at the continued punishment of $his breasts and nipples. Your rough play leaves red marks on $his breasts and nipples and $he becomes even more aroused. When you finally stop $he rubs the marks on $his breasts with $his hands, an ecstatic look on $his $activeSlave.skin face.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate pleasure with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
+ $He does $his best to communicate pleasure with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
- $He does $his best to communicate $his pleasure with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>.
+ $He does $his best to communicate $his pleasure with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves it.
<<else>>
@@ -258,7 +258,7 @@ You call $him over so you can fondle $his
<</if>>
$He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you longingly, hungry for more.
<<elseif ($activeSlave.devotion > 50)>>
- $He devotedly comes over to you, to stand between you and your desk. $His doting <<= App.Desc.EyeColor>> eyes looking in yours. You place your hands on $his
+ $He devotedly comes over to you, to stand between you and your desk. $His doting <<= App.Desc.eyeColor>> eyes looking in yours. You place your hands on $his
<<if ($activeSlave.boobs >= 20000)>>
colossal tits, before sinking your body into their immense softness,
<<elseif ($activeSlave.boobs >= 10000)>>
@@ -297,9 +297,9 @@ You call $him over so you can fondle $his
<</if>>
$He moans passionately at the continued stimulation of $his breasts and nipples. When you finally stop, $he reaches up to your face with $his hand and lovingly strokes it, a blissful look on $his $activeSlave.skin face.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
+ $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
- $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>.
+ $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s euphorically.
<</if>>
@@ -342,7 +342,7 @@ You call $him over so you can fondle $his
<<else>>
Moving your head close to $his breasts, you nuzzle on a nipple slit with your lips and even lick it delicately with your tongue. Then you alternate, gently probing the depths of the other nipple. You dig deep into both $his breasts, teasing what was once the tips of $his<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples with your fingers before vigorously fingering $his tits.
<</if>>
- You sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your hands on $his breasts. $He gradually loses $himself in the feeling of your gentle hands. When you finally stop, $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes gaze<<else>>face gazes<</if>> puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this.
+ You sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your hands on $his breasts. $He gradually loses $himself in the feeling of your gentle hands. When you finally stop, $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes gaze<<else>>face gazes<</if>> puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this.
<<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
<<elseif !canTalk($activeSlave)>>
@@ -373,7 +373,7 @@ You call $him over so you can fondle $his
<<else>>
playing with $his<<if ($activeSlave.lactation > 0)>> milky<</if>> $activeSlave.nipples nipples so that they become sodden with fluid around your fingers. You plunge the depths of $his nipple cunts and vigorously work the unusual orifice. When you finally withdraw from $his nipples<<if ($activeSlave.lactation > 0)>>, a stream of pent-up milk flows out after you and<<else>>,<</if>> $he lets out a gasp.
<</if>>
- $His body softens as <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes dart up to your face, before visibly catching $himself with a reminder<<else>>$he remembers<</if>> that $he's a slave and you're $his owner. When you finally stop, $he shivers but says nothing, uneasy at what you are going to do next.
+ $His body softens as <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor>> eyes dart up to your face, before visibly catching $himself with a reminder<<else>>$he remembers<</if>> that $he's a slave and you're $his owner. When you finally stop, $he shivers but says nothing, uneasy at what you are going to do next.
<<elseif ($activeSlave.trust < -50)>>
$He is nearly frozen with fear, and does not resist as you start to massage $his
<<if ($activeSlave.boobs >= 20000)>>
diff --git a/src/player/actions/fondleButt.tw b/src/player/actions/fondleButt.tw
index 99ce965ea17789a2548422bf1c65ad5a14cf4405..8049725327c4c3d6741b1421540f868648dcc1de 100644
--- a/src/player/actions/fondleButt.tw
+++ b/src/player/actions/fondleButt.tw
@@ -142,7 +142,7 @@ as well as $his
<</if>>
buttocks a gentle smack. $He turns to face you, kissing you, but looking at you longingly as if $he wants more.
<<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
- $He does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes.
+ $He does $his best to communicate love with $his <<= App.Desc.eyeColor>> eyes.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>> "I love you,
diff --git a/src/player/actions/fondleVagina.tw b/src/player/actions/fondleVagina.tw
index d4ac299a2ddccd3c69f18eee5e4dc829d8ed7900..68e6f6241cc446605dd56bdf7bebcfb1673e6ec7 100644
--- a/src/player/actions/fondleVagina.tw
+++ b/src/player/actions/fondleVagina.tw
@@ -113,7 +113,7 @@ You call $him over so you can fondle $his
<</if>>
and rub it with your fingertips as your hand nears it. As $he becomes more aroused, $he grabs hold of your wrist lightly, moving $his hands along with the motion of your own. $His pussy juices run down $his leg as $he begins to moan audibly<<if ($activeSlave.amp != 1)>>, gently clamping your hand between $his thighs<</if>> as you continue to move your hand along $his pussy. $He moans loudly as $he shudders in orgasmic joy.
<<if (($activeSlave.amp == 1) && !canTalk($activeSlave))>>
- $He does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes.
+ $He does $his best to communicate love with $his <<= App.Desc.eyeColor>> eyes.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>> "I love you,
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index c4ce02e241f84cac57a4a6442dd32b3497042c75..364e7b2b8d41e8cb45157169cd2728fb1038a0cb 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -72,6 +72,8 @@
<<capture _ap>>
<br>
Ova: $activeSlave.womb[_ap].genetics.name
+ <br>
+ Age: $activeSlave.womb[_ap].age
<<if $geneticMappingUpgrade == 1>>
<br>
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index e3638da4bb35d81235c1b3756a5491762eb7323f..12ceb387b20e5449ed1507ffbffcba3548766e77 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -58,75 +58,83 @@ You're @@.orange;$PC.actualAge years old.@@
You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original skin tone was $PC.origSkin.<</if>>
<br>
<<if $PC.skin != $PC.origSkin>>
- [[Restore natural color|PC Surgery Degradation][$PC.skin = $PC.origSkin, cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Restore natural color|PC Surgery Degradation][$PC.skin = $PC.origSkin, cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "pure white">>
- [[Pure White|PC Surgery Degradation][$PC.skin = "pure white", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Pure White|PC Surgery Degradation][$PC.skin = "pure white", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<<if $PC.skin != "ivory">>
+ [[Ivory|PC Surgery Degradation][$PC.skin = "ivory", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "white">>
+ [[White|PC Surgery Degradation][$PC.skin = "white", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "extremely pale">>
- [[Extremely Pale|PC Surgery Degradation][$PC.skin = "extremely pale", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Extremely Pale|PC Surgery Degradation][$PC.skin = "extremely pale", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "very pale">>
+ [[Very Pale|PC Surgery Degradation][$PC.skin = "very pale", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "pale">>
- [[Pale|PC Surgery Degradation][$PC.skin = "pale", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Pale|PC Surgery Degradation][$PC.skin = "pale", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "extremely fair">>
- [[Extremely Fair|PC Surgery Degradation][$PC.skin = "extremely fair", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Extremely Fair|PC Surgery Degradation][$PC.skin = "extremely fair", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "very fair">>
- [[Very Fair|PC Surgery Degradation][$PC.skin = "very fair", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Very Fair|PC Surgery Degradation][$PC.skin = "very fair", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "fair">>
- [[Fair|PC Surgery Degradation][$PC.skin = "fair", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
-<</if>>
-<<if $PC.skin != "white">>
- [[White|PC Surgery Degradation][$PC.skin = "white", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Fair|PC Surgery Degradation][$PC.skin = "fair", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "light">>
- [[Light|PC Surgery Degradation][$PC.skin = "light", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
-<</if>>
-<<if $PC.skin != "lightened">>
- [[Lightened|PC Surgery Degradation][$PC.skin = "lightened", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Light|PC Surgery Degradation][$PC.skin = "light", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "light olive">>
- [[Light Olive|PC Surgery Degradation][$PC.skin = "light olive", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Light Olive|PC Surgery Degradation][$PC.skin = "light olive", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
-<<if $PC.skin != "olive">>
- [[Olive|PC Surgery Degradation][$PC.skin = "olive", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
-<</if>>
-<<if $PC.skin != "natural">>
- [[Natural|PC Surgery Degradation][$PC.skin = "natural", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+<<if $PC.skin != "tan">>
+ [[Tan|PC Surgery Degradation][$PC.skin = "tan", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
-<<if $PC.skin != "tanned">>
- [[Tanned|PC Surgery Degradation][$PC.skin = "tanned", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+<<if $PC.skin != "olive">>
+ [[Olive|PC Surgery Degradation][$PC.skin = "olive", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
-<<if $PC.skin != "bronzed">>
- [[Bronzed|PC Surgery Degradation][$PC.skin = "bronzed", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+<<if $PC.skin != "bronze">>
+ [[Bronze|PC Surgery Degradation][$PC.skin = "bronze", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark olive">>
- [[Dark Olive|PC Surgery Degradation][$PC.skin = "dark olive", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Dark Olive|PC Surgery Degradation][$PC.skin = "dark olive", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark">>
- [[Dark|PC Surgery Degradation][$PC.skin = "dark", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Dark|PC Surgery Degradation][$PC.skin = "dark", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "light beige">>
+ [[Light Beige|PC Surgery Degradation][$PC.skin = "light beige", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "beige">>
+ [[Beige|PC Surgery Degradation][$PC.skin = "beige", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "dark beige">>
+ [[Dark Beige|PC Surgery Degradation][$PC.skin = "dark beige", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "light brown">>
- [[Light Brown|PC Surgery Degradation][$PC.skin = "light brown", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Light Brown|PC Surgery Degradation][$PC.skin = "light brown", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "brown">>
- [[Brown|PC Surgery Degradation][$PC.skin = "brown", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Brown|PC Surgery Degradation][$PC.skin = "brown", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark brown">>
- [[Dark Brown|PC Surgery Degradation][$PC.skin = "dark brown", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Dark Brown|PC Surgery Degradation][$PC.skin = "dark brown", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "black">>
- [[Black|PC Surgery Degradation][$PC.skin = "black", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Black|PC Surgery Degradation][$PC.skin = "black", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "ebony">>
- [[Ebony|PC Surgery Degradation][$PC.skin = "ebony", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Ebony|PC Surgery Degradation][$PC.skin = "ebony", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "pure black">>
- [[Pure Black|PC Surgery Degradation][$PC.skin = "pure black", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Pure Black|PC Surgery Degradation][$PC.skin = "pure black", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]]
<</if>>
-[[Custom Color|PC Skin Workaround][cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]]
+[[Custom Color|PC Skin Workaround][cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]]
<br><br>"Maybe some breast work? I assure you they are lovely." She says as she brushes the back of your head with her own pair. "@@.yellowgreen;<<print cashFormat(5000)>>@@ for a reduction, @@.yellowgreen;<<print cashFormat(10000)>>@@ for implants, that includes size ups, and @@.yellowgreen;<<print cashFormat(15000)>>@@ for additional breast tissue. That last one might as well be real!<<if $PC.boobsBonus <= 0>> With a little work, we can even remove a small amount of fat from your breasts to bring your cup size down without damaging their inner workings. Though we'll have to build them up some before we can stick reasonable implants into you.<</if>>"<br>
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 9cc9f17549fab6efcf2b28c48abec7d7f5aeb74e..3d1730ed59840c699a0f8706864b1c8e847bd50e 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -183,16 +183,16 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $activeSlave.makeup = 2>>
<<set $activeSlave.nails = 1>>
<<if $activeSlave.vagina == 0>>
- <<set $activeSlave.vaginalSkill = 30>>
+ <<set $activeSlave.skill.vaginal = 30>>
<<else>>
- <<set $activeSlave.vaginalSkill = 100>>
+ <<set $activeSlave.skill.vaginal = 100>>
<</if>>
<<if $activeSlave.anus == 0>>
- <<set $activeSlave.analSkill = 10>>
+ <<set $activeSlave.skill.anal = 10>>
<<else>>
- <<set $activeSlave.analSkill = 70>>
+ <<set $activeSlave.skill.anal = 70>>
<</if>>
-<<set $activeSlave.oralSkill = 100>>
+<<set $activeSlave.skill.oral = 100>>
<<set $activeSlave.chastityVagina = 1>>
<<set $activeSlave.intelligence = random(51,100)>>
<<set $activeSlave.attrKnown = 1>>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index 217375157a756110bad97acd413bc07e60455148..2e410e966d6969565fe3ff24990064189996c198 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -153,8 +153,8 @@
<<set $activeSlave.weight = random(10,75)>>
<<set $activeSlave.intelligence = random(70,100)>>
<<set $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.health = random(60,75)>>
<<set $activeSlave.canRecruit = 0>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
@@ -199,8 +199,8 @@
<<set $activeSlave.weight = random(-30,75)>>
<<set $activeSlave.intelligence = random(0,60)>>
<<set $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.health = random(60,75)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index 0c80bc675a7cc29232df385faf2fbabe6c4bda62..2264e05cbce0a89e33381bb46d715897d4341ecb 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -6,40 +6,40 @@
<<set _footSeed = random(1,100)>>
<<if $activeSlave.weight > 190>>
- <<set _thighs = 'massive flabby'>>
+ <<set _thighs = "massive flabby">>
<<elseif $activeSlave.weight > 160>>
- <<set _thighs = 'thick flabby'>>
+ <<set _thighs = "thick flabby">>
<<elseif $activeSlave.weight > 130>>
- <<set _thighs = 'flabby'>>
+ <<set _thighs = "flabby">>
<<elseif $activeSlave.weight > 95>>
- <<set _thighs = 'fat'>>
+ <<set _thighs = "fat">>
<<elseif $activeSlave.weight > 30>>
<<if $activeSlave.muscles > 75>>
- <<set _thighs = 'toned fat'>>
+ <<set _thighs = "toned fat">>
<<elseif $activeSlave.muscles < 15>>
- <<set _thighs = 'fat'>>
+ <<set _thighs = "fat">>
<<else>>
- <<set _thighs = 'plush'>>
+ <<set _thighs = "plush">>
<</if>>
<<elseif $activeSlave.weight > 10>>
<<if $activeSlave.muscles > 70>>
- <<set _thighs = 'thick muscular'>>
+ <<set _thighs = "thick muscular">>
<<elseif $activeSlave.muscles > 20>>
- <<set _thighs = 'soft toned'>>
+ <<set _thighs = "soft toned">>
<<else>>
- <<set _thighs = 'soft'>>
+ <<set _thighs = "soft">>
<</if>>
<<elseif $activeSlave.weight >= -10>>
<<if $activeSlave.muscles > 70>>
- <<set _thighs = 'muscular'>>
+ <<set _thighs = "muscular">>
<<elseif $activeSlave.muscles > 20>>
- <<set _thighs = 'toned'>>
+ <<set _thighs = "toned">>
<<else>>
- <<set _thighs = 'average'>>
+ <<set _thighs = "average">>
<</if>>
<<elseif $activeSlave.weight >= -30>>
<<if $activeSlave.muscles > 40>>
- <<set _thighs = 'thin muscular'>>
+ <<set _thighs = "thin muscular">>
<<elseif $activeSlave.muscles > 20>>
<<set _thighs = "toned model's">>
<<else>>
@@ -47,9 +47,9 @@
<</if>>
<<else>>
<<if $activeSlave.muscles > 5>>
- <<set _thighs = 'emaciated toned'>>
+ <<set _thighs = "emaciated toned">>
<<else>>
- <<set _thighs = 'emaciated'>>
+ <<set _thighs = "emaciated">>
<</if>>
<</if>>
@@ -60,163 +60,163 @@
<</if>>
<<if $activeSlave.height >= 185>>
- <<set _legs = 'wonderfully long'>>
+ <<set _legs = "wonderfully long">>
<<elseif $activeSlave.height >= 170>>
- <<set _legs = 'long'>>
+ <<set _legs = "long">>
<<elseif $activeSlave.height >= 160>>
- <<set _legs = 'nice'>>
+ <<set _legs = "nice">>
<<elseif $activeSlave.height >= 150>>
- <<set _legs = 'short'>>
+ <<set _legs = "short">>
<<else>>
- <<set _legs = 'short little'>>
+ <<set _legs = "short little">>
<</if>>
<<if $activeSlave.boobs >= 30000>>
- <<set _boobsa = 'skip'>>
- <<set _boobs = 'room filling'>>
+ <<set _boobsa = "skip">>
+ <<set _boobs = "room filling">>
<<elseif $activeSlave.boobs >= 20000>>
- <<set _boobsa = 'beanbag sized'>>
+ <<set _boobsa = "beanbag sized">>
<<elseif $activeSlave.boobs >= 8500>>
- <<set _boobsa = 'obscenely massive'>>
+ <<set _boobsa = "obscenely massive">>
<<elseif $activeSlave.boobs >= 8000>>
- <<set _boobsa = 'Z-cup'>>
+ <<set _boobsa = "Z-cup">>
<<elseif $activeSlave.boobs >= 7500>>
- <<set _boobsa = 'Y-cup'>>
+ <<set _boobsa = "Y-cup">>
<<elseif $activeSlave.boobs >= 7000>>
- <<set _boobsa = 'X-cup'>>
+ <<set _boobsa = "X-cup">>
<<elseif $activeSlave.boobs >= 6500>>
- <<set _boobsa = 'V-cup'>>
+ <<set _boobsa = "V-cup">>
<<elseif $activeSlave.boobs >= 5500>>
- <<set _boobsa = 'U-cup'>>
+ <<set _boobsa = "U-cup">>
<<elseif $activeSlave.boobs >= 5100>>
- <<set _boobsa = 'T-cup'>>
+ <<set _boobsa = "T-cup">>
<<elseif $activeSlave.boobs >= 4700>>
- <<set _boobsa = 'S-cup'>>
+ <<set _boobsa = "S-cup">>
<<elseif $activeSlave.boobs >= 4300>>
- <<set _boobsa = 'R-cup'>>
+ <<set _boobsa = "R-cup">>
<<elseif $activeSlave.boobs >= 3950>>
- <<set _boobsa = 'Q-cup'>>
+ <<set _boobsa = "Q-cup">>
<<elseif $activeSlave.boobs >= 3600>>
- <<set _boobsa = 'P-cup'>>
+ <<set _boobsa = "P-cup">>
<<elseif $activeSlave.boobs >= 3250>>
- <<set _boobsa = 'O-cup'>>
+ <<set _boobsa = "O-cup">>
<<elseif $activeSlave.boobs >= 2900>>
- <<set _boobsa = 'N-cup'>>
+ <<set _boobsa = "N-cup">>
<<elseif $activeSlave.boobs >= 2600>>
- <<set _boobsa = 'M-cup'>>
+ <<set _boobsa = "M-cup">>
<<elseif $activeSlave.boobs >= 2300>>
- <<set _boobsa = 'L-cup'>>
+ <<set _boobsa = "L-cup">>
<<elseif $activeSlave.boobs >= 2050>>
- <<set _boobsa = 'K-cup'>>
+ <<set _boobsa = "K-cup">>
<<elseif $activeSlave.boobs >= 1800>>
- <<set _boobsa = 'J-cup'>>
+ <<set _boobsa = "J-cup">>
<<elseif $activeSlave.boobs >= 1600>>
- <<set _boobsa = 'I-cup'>>
+ <<set _boobsa = "I-cup">>
<<elseif $activeSlave.boobs >= 1400>>
- <<set _boobsa = 'H-cup'>>
+ <<set _boobsa = "H-cup">>
<<elseif $activeSlave.boobs >= 1200>>
- <<set _boobsa = 'G-cup'>>
+ <<set _boobsa = "G-cup">>
<<elseif $activeSlave.boobs >= 1000>>
- <<set _boobsa = 'F-cup'>>
+ <<set _boobsa = "F-cup">>
<<elseif $activeSlave.boobs >= 800>>
- <<set _boobsa = 'DD-cup'>>
+ <<set _boobsa = "DD-cup">>
<<elseif $activeSlave.boobs >= 650>>
- <<set _boobsa = 'D-cup'>>
+ <<set _boobsa = "D-cup">>
<<elseif $activeSlave.boobs >= 400>>
- <<set _boobsa = 'C-cup'>>
+ <<set _boobsa = "C-cup">>
<<elseif $activeSlave.boobs >= 300>>
- <<set _boobsa = 'B-cup'>>
+ <<set _boobsa = "B-cup">>
<<else>>
- <<set _boobsa = 'skip'>>
- <<set _boobs = 'flat'>>
+ <<set _boobsa = "skip">>
+ <<set _boobs = "flat">>
<</if>>
<<if _boobsa != "skip">>
<<set _boobs = "_boobsa $activeSlave.boobShape">>
<</if>>
<<if $activeSlave.balls == 1>>
- <<set _balls = 'vestigial'>>
+ <<set _balls = "vestigial">>
<<elseif $activeSlave.balls == 2>>
- <<set _balls = 'small'>>
+ <<set _balls = "small">>
<<elseif $activeSlave.balls == 3>>
- <<set _balls = 'average'>>
+ <<set _balls = "average">>
<<elseif $activeSlave.balls == 4>>
- <<set _balls = 'large'>>
+ <<set _balls = "large">>
<<elseif $activeSlave.balls == 5>>
- <<set _balls = 'massive'>>
+ <<set _balls = "massive">>
<<elseif $activeSlave.balls == 6>>
- <<set _balls = 'huge'>>
+ <<set _balls = "huge">>
<<elseif $activeSlave.balls == 7>>
- <<set _balls = 'giant'>>
+ <<set _balls = "giant">>
<<elseif $activeSlave.balls == 8>>
- <<set _balls = 'enormous'>>
+ <<set _balls = "enormous">>
<<elseif $activeSlave.balls == 9>>
- <<set _balls = 'monstrous'>>
+ <<set _balls = "monstrous">>
<<else>>
- <<set _balls = 'overly massive'>>
+ <<set _balls = "overly massive">>
<</if>>
<<if $activeSlave.dick == 1>>
- <<set _dick = 'tiny'>>
+ <<set _dick = "tiny">>
<<elseif $activeSlave.dick == 2>>
- <<set _dick = 'little'>>
+ <<set _dick = "little">>
<<elseif $activeSlave.dick == 3>>
- <<set _dick = 'average'>>
+ <<set _dick = "average">>
<<elseif $activeSlave.dick == 4>>
- <<set _dick = 'big'>>
+ <<set _dick = "big">>
<<elseif $activeSlave.dick == 5>>
- <<set _dick = 'huge'>>
+ <<set _dick = "huge">>
<<elseif $activeSlave.dick == 6>>
- <<set _dick = 'gigantic'>>
+ <<set _dick = "gigantic">>
<<elseif $activeSlave.dick == 7>>
- <<set _dick = 'massive'>>
+ <<set _dick = "massive">>
<<elseif $activeSlave.dick == 8>>
- <<set _dick = 'horse-sized'>>
+ <<set _dick = "horse-sized">>
<<elseif $activeSlave.dick == 9>>
- <<set _dick = 'monstrous'>>
+ <<set _dick = "monstrous">>
<<elseif $activeSlave.dick == 10>>
- <<set _dick = 'inhuman'>>
+ <<set _dick = "inhuman">>
<<else>>
- <<set _dick = 'hypertrophied'>>
+ <<set _dick = "hypertrophied">>
<</if>>
<<if $activeSlave.butt < 1>>
- <<set _butt = 'flat'>>
+ <<set _butt = "flat">>
<<elseif $activeSlave.butt < 2>>
- <<set _butt = 'small'>>
+ <<set _butt = "small">>
<<elseif $activeSlave.butt < 3>>
- <<set _butt = 'plump'>>
+ <<set _butt = "plump">>
<<elseif $activeSlave.butt < 4>>
- <<set _butt = 'big bubble'>>
+ <<set _butt = "big bubble">>
<<elseif $activeSlave.butt < 5>>
- <<set _butt = 'huge'>>
+ <<set _butt = "huge">>
<<elseif $activeSlave.butt < 6>>
- <<set _butt = 'enormous'>>
+ <<set _butt = "enormous">>
<<elseif $activeSlave.butt < 7>>
- <<set _butt = 'gigantic'>>
+ <<set _butt = "gigantic">>
<<elseif $activeSlave.butt < 8>>
- <<set _butt = 'ridiculous'>>
+ <<set _butt = "ridiculous">>
<<elseif $activeSlave.butt < 10>>
- <<set _butt = 'immense'>>
+ <<set _butt = "immense">>
<<else>>
- <<set _butt = 'inhuman'>>
+ <<set _butt = "inhuman">>
<</if>>
<<if $activeSlave.hips > 2>>
- <<set _hips = 'inhumanly wide'>>
+ <<set _hips = "inhumanly wide">>
<<elseif $activeSlave.hips > 1>>
- <<set _hips = 'very wide'>>
+ <<set _hips = "very wide">>
<<elseif $activeSlave.hips > 0>>
- <<set _hips = 'wide'>>
+ <<set _hips = "wide">>
<<elseif $activeSlave.hips > -1>>
- <<set _hips = 'ample'>>
+ <<set _hips = "ample">>
<<elseif $activeSlave.hips > -2>>
- <<set _hips = 'narrow'>>
+ <<set _hips = "narrow">>
<<else>>
- <<set _hips = 'very narrow'>>
+ <<set _hips = "very narrow">>
<</if>>
-<<if ($activeSlave.skin == $activeSlave.race) || $activeSlave.race == 'white' || $activeSlave.race == 'black'>>
+<<if ($activeSlave.skin == $activeSlave.race) || ($activeSlave.race == "white") || ($activeSlave.race == "black") || ($seeRace == 1)>>
<<set _skin = "$activeSlave.skin">>
<<else>>
<<set _skin = "$activeSlave.skin $activeSlave.race">>
@@ -372,7 +372,7 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
<<elseif $activeSlave.fetish == "cumslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
As a devoted cumslut, $activeSlave.slaveName eagerly strokes your cock with $his feet, delightedly smearing your precum on $his soles. $He <<if canSee($activeSlave)>>stares at your <<if $PC.balls >=2>>massive balls with a ravenous gaze, <<elseif $PC.balls >=1>>large balls with a hungry gaze, <<else>>balls with a steady gaze, <</if>><<else>>gingerly feels the weight of your <<if $PC.balls >=2>>massive balls <<elseif $PC.balls >=1>>large balls <<else>>balls <</if>>with $his feet, <</if>>shivering in anticipation.
<<elseif $activeSlave.fetish == "humiliation" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
- $activeSlave.slaveName slowly strokes your cock with $his feet, getting off on the degrading use of $his feet and avoiding your gaze. $He is showing an embarrassed smile<<if $activeSlave.skin == 'black'>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks.
+ $activeSlave.slaveName slowly strokes your cock with $his feet, getting off on the degrading use of $his feet and avoiding your gaze. $He is showing an embarrassed smile<<if (skinToneLevel($activeSlave.skin) > 22)>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks.
<<elseif $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
As $activeSlave.slaveName deftly strokes your cock with $his feet, $his hands plays with $his <<if $activeSlave.boobs < 300>>erect nipples. <<elseif $activeSlave.boobs < 500>>small chest. <<elseif $activeSlave.boobs >= 18000>>_boobs breasts, though $he can't reach $his nipples. <<else>>_boobs breasts and erect nipples. <</if>> $He is certainly giving you plenty of sexy options for you to watch.
<<elseif $activeSlave.fetish == "sadist" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index d7eda20d5674a569b3490adfebf11a8cc1dd4aeb..6ccb180a279bcba06d86422100bf9d26412744b5 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -31,39 +31,39 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.relationship == -2)>>
$He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
<<else>>
upon $his face. $He finds the intense look from the _womanP $he loves overwhelming, and after a moment glances away.
<</if>>
$He blushes furiously.
<<elseif $activeSlave.relationship == -3>>
<<if $activeSlave.fetish == "mindbroken">>
- $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his empty <<= App.Desc.EyeColor>> eyes. $He shows no reaction
+ $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his empty <<= App.Desc.eyeColor>> eyes. $He shows no reaction
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
$He complies in a wifely fashion, moving $his body as $he approaches to best enflame your desire, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and gaze
<<if canSee($activeSlave)>>
- deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+ deeply into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
<<else>>
upon $his face. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile.
<</if>>
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
$He complies. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his tearful <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and breaks eye contact.
+ into $his tearful <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and breaks eye contact.
<<else>>
upon $his face. $He can feel the intense gaze of the _womanP $he's forcibly married to, and finds it disturbing. $He quickly turns $his face away.
<</if>>
<<elseif $activeSlave.devotion < -20>>
$He complies out of fear. Once $he's close, you hold $his quivering face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his teary <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and quickly breaks eye contact.
+ into $his teary <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and quickly breaks eye contact.
<<else>>
upon $his tear-streaked face. $He can feel the intense look from the _womanP $he's forcibly married to, and it is horrifying, causing $him to turn $his face away after only a moment.
<</if>>
<<else>>
$He complies obediently. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
<<else>>
upon $his face. The intense look from the _womanP $he's married to is reassuring to $him, and $he looks down with a slight smile.
<</if>>
@@ -71,7 +71,7 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.devotion > 75)>>
$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment.
<<else>>
upon $his face. $He can feel the intense look from $his beloved <<Master>> and it is disconcerting, causing $him to glance away after only a moment, $his face flushed.
<</if>>
@@ -79,14 +79,14 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.devotion > 50)>>
$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
<<else>>
upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and it causes $him to glance away after only a moment, blushing.
<</if>>
<<elseif ($activeSlave.devotion > 20)>>
$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
<<else>>
upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
<</if>>
@@ -100,21 +100,21 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> troubling, and $he looks down after a moment, $his lower lip trembling with nervousness.
+ into $his <<= App.Desc.eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> troubling, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<else>>
upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and turns away after a moment, $his lower lip trembling with nervousness.
<</if>>
<<elseif ($activeSlave.trust < -20)>>
The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. After a mere instant of locked faces, $he looks down fearfully and begins to shake with terror, tears leaking silently down $his cheeks.
+ into $his <<= App.Desc.eyeColor>> eyes. After a mere instant of locked faces, $he looks down fearfully and begins to shake with terror, tears leaking silently down $his cheeks.
<<else>>
upon $his face. After a mere instant of locked faces, $he looks down fearfully and begins to shake with terror, tears leaking silently down $his cheeks.
<</if>>
<<else>>
$He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his <<= App.Desc.EyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
+ into $his <<= App.Desc.eyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
<<else>>
upon $his face. $He faces you defiantly, but after a few moments $he loses the contest of wills and looks down.
<</if>>
@@ -200,7 +200,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
<<if ($activeSlave.fetish == "mindbroken")>>
When you stop,
<<if canSee($activeSlave)>>
- $his <<= App.Desc.EyeColor>> eyes track the movements of your hands briefly before returning to their usual stare,
+ $his <<= App.Desc.eyeColor>> eyes track the movements of your hands briefly before returning to their usual stare,
<<else>>
$he stands at attention before you,
<</if>>
@@ -208,9 +208,9 @@ You move your hand down to caress $his forehead, and then slide your hand along
<<elseif ($activeSlave.relationship == -2)>>
When you finally stop petting $him, <<if canSee($activeSlave)>>$his eyes remain closed just for a second <</if>>and $his mouth stands open in slack-jawed joy, before $he slowly <<if canSee($activeSlave)>> opens $his eyes<<else>> turns $his gaze towards you<</if>> and smiles warmly at you. Pleasure lights up $his face<<if ($activeSlave.amp != 1)>> as $his hand traces the path yours took up to $his head and mimics your last movements<<else>> as $his gaze drifts off to the right in memory, tilting $his head from side to side in sympathetic memory of how it felt to have your hand on $his head<</if>>.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+ $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.
<<else>>
@@ -220,21 +220,21 @@ You move your hand down to caress $his forehead, and then slide your hand along
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && !$activeSlave.amp != 1>>
$He tries hard to stop from losing $himself in your incredibly skilled hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. When you are finally finished stroking your slave, they remove their hand from yours. Then you give them a playful flick on the nose, and the mischievous twinkle in your eye is only half playful, reminding $him of $his place in these walls.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+ $He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he liked that and would love to pet you next time.
<<else>>
"That wa<<s>> ni<<c>>e, <<Master>>," $he <<say>>s cheerfully. "Maybe next time I can <<s>>troke you..."
<</if>>
- $He looks at you, $his <<if canSee($activeSlave)>>lovely <<= App.Desc.EyeColor>> eyes<<else>>face<</if>> practically begging you to let $him take this farther.
+ $He looks at you, $his <<if canSee($activeSlave)>>lovely <<= App.Desc.eyeColor>> eyes<<else>>face<</if>> practically begging you to let $him take this farther.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
As you stroke $his head, $he reacts almost as though you're stroking $his nether regions, and begins to moan and press $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>. $He achieves a weak orgasm before you finally stop caressing $his head; $he is your pet, after all.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+ $He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he liked that.
<<else>>
@@ -244,9 +244,9 @@ You move your hand down to caress $his forehead, and then slide your hand along
<<elseif ($activeSlave.devotion > 50)>>
$He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightedly across $his face; <</if>>a euphoric look quickly lighting up $his features.
<<if ($activeSlave.accent >= 3)>>
- $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
+ $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
- $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
+ $He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>facial expressions<</if>>.
<<elseif !canTalk($activeSlave)>>
$He signs that $he loves you.
<<else>>
@@ -254,7 +254,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
<</if>>
$He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
<<elseif ($activeSlave.devotion > 20)>>
- When you finally move your hand away, <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
+ When you finally move your hand away, <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
<<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
<<elseif !canTalk($activeSlave)>>
diff --git a/src/pregmod/fSlaveFeed.tw b/src/pregmod/fSlaveFeed.tw
index 8d82729c5ab62d6fe3d6c0266b281e7f16f54458..934bb3b8c18a6771a36e167d311dbdfff40e8ab2 100644
--- a/src/pregmod/fSlaveFeed.tw
+++ b/src/pregmod/fSlaveFeed.tw
@@ -8,6 +8,21 @@
<<run clearSummaryCache($milkTap)>>
<<setLocalPronouns $milkTap 2>>
+<span id="artFrame">
+/* 000-250-006 */
+<<if $seeImages == 1>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $milkTap 2 0>>
+ </div>
+ </div>
+<</if>>
+/* 000-250-006 */
+</span>
+
<<if $activeSlave.inflationType == "milk">>
<<set $activeSlave.milkSource = $milkTap.ID>>
@@ -40,7 +55,7 @@ The first necessary step is to prepare the milk cow and _his2 udders.
This is very easy, since $milkTap.slaveName loves _his2 tits played with and can't wait to get suckled. <<if $milkTap.lactation > 1>>_he2 is practically gushing milk with excitement<<else>>It takes next to no effort to get _his2 milk flowing<</if>>.
<<elseif $activeSlave.mother == $milkTap.ID>>
- This is easy enough, as $milkTap.slaveName fondly remembers nursing _his2 daughter. <<if $milkTap.lactation > 1>>$he is practically gushing milk with nostalgia<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
+ This is easy enough, as $milkTap.slaveName fondly remembers nursing _his2 <<print relativeTerm($milkTap, $activeSlave)>>. <<if $milkTap.lactation > 1>>$he is practically gushing milk with nostalgia<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
<<elseif $activeSlave.father == $milkTap.ID>>
This is extremely tough, as $milkTap.slaveName is very uncomfortable breast feeding the $girl _he2 sired. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release, however<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
<<elseif $milkTap.mother == $activeSlave.ID>>
@@ -48,21 +63,21 @@ The first necessary step is to prepare the milk cow and _his2 udders.
<<elseif $milkTap.father == $activeSlave.ID>>
This is very tough, as $milkTap.slaveName finds it weird to let _his2 father suckle from _him2. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release, however<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 1>>
- This is easy enough, as $milkTap.slaveName wants _his2 twin to try _his2 milk, but only if $he can taste $hers too. <<if $milkTap.lactation > 1>>$he is practically gushing milk with excitement<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
+ This is easy enough, as $milkTap.slaveName wants _his2 <<print relativeTerm($activeSlave, $milkTap)>> to try _his2 milk, but only if $he can taste $hers too. <<if $milkTap.lactation > 1>>$he is practically gushing milk with excitement<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 2>>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 sister. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
+ This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, $activeSlave)>>. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 3>>
- This is slightly difficult, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 half-sister. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
+ This is slightly difficult, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, $activeSlave)>>. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
<<elseif $milkTap.relationTarget == $activeSlave.ID>>
<<if $milkTap.relation == "twin">>
- This is easy enough, as $milkTap.slaveName wants _his2 twin to try _his2 milk, but only if $he can taste _hers2 too. <<if $milkTap.lactation > 1>>_he2 is practically gushing milk with excitement<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
+ This is easy enough, as $milkTap.slaveName wants _his2 <<print relativeTerm($milkTap, $activeSlave)>> to try _his2 milk, but only if $he can taste _hers2 too. <<if $milkTap.lactation > 1>>_he2 is practically gushing milk with excitement<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
<<elseif $milkTap.relation == "sister">>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 sister. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _his2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _his2 eager for relief<</if>>.
+ This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, $activeSlave)>>. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _his2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _his2 eager for relief<</if>>.
<<elseif $milkTap.relation == "mother">>
- This is easy enough, as $milkTap.slaveName fondly remembers nursing _his2 daughter. <<if $milkTap.lactation > 1>>$he is practically gushing milk with nostalgia<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
+ This is easy enough, as $milkTap.slaveName fondly remembers nursing _his2 <<print relativeTerm($milkTap, $activeSlave)>>. <<if $milkTap.lactation > 1>>$he is practically gushing milk with nostalgia<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
<<elseif $milkTap.relation == "daughter">>
- This is moderately tough, as $milkTap.slaveName finds it awkward to nurse _his2 own mother. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
+ This is moderately tough, as $milkTap.slaveName finds it awkward to nurse _his2 own <<print relativeTerm($milkTap, $activeSlave)>>. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
<</if>>
<<elseif ($milkTap.lactation > 1) && ($milkTap.devotion >= -20)>>
@@ -117,25 +132,25 @@ Next, you see to $activeSlave.slaveName.
<<elseif $activeSlave.father == $milkTap.ID>>
$He hesitatingly lowers $himself to $his father's nipple. <<if $milkTap.dick > 0 && canAchieveErection($milkTap)>> $he nearly backs away when $he feels the dick that sired $him poking at $his belly.<</if>>
<<elseif $milkTap.mother == $activeSlave.ID>>
- $He awkwardly brings $his lips to $his daughter's nipple.
+ $He awkwardly brings $his lips to $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple.
<<elseif $milkTap.father == $activeSlave.ID>>
- $He awkwardly brings $his lips to $his daughter's nipple<<if $activeSlave.dick > 0 && canAchieveErection($activeSlave)>>, $his cock steadily hardening at the perversion of suckling from $his child<</if>>.
+ $He awkwardly brings $his lips to $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple<<if $activeSlave.dick > 0 && canAchieveErection($activeSlave)>>, $his cock steadily hardening at the perversion of suckling from $his child<</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 1>>
- $He readily gets in position to <<if canTaste($activeSlave)>>taste<<else>>suckle from<</if>> $his twin<<if $activeSlave.lactation > 0>> while coaxing $his own milk to flow<</if>>.
+ $He readily gets in position to <<if canTaste($activeSlave)>>taste<<else>>suckle from<</if>> $his <<print relativeTerm($activeSlave, $milkTap)>><<if $activeSlave.lactation > 0>> while coaxing $his own milk to flow<</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 2>>
- $He hesitatingly lowers $himself to $his sister's nipple.
+ $He hesitatingly lowers $himself to $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple.
<<elseif areSisters($activeSlave, $milkTap) == 3>>
- $He hesitatingly lowers $himself to $his half-sister's nipple.
+ $He hesitatingly lowers $himself to $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple.
<<elseif $activeSlave.relationTarget == $milkTap.ID>>
<<if $activeSlave.relation == "twin">>
- $He readily gets in position to <<if canTaste($activeSlave)>>taste<<else>>suckle from<</if>> $his twin<<if $activeSlave.lactation > 0>> while coaxing $his own milk to flow<</if>>.
+ $He readily gets in position to <<if canTaste($activeSlave)>>taste<<else>>suckle from<</if>> $his <<print relativeTerm($activeSlave, $milkTap)>><<if $activeSlave.lactation > 0>> while coaxing $his own milk to flow<</if>>.
<<elseif $activeSlave.relation == "sister">>
- $He hesitatingly lowers $himself to $his sister's nipple.
+ $He hesitatingly lowers $himself to $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple.
<<elseif $activeSlave.relation == "mother">>
- $He awkwardly brings $his lips to $his daughter's nipple.
+ $He awkwardly brings $his lips to $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple.
<<elseif $activeSlave.relation == "daughter">>
- $He draws close to $his mother's nipples, trying to remember if $he once had a favorite.
+ $He draws close to $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipples, trying to remember if $he once had a favorite.
<</if>>
<<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.devotion >= -20)>>
@@ -186,27 +201,27 @@ Next, you see to $activeSlave.slaveName.
<<elseif $activeSlave.mother == $milkTap.ID>>
$milkTap.slaveName sighs contently as _his2 little $girl once again suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $activeSlave.father == $milkTap.ID>>
- $milkTap.slaveName moans lewdly as _his2 daughter suckles from _his2 breasts<<if $milkTap.dick > 0 && canAchieveErection($milkTap)>>, _his2 dick throbbing with lust<</if>>. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his father's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his father's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his father's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>><<if $milkTap.dick > 0 && canAchieveErection($milkTap)>><<if $activeSlave.sexualQuirk == "perverted">>. The way $he is wiggling $his hips suggests $he isn't finished with $his daddy just yet, and $his father's moaning confirms $he is teasing _him2 with $his rear. $He giggles as the horny cow unloads on $his backside<<else>>. $He doesn't stay put for long, as a strong moan and a blast of cum across $his rear from the horny cow startles $him from $his rest<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, $activeSlave)>> suckles from _his2 breasts<<if $milkTap.dick > 0 && canAchieveErection($milkTap)>>, _his2 dick throbbing with lust<</if>>. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his father's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his father's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his father's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>><<if $milkTap.dick > 0 && canAchieveErection($milkTap)>><<if $activeSlave.sexualQuirk == "perverted">>. The way $he is wiggling $his hips suggests $he isn't finished with $his daddy just yet, and $his father's moaning confirms $he is teasing _him2 with $his rear. $He giggles as the horny cow unloads on $his backside<<else>>. $He doesn't stay put for long, as a strong moan and a blast of cum across $his rear from the horny cow startles $him from $his rest<</if>><</if>>.
<<elseif $milkTap.mother == $activeSlave.ID>>
- $milkTap.slaveName moans lewdly as _he2 enjoys some role reversal as _his2 mother suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _he2 enjoys some role reversal as _his2 mother suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.father == $activeSlave.ID>>
- $milkTap.slaveName moans lewdly as _his2 father suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 father suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 1>>
- $milkTap.slaveName sighs contently as _his2 twin sister suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his twin's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his twin's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his twin's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName sighs contently as _his2 <<print relativeTerm($milkTap, $activeSlave)>> suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 2>>
- $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= $activeSlave.actualAge>>little<<else>>big<</if>> sister suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= $activeSlave.actualAge>>little<<else>>big<</if>> <<print relativeTerm($milkTap, $activeSlave)>> suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 3>>
- $milkTap.slaveName moans lewdly as _his2 half-sister suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, $activeSlave)>> suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.relationTarget == $activeSlave.ID>>
<<if $milkTap.relation == "twin">>
- $milkTap.slaveName sighs contently as _his2 twin sister suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his twin's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his twin's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his twin's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName sighs contently as _his2 <<print relativeTerm($milkTap, $activeSlave)>> suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.relation == "sister">>
- $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= $activeSlave.actualAge>>little<<else>>big<</if>> sister suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his sister's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= $activeSlave.actualAge>>little<<else>>big<</if>> <<print relativeTerm($milkTap, $activeSlave)>> suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.relation == "mother">>
$milkTap.slaveName sighs contently as _his2 little $girl once again suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.relation == "daughter">>
- $milkTap.slaveName moans lewdly as $he enjoys some role reversal as _his2 mother suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his daughter's nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as $he enjoys some role reversal as _his2 mother suckles from _his2 breasts. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<</if>>
<<elseif ($activeSlave.devotion < -20) && ($milkTap.devotion < -20)>>
@@ -396,29 +411,29 @@ The first necessary step is to prepare the cum slave and $his cock and balls.
<</if>>
<<elseif $activeSlave.mother == $milkTap.ID>>
- This is tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 daughter, but _he2 can't really complain about getting _his2 overfilled nuts drained.
+ This is tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 <<print relativeTerm($milkTap, $activeSlave)>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<<elseif $activeSlave.father == $milkTap.ID>>
- This is tough, as $milkTap.slaveName is rather uncomfortable having _his2 dick sucked by _his2 daughter, but _he2 can't really complain about getting _his2 overfilled nuts drained.
+ This is tough, as $milkTap.slaveName is rather uncomfortable having _his2 dick sucked by _his2 <<print relativeTerm($milkTap, $activeSlave)>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<<elseif $milkTap.mother == $activeSlave.ID>>
This is moderately tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 own mother, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<<elseif $milkTap.father == $activeSlave.ID>>
This is tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 own father, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<<elseif areSisters($activeSlave, $milkTap) == 1>>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 twin<<if $milkTap.energy >= 95>>, though as a nymphomaniac, the thought of someone who looks so much like _his2 is a major turn on<<else>> but _he2 can't really complain about getting _his2 overfilled nuts drained<</if>>.
+ This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($activeSlave, $milkTap)>><<if $milkTap.energy >= 95>>, though as a nymphomaniac, the thought of someone who looks so much like _his2 is a major turn on<<else>> but _he2 can't really complain about getting _his2 overfilled nuts drained<</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 2>>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 sister, but _he2 can't really complain about getting _his2 overfilled nuts drained.
+ This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, $activeSlave)>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<<elseif areSisters($activeSlave, $milkTap) == 3>>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 half-sister, but _he2 can't really complain about getting _his2 overfilled nuts drained.
+ This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, $activeSlave)>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<<elseif $milkTap.relationTarget == $activeSlave.ID>>
<<if $milkTap.relation == "twin">>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 twin<<if $milkTap.energy >= 95>>, though as a nymphomaniac, the thought of someone who looks so much like _his2 is a major turn on<<else>> but _he2 can't really complain about getting _his2 overfilled nuts drained<</if>>.
+ This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, $activeSlave)>><<if $milkTap.energy >= 95>>, though as a nymphomaniac, the thought of someone who looks so much like _his2 is a major turn on<<else>> but _he2 can't really complain about getting _his2 overfilled nuts drained<</if>>.
<<elseif $milkTap.relation == "sister">>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 sister, but _he2 can't really complain about getting _his2 overfilled nuts drained.
+ This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, $activeSlave)>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<<elseif $milkTap.relation == "mother">>
- This is tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 daughter, but _he2 can't really complain about getting _his2 overfilled nuts drained.
+ This is tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 <<print relativeTerm($milkTap, $activeSlave)>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<<elseif $milkTap.relation == "daughter">>
- This is moderately tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 own mother, but _he2 can't really complain about getting _his2 overfilled nuts drained.
+ This is moderately tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 own <<print relativeTerm($milkTap, $activeSlave)>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
<</if>>
<<elseif ($milkTap.fetish == "cumslut") && ($milkTap.fetishKnown == 1) && ($milkTap.fetishStrength > 60) && ($milkTap.devotion >= -20)>>
@@ -493,25 +508,25 @@ Next, you see to $activeSlave.slaveName.
<<elseif $activeSlave.father == $milkTap.ID>>
$He <<if $activeSlave.sexualQuirk == "perverted">>eagerly<<else>>awkwardly<</if>> brings $his lips to daddy's cock.
<<elseif $milkTap.mother == $activeSlave.ID>>
- $He awkwardly brings $his lips to $his daughter's cock.
+ $He awkwardly brings $his lips to $his <<print relativeTerm($activeSlave, $milkTap)>><<print relativeTerm($activeSlave, $milkTap)>>'s cock.
<<elseif $milkTap.father == $activeSlave.ID>>
- $He awkwardly brings $his lips to $his daughter's cock.
+ $He awkwardly brings $his lips to $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock.
<<elseif areSisters($activeSlave, $milkTap) == 1>>
- $He gets in position to suck $his twin's dick.
+ $He gets in position to suck $his <<print relativeTerm($activeSlave, $milkTap)>>'s dick.
<<elseif areSisters($activeSlave, $milkTap) == 2>>
- $He hesitatingly lowers $himself to $his sister's cock.
+ $He hesitatingly lowers $himself to $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock.
<<elseif areSisters($activeSlave, $milkTap) == 3>>
- $He hesitatingly lowers $himself to $his half-sister's cock.
+ $He hesitatingly lowers $himself to $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock.
<<elseif $activeSlave.relationTarget == $milkTap.ID>>
<<if $activeSlave.relation == "twin">>
- $He gets in position to suck $his twin's dick.
+ $He gets in position to suck $his <<print relativeTerm($activeSlave, $milkTap)>>'s dick.
<<elseif $activeSlave.relation == "sister">>
- $He hesitatingly lowers $himself to $his sister's cock.
+ $He hesitatingly lowers $himself to $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock.
<<elseif $activeSlave.relation == "mother">>
- $He awkwardly brings $his lips to $his daughter's cock.
+ $He awkwardly brings $his lips to $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock.
<<elseif $activeSlave.relation == "daughter">>
- $He awkwardly brings $his lips to $his mother's cock.
+ $He awkwardly brings $his lips to $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock.
<</if>>
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.devotion >= -20)>>
@@ -560,29 +575,29 @@ Next, you see to $activeSlave.slaveName.
<</if>>
<<elseif $activeSlave.mother == $milkTap.ID>>
- $milkTap.slaveName moans lewdly as _his2 daughter energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, $activeSlave)>> energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $activeSlave.father == $milkTap.ID>>
- $milkTap.slaveName moans lewdly as _his2 daughter energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, $activeSlave)>> energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.mother == $activeSlave.ID>>
- $milkTap.slaveName moans lewdly as _his2 mother energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 mother energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.father == $activeSlave.ID>>
- $milkTap.slaveName moans lewdly as _his2 father energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>><<if $activeSlave.dick > 0 && canAchieveErection($activeSlave)>>, $his own stiff prick throbbing against the underside of $his new belly<</if>>.
+ $milkTap.slaveName moans lewdly as _his2 father energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>><<if $activeSlave.dick > 0 && canAchieveErection($activeSlave)>>, $his own stiff prick throbbing against the underside of $his new belly<</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 1>>
- $milkTap.slaveName moans lewdly as _his2 twin sister sucks _his2 off. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, $activeSlave)>> sucks _him2 off. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 2>>
- $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= $activeSlave.actualAge>>little<<else>>big<</if>> sister energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= $activeSlave.actualAge>>little<<else>>big<</if>> <<print relativeTerm($milkTap, $activeSlave)>> energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif areSisters($activeSlave, $milkTap) == 3>>
- $milkTap.slaveName moans lewdly as _his2 half-sister sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, $activeSlave)>> sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.relationTarget == $activeSlave.ID>>
<<if $milkTap.relation == "twin">>
- $milkTap.slaveName moans lewdly as _his2 twin sister sucks _his2 off. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, $activeSlave)>> <<print relativeTerm($milkTap, $activeSlave)>> sucks _his2 off. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.relation == "sister">>
- $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= $activeSlave.actualAge>>little<<else>>big<</if>> sister energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his sister's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= $activeSlave.actualAge>>little<<else>>big<</if>> <<print relativeTerm($milkTap, $activeSlave)>> energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.relation == "mother">>
- $milkTap.slaveName moans lewdly as _his2 daughter energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, $activeSlave)>> energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<<elseif $milkTap.relation == "daughter">>
- $milkTap.slaveName moans lewdly as _his2 mother energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+ $milkTap.slaveName moans lewdly as _his2 mother energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm($activeSlave, $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
<</if>>
<<elseif ($activeSlave.devotion < -20) && ($milkTap.devotion < -20)>>
diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw
index d2175c8e42b2ee82e4b75d237d84a5642c412c2e..185c9d13ccea7efa66d109124ef9af7563b827b1 100644
--- a/src/pregmod/fSlaveSlaveDickConsummate.tw
+++ b/src/pregmod/fSlaveSlaveDickConsummate.tw
@@ -133,13 +133,13 @@ You call $slaverapistx.slaveName into the room.
<<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>>
the slave that is both $his mother and $his father,
<<elseif $slaverapistx.mother == $activeSlave.ID || $slaverapistx.father == $activeSlave.ID>>
- $his own daughter,
+ $his own <<print relativeTerm($activeSlave, $slaverapistx)>>,
<<elseif $activeSlave.mother == $slaverapistx.ID>>
$his own mother,
<<elseif $activeSlave.father == $slaverapistx.ID>>
the slave that fathered $him,
<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
- $his <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister,
+ $his <<print relativeTerm($activeSlave, $slaverapistx)>>,
<</if>>
<<else>>
the other slave,
@@ -151,13 +151,13 @@ You call $slaverapistx.slaveName into the room.
<<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>>
the slave that is both $his mother and $his father,
<<elseif $slaverapistx.mother == $activeSlave.ID || $slaverapistx.father == $activeSlave.ID>>
- $his own daughter,
+ $his own <<print relativeTerm($activeSlave, $slaverapistx)>>,
<<elseif $activeSlave.mother == $slaverapistx.ID>>
$his own mother,
<<elseif $activeSlave.father == $slaverapistx.ID>>
the slave that fathered $him,
<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
- $his <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister,
+ $his <<print relativeTerm($activeSlave, $slaverapistx)>>,
<</if>>
<<else>>
$activeSlave.slaveName <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>dimly acknowledges<</if>> the newcomer, and with $his simple mind
@@ -170,13 +170,13 @@ You call $slaverapistx.slaveName into the room.
<<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>>
the slave that is both $his mother and $his father,
<<elseif $slaverapistx.mother == $activeSlave.ID || $slaverapistx.father == $activeSlave.ID>>
- $his own daughter,
+ $his own <<print relativeTerm($activeSlave, $slaverapistx)>>,
<<elseif $activeSlave.mother == $slaverapistx.ID>>
$his own mother,
<<elseif $activeSlave.father == $slaverapistx.ID>>
the slave that fathered $him,
<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
- $his <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister,
+ $his <<print relativeTerm($activeSlave, $slaverapistx)>>,
<</if>>
<<if ($activeSlave.sexualQuirk == "perverted") || ($activeSlave.sexualQuirk == "sinful")>>
<<set _incestMood = "Bottom">>
@@ -229,13 +229,13 @@ You call $slaverapistx.slaveName into the room.
<<if $slaverapistx.father == $activeSlave.ID && $slaverapistx.mother == $activeSlave.ID>>
the slave that is both _his2 mother and _his2 father
<<elseif $activeSlave.mother == $slaverapistx.ID || $activeSlave.father == $slaverapistx.ID>>
- _his2 own daughter
+ _his2 own <<print relativeTerm($slaverapistx, $activeSlave)>>
<<elseif $slaverapistx.mother == $activeSlave.ID>>
_his2 own mother
<<elseif $slaverapistx.father == $activeSlave.ID>>
the slave that fathered _him2
<<elseif (areSisters($slaverapistx, $activeSlave) > 0)>>
- _his2 <<if areTwins($slaverapistx, $activeSlave)>>twin <</if>>sister
+ _his2 <<print relativeTerm($activeSlave, $slaverapistx)>>
<</if>>
tied to the bed,
<<if ($slaverapistx.sexualQuirk == "perverted") || ($slaverapistx.sexualQuirk == "sinful")>>
@@ -308,9 +308,9 @@ You call $slaverapistx.slaveName into the room.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
- $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his daughter's — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
+ $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
<<else>>
- $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his daughter's vagina.
+ $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s vagina.
<</if>>
<<elseif $activeSlave.mother == $slaverapistx.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
@@ -337,9 +337,9 @@ You call $slaverapistx.slaveName into the room.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
- $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his daughter's — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
+ $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
<<else>>
- $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his daughter's vagina.
+ $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s vagina.
<</if>>
<<elseif $activeSlave.mother == $slaverapistx.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
@@ -381,9 +381,9 @@ You call $slaverapistx.slaveName into the room.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
- $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his daughter's — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
+ $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
<<else>>
- $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his daughter's vagina.
+ $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s vagina.
<</if>>
<<elseif $activeSlave.mother == $slaverapistx.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
@@ -412,9 +412,9 @@ You call $slaverapistx.slaveName into the room.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
- $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his daughter's — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
+ $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
<<else>>
- $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his daughter's vagina.
+ $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s vagina.
<</if>>
<<elseif $activeSlave.mother == $slaverapistx.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
@@ -442,9 +442,9 @@ You call $slaverapistx.slaveName into the room.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
- $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his daughter's — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
+ $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
<<else>>
- $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his daughter's vagina.
+ $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s vagina.
<</if>>
<<elseif $activeSlave.mother == $slaverapistx.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
@@ -471,9 +471,9 @@ You call $slaverapistx.slaveName into the room.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
- $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his daughter's — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
+ $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
<<else>>
- $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his daughter's vagina.
+ $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s vagina.
<</if>>
<<elseif $activeSlave.mother == $slaverapistx.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
@@ -500,9 +500,9 @@ You call $slaverapistx.slaveName into the room.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
- $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his daughter's — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
+ $activeSlave.slaveName gasps and $his eyes widen as $he feels the tender folds of a pussy — and none other than $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s — embracing $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> for the first time.
<<else>>
- $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his daughter's vagina.
+ $activeSlave.slaveName's breath quickens as $his <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> disappears into $his <<print relativeTerm($activeSlave, $slaverapistx)>>'s vagina.
<</if>>
<<elseif $activeSlave.mother == $slaverapistx.ID>>
<<if ($activeSlave.penetrativeCount == 0)>>
diff --git a/src/pregmod/fSlaveSlaveVagConsummate.tw b/src/pregmod/fSlaveSlaveVagConsummate.tw
index e6e3ca338f371e8b941453781fef19515cbb5f77..9a21867992fa0dac081a3677c5b3fca5161f166d 100644
--- a/src/pregmod/fSlaveSlaveVagConsummate.tw
+++ b/src/pregmod/fSlaveSlaveVagConsummate.tw
@@ -65,13 +65,13 @@ You take a look at the slave you selected.
<<if $slaverapistx.father == $activeSlave.ID && $slaverapistx.mother == $activeSlave.ID>>
the slave that is both _his2 mother and _his2 father,
<<elseif $activeSlave.mother == $slaverapistx.ID || $activeSlave.father == $slaverapistx.ID>>
- _his2 own daughter,
+ _his2 own <<print relativeTerm($slaverapistx, $activeSlave)>>,
<<elseif $slaverapistx.mother == $activeSlave.ID>>
_his2 own mother,
<<elseif $slaverapistx.mother == $activeSlave.ID>>
the slave that fathered _him2,
<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
- _his2 <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister,
+ _his2 <<print relativeTerm($slaverapistx, $activeSlave)>>,
<</if>>
<<if ($slaverapistx.sexualQuirk == "perverted") || ($slaverapistx.sexualQuirk == "sinful")>>
<<if ($slaverapistx.energy > 60)>>
@@ -104,13 +104,13 @@ Next, you see to $activeSlave.slaveName.
<<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>>
the slave that is both $his mother and $his father,
<<elseif $slaverapistx.mother == $activeSlave.ID || $slaverapistx.father == $activeSlave.ID>>
- $his own daughter,
+ $his own <<print relativeTerm($activeSlave, $slaverapistx)>>,
<<elseif $activeSlave.mother == $slaverapistx.ID>>
$his own mother,
<<elseif $activeSlave.father == $slaverapistx.ID>>
the slave that fathered $him,
<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
- $his <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister,
+ $his <<print relativeTerm($activeSlave, $slaverapistx)>>,
<</if>>
<<if ($activeSlave.sexualQuirk == "perverted") || ($activeSlave.sexualQuirk == "sinful")>>
<<if ($activeSlave.energy > 60)>>
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index ff88051716ebb76311418cbc02b8c2daad809c53..0cadb9167cff227eb454d4b7ef3f4d0eb128c727 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -3,6 +3,7 @@
<<set $incubatorSlaves = 0>>
<<for _inc = 0; _inc < $tanks.length; _inc++>>
+ <<setLocalPronouns $tanks[_inc]>>
<<set $tanks[_inc].birthWeek += 1>>
<<if $tanks[_inc].birthWeek >= 52>>
<<set $tanks[_inc].birthWeek = 0>>
diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw
index 62d0d155fec78005f172c21a22159e26ad4cd804..993d24bd838fd233ef3d1a1374e17f9ad798ec91 100644
--- a/src/pregmod/killedSlave.tw
+++ b/src/pregmod/killedSlave.tw
@@ -140,11 +140,11 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
<<elseif $killChoice == 2>>
You tell $him that you'll let your bodyguard $Bodyguard.slaveName decide $his fate — if $he wants to live, $he'll have to beat _him2 in hand-to-hand combat in $pitName.
- <<if $activeSlave.combatSkill == 0>>
+ <<if $activeSlave.skill.combat == 0>>
The fear on $his face is palpable, though $he nods slowly and agrees, not seeing another choice.
<<else>>
$He nods $his head and straightens up, as though mentally preparing $himself for the fight for $his life.
<</if>>
<<set $slaveFightingBG = $activeSlave, $pitAnimal = 0>>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 8ceecb13237fa205d2d6c5495ac055632b89b4ec..f8d1f2a49b1d0cc82549daaf2d6e71e03f409d89 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -133,8 +133,8 @@ It would be prudent to up security in your arcology. That or take a guard along
<<set $activeSlave.balls = 5>>
<<set $activeSlave.boobs = 0>>
<<set $activeSlave.waist = 50>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.sexualFlaw = "judgemental">>
diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index d7a0618c5d046761af878b92585647ae751f5d57..b1d17bf3dd1111ed95419ec47efc953a15568f18 100644
--- a/src/pregmod/pcAppearanceIntro.tw
+++ b/src/pregmod/pcAppearanceIntro.tw
@@ -91,11 +91,26 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
+<<link "Ivory">>
+ <<set $PC.skin = "ivory">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "White">>
+ <<set $PC.skin = "white">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Extremely Pale">>
<<set $PC.skin = "extremely pale">>
<<PlayerSkin>>
<</link>>
|
+<<link "Very Pale">>
+ <<set $PC.skin = "very pale">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Pale">>
<<set $PC.skin = "pale">>
<<PlayerSkin>>
@@ -116,23 +131,18 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
-<<link "White">>
- <<set $PC.skin = "white">>
- <<PlayerSkin>>
-<</link>>
-|
<<link "Light">>
<<set $PC.skin = "light">>
<<PlayerSkin>>
<</link>>
|
-<<link "Lightened">>
- <<set $PC.skin = "lightened">>
+<<link "Light Olive">>
+ <<set $PC.skin = "light olive">>
<<PlayerSkin>>
<</link>>
|
-<<link "Light Olive">>
- <<set $PC.skin = "light olive">>
+<<link "Tan">>
+ <<set $PC.skin = "tan">>
<<PlayerSkin>>
<</link>>
|
@@ -141,28 +151,33 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
-<<link "Natural">>
- <<set $PC.skin = "natural">>
+<<link "Bronze">>
+ <<set $PC.skin = "bronze">>
<<PlayerSkin>>
<</link>>
|
-<<link "Tanned">>
- <<set $PC.skin = "tanned">>
+<<link "Dark Olive">>
+ <<set $PC.skin = "dark olive">>
<<PlayerSkin>>
<</link>>
|
-<<link "Bronzed">>
- <<set $PC.skin = "bronzed">>
+<<link "Dark">>
+ <<set $PC.skin = "dark">>
<<PlayerSkin>>
<</link>>
|
-<<link "Dark Olive">>
- <<set $PC.skin = "dark olive">>
+<<link "Light Beige">>
+ <<set $PC.skin = "light beige">>
<<PlayerSkin>>
<</link>>
|
-<<link "Dark">>
- <<set $PC.skin = "dark">>
+<<link "Beige">>
+ <<set $PC.skin = "beige">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "Dark Beige">>
+ <<set $PC.skin = "dark beige">>
<<PlayerSkin>>
<</link>>
|
diff --git a/src/pregmod/pcSurgeryDegredation.tw b/src/pregmod/pcSurgeryDegredation.tw
index 84717c7cf5a31f1aa928999e422008a8fac86eb4..6210a3b954b599dc73ea7fcdff9fb0c05127269f 100644
--- a/src/pregmod/pcSurgeryDegredation.tw
+++ b/src/pregmod/pcSurgeryDegredation.tw
@@ -5,7 +5,7 @@
<<switch $surgeryType>>
<<case "skinTone">>
- After a few hours, you awaken in the recovery wing to find every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["pure white", "extremely pale", "pale", "extremely fair", "very fair", "fair", "white", "light", "lightened", "light olive", "olive", "natural", "tanned", "bronzed", "dark olive", "dark", "light brown", "brown", "dark brown", "black", "ebony", "pure black"].includes($PC.skin)>>The surgeon's assistant immediately covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
+ After a few hours, you awaken in the recovery wing to find every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "extremely fair", "very fair", "fair", "light", "light olive", "tan", "olive", "bronze", "dark olive", "dark", "light beige", "beige", "dark beige", "light brown", "brown", "dark brown", "black", "ebony", "pure black"].includes($PC.skin)>>The surgeon's assistant immediately covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
<<case "restoreFace">>
After a few hours, you awaken in the recovery wing with a face both sore and somewhat numb. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you catch sight of yourself in the mirror-covered wall across from your bed. Your face is back to the way it was before you had it altered (not counting any additional years added to it) and looking just as good as you remember. You attempt to smile at yourself, only to find your face doesn't want to comply; guess the drugs haven't completely worn off yet. You lie back down to sleep off the rest of the anesthesia before returning to your arcology.
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index c990581a2c690a179c73f3a8c01bc3d6d6f54c79..fb66cdf0bc8dcb614f198d162190e29ef7e88ac9 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -124,7 +124,7 @@
<<if $activeSlave.origEye == "implant">>
$His pretty $activeSlave.eyeColor bionic eyes flash a shade cooler than normal and you can tell $he's struggling to accept your decision.
<<else>>
- You can see tears brimming in $his <<= App.Desc.EyeColor>> eyes.
+ You can see tears brimming in $his <<= App.Desc.eyeColor>> eyes.
<</if>>
You kiss $him on the head, make sweet love to $him to improve $his mood, then have $him escorted out of your office.
<<= VaginalVCheck()>>
@@ -696,12 +696,12 @@
<</if>>
<<if !canTalk($activeSlave)>>
<<if $activeSlave.amp == 0>>
- $He waves $his arms in mock dismay<<if $activeSlave.combatSkill > 0>> and lowers $his guard<</if>> as you prepare to wrestle $him in the pool of goop.
+ $He waves $his arms in mock dismay<<if $activeSlave.skill.combat > 0>> and lowers $his guard<</if>> as you prepare to wrestle $him in the pool of goop.
<<else>>
$He waves $his stubs in mock dismay as you prepare to wrestle $him in the pool of goop.
<</if>>
<<else>>
- "Oh no," $he <<say>>s in mock dismay<<if $activeSlave.combatSkill > 0>>, lowering $his guard<</if>>. "My <<Master>> i<<s>> going to wre<<s>>tle me into <<s>>ubmi<<ss>>ion in thi<<s>> hot, heavy goo pool. Whatever will I do?"
+ "Oh no," $he <<say>>s in mock dismay<<if $activeSlave.skill.combat > 0>>, lowering $his guard<</if>>. "My <<Master>> i<<s>> going to wre<<s>>tle me into <<s>>ubmi<<ss>>ion in thi<<s>> hot, heavy goo pool. Whatever will I do?"
<</if>>
You circle around $him, slowly approaching $him, and $he uses the pool's mobility assistance tools to rotate $his body so that $he can just barely keep you in $his gaze, drizzling gel over $his belly as $he keeps it between you and $him to use as a protective barrier. When you're close enough to touch the apex of $his fecund body, you leap forward through the gel, diving to one side and disappearing under it. Your momentum carries you a reasonable distance despite the resistance of the thick substance and you pop back up directly behind $him. You grab $him under $his armpits, pressing your
<<if $PC.dick == 1>>
@@ -1052,4 +1052,4 @@
<</link>>
</span>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index fc33caa64c0865db1f2039f1e625a26b9abde587..ca88db0d1ddf1d5cbfd9dbc082fcd2e492acd201 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -24,9 +24,9 @@
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.preg = -1>>
<</if>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.pubicHStyle = "waxed">>
@@ -155,4 +155,4 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
<</replace>>
<</link>>
</span>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw
index 32f4642090985d28484b96c7ff6259b0249c5efa..c8478b59d073d0189216ccc8ebe75bd3be62f88f 100644
--- a/src/pregmod/saClothes.tw
+++ b/src/pregmod/saClothes.tw
@@ -406,13 +406,13 @@
<</if>>
<</if>>
<<if ($slaves[$i].collar == "dildo gag")>>
- <<if $slaves[$i].oralSkill <= 10>>
+ <<if $slaves[$i].skill.oral <= 10>>
Living gagged by a dildo, $he can't help but get better at having things down $his throat.
<<set $skillIncrease = 5>><<OralSkillIncrease $slaves[$i]>>
<</if>>
<</if>>
<<if ($slaves[$i].collar == "massive dildo gag")>>
- <<if $slaves[$i].oralSkill < 75>>
+ <<if $slaves[$i].skill.oral < 75>>
Living gagged by such an immense dildo, $he can't help but get even better at having giant things rammed down $his throat.
<<set $skillIncrease = 5>><<OralSkillIncrease $slaves[$i]>>
<</if>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 3a418ac65c09464e4cc58b535caf43e362984f3c..cb61547ad28fe2685baec5fed473076c77a6d512 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -154,7 +154,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.shoulders = -1>>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.lips = random(20,50)>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.vaginaLube = 2>>
@@ -169,10 +169,10 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.behavioralQuirk = either("advocate", "funny", "insecure", "none", "none")>>
<<set $activeSlave.sexualQuirk = either("caring", "none", "romantic")>>
- <<set $activeSlave.entertainSkill = random(50,80)>>
- <<set $activeSlave.oralSkill = random(20,60)>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = random(50,80)>>
+ <<set $activeSlave.skill.oral = random(20,60)>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.intelligence = random(51,70)>>
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.devotion = random(60,90)>>
@@ -216,10 +216,10 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.energy = random(65,100)>>
<<set $activeSlave.attrXY = random(70,100)>>
<<set $activeSlave.attrXX = random(40,100)>>
- <<set $activeSlave.vaginalSkill = random(50,80)>>
- <<set $activeSlave.oralSkill = random(40,80)>>
- <<set $activeSlave.analSkill = random(20,50)>>
- <<set $activeSlave.whoreSkill = random(0,50)>>
+ <<set $activeSlave.skill.vaginal = random(50,80)>>
+ <<set $activeSlave.skill.oral = random(40,80)>>
+ <<set $activeSlave.skill.anal = random(20,50)>>
+ <<set $activeSlave.skill.whore = random(0,50)>>
<<set $activeSlave.devotion = random(40,70)>>
<<set $activeSlave.trust = random(40,70)>>
<<set $activeSlave.fetish = "pregnancy">>
@@ -264,11 +264,11 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "none">>
- <<set $activeSlave.entertainSkill = random(20,80)>>
- <<set $activeSlave.oralSkill = random(50,1000)>>
- <<set $activeSlave.vaginalSkill = random(50,1000)>>
- <<set $activeSlave.analSkill = random(20,80)>>
- <<set $activeSlave.whoreSkill = random(20,80)>>
+ <<set $activeSlave.skill.entertainment = random(20,80)>>
+ <<set $activeSlave.skill.oral = random(50,1000)>>
+ <<set $activeSlave.skill.vaginal = random(50,1000)>>
+ <<set $activeSlave.skill.anal = random(20,80)>>
+ <<set $activeSlave.skill.whore = random(20,80)>>
<<set $activeSlave.intelligence = random(-15,80)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.devotion = random(60,90)>>
@@ -299,10 +299,10 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.teeth = "normal">>
<</if>>
<<set $activeSlave.vaginaLube = 2>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 15>>
<<set $activeSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration", "idealistic")>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>>
<<set $activeSlave.energy = 10>>
@@ -321,9 +321,9 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.scrotum = $activeSlave.balls>>
<<set $activeSlave.dick = random(3,5)>>
<<set $activeSlave.prostate = 2>>
- <<set $activeSlave.oralSkill = random(30,60)>>
- <<set $activeSlave.analSkill = random(20,50)>>
- <<set $activeSlave.whoreSkill = random(0,25)>>
+ <<set $activeSlave.skill.oral = random(30,60)>>
+ <<set $activeSlave.skill.anal = random(20,50)>>
+ <<set $activeSlave.skill.whore = random(0,25)>>
<<set $activeSlave.devotion = random(50,80)>>
<<set $activeSlave.trust = random(50,80)>>
<<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">>
@@ -339,9 +339,9 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.pubertyXX = 1>>
<<set $activeSlave.dick = random(3,5)>>
<<set $activeSlave.balls = random(3,6)>>
- <<set $activeSlave.oralSkill = random(40,80)>>
- <<set $activeSlave.analSkill = random(40,80)>>
- <<set $activeSlave.whoreSkill = random(40,70)>>
+ <<set $activeSlave.skill.oral = random(40,80)>>
+ <<set $activeSlave.skill.anal = random(40,80)>>
+ <<set $activeSlave.skill.whore = random(40,70)>>
<<set $activeSlave.muscles = either(20, 50)>>
<<set $activeSlave.energy = random(70,100)>>
<<set $activeSlave.attrXY = random(70,100)>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index dfe6ec1c9b95ee20e4ccd7992eef597ef51647bd..b86b11c70310bd3c11c45906561d31fc1349f620 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -33,12 +33,12 @@
<<set $activeSlave.sexualQuirk = "none">>
<<set $activeSlave.intelligence = -100>>
<<set $activeSlave.intelligenceImplant = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.combatSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.combat = 0>>
<<if $huskSlave.sex == 3>>
<<set $activeSlave.dick = 1>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index c5700cdcf5a57a0bdebee5006a2793c571f011fb..d12af5397e4a43a8225371f936854623d32ac659 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -122,7 +122,7 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
<</if>>
<<else>>
<<if $Concubine != 0>><<setLocalPronouns $Concubine 2>><<if !canWalk($Concubine)>><<set _concubinePresent = 2>><<else>><<set _concubinePresent = 1>><</if>><</if>>
- You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunately the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. $assistantName discretely directs
+ You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunately the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. Fortunately, $assistantName discretely directs
<<if $Nurse != 0>>
<<setLocalPronouns $Nurse>>
@@.pink;$Nurse.slaveName@@ to you with everything $he'll need to deliver your children.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after $him and circles around behind you before wrapping _his2 arms around your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
diff --git a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
index 7d151b10a35efd2816a7e426677f5311c81d00fc..c4ccf06b2681f162f9811bbda8dba9d767dfc15e 100644
--- a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
+++ b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
@@ -45,6 +45,33 @@ __2 Liters__
<<if ($slaves[_i].ID != $activeSlave.ID) && $slaves[_i].nipples != "fuckable">>
<<set _name = SlaveFullName($slaves[_i])>>
<<print "[[_name|FSlaveFeed][$milkTap = $slaves[" + _i + "], $activeSlave.inflation = 1, $activeSlave.inflationType = _descM, $activeSlave.inflationMethod = 3]]">>
+ <<if relativeTerm($activeSlave, $slaves[_i]) != "some unknown blood connection">>
+ <<print relativeTerm($activeSlave, $slaves[_i])>>
+ <</if>>
+ <<if $slaves[_i].relationshipTarget == $activeSlave.ID>>
+ <<switch $slaves[_i].relationship>>
+ <<case 1>>
+ friends
+ <<case 2>>
+ best friends
+ <<case 3>>
+ friends with benefits
+ <<case 4>>
+ lover
+ <<case 5>>
+ slave wife
+ <</switch>>
+ <</if>>
+ <<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
+ <<switch $slaves[_i].relationship>>
+ <<case 1>>
+ dislikes
+ <<case 2>>
+ rival
+ <<case 3>>
+ bitterly hates
+ <</switch>>
+ <</if>>
<<set _eligibilityMilk2 = 1>>
<br>
<</if>>
@@ -62,6 +89,33 @@ __4 Liters__
<<if ($slaves[_i].ID != $activeSlave.ID) && $slaves[_i].nipples != "fuckable">>
<<set _name = SlaveFullName($slaves[_i])>>
<<print "[[_name|FSlaveFeed][$milkTap = $slaves[" + _i + "], $activeSlave.inflation = 2, $activeSlave.inflationType = _descM, $activeSlave.inflationMethod = 3]]">>
+ <<if relativeTerm($activeSlave, $slaves[_i]) != "some unknown blood connection">>
+ <<print relativeTerm($activeSlave, $slaves[_i])>>
+ <</if>>
+ <<if $slaves[_i].relationshipTarget == $activeSlave.ID>>
+ <<switch $slaves[_i].relationship>>
+ <<case 1>>
+ friends
+ <<case 2>>
+ best friends
+ <<case 3>>
+ friends with benefits
+ <<case 4>>
+ lover
+ <<case 5>>
+ slave wife
+ <</switch>>
+ <</if>>
+ <<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
+ <<switch $slaves[_i].relationship>>
+ <<case 1>>
+ dislikes
+ <<case 2>>
+ rival
+ <<case 3>>
+ bitterly hates
+ <</switch>>
+ <</if>>
<<set _eligibilityMilk4 = 1>>
<br>
<</if>>
@@ -78,6 +132,33 @@ __4 Liters__
<<if ($slaves[_i].ID != $activeSlave.ID) && $slaves[_i].nipples != "fuckable">>
<<set _name = SlaveFullName($slaves[_i])>>
<<print "[[_name|FSlaveFeed][$milkTap = $slaves[" + _i + "], $activeSlave.inflation = 3, $activeSlave.inflationType = _descM, $activeSlave.inflationMethod = 3]]">>
+ <<if relativeTerm($activeSlave, $slaves[_i]) != "some unknown blood connection">>
+ <<print relativeTerm($activeSlave, $slaves[_i])>>
+ <</if>>
+ <<if $slaves[_i].relationshipTarget == $activeSlave.ID>>
+ <<switch $slaves[_i].relationship>>
+ <<case 1>>
+ friends
+ <<case 2>>
+ best friends
+ <<case 3>>
+ friends with benefits
+ <<case 4>>
+ lover
+ <<case 5>>
+ slave wife
+ <</switch>>
+ <</if>>
+ <<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
+ <<switch $slaves[_i].relationship>>
+ <<case 1>>
+ dislikes
+ <<case 2>>
+ rival
+ <<case 3>>
+ bitterly hates
+ <</switch>>
+ <</if>>
<<set _eligibilityMilk8 = 1>>
<br>
<</if>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 76f8142e4ef631d9e3e4b8a5b27f50c14c2d04b7..68d1bb07d0f9ad7e9501ae5c5f6d7a560d978a5b 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -100,6 +100,8 @@
<<set $args[0].preg = $args[1].preg>>
<<set $args[0].pregSource = $args[1].pregSource>>
<<set $args[0].pregType = $args[1].pregType>>
+<<set $args[0].fertKnown = $args[1].fertKnown>>
+<<set $args[0].fertPeak = $args[1].fertPeak>>
<<set $args[0].broodmother = $args[1].broodmother>>
<<set $args[0].broodmotherFetuses = $args[1].broodmotherFetuses>>
<<set $args[0].broodmotherOnHold = $args[1].broodmotherOnHold>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 115c3a5bd955d4a05da0811618a38b0cd5debd87..70895ea1ffebbea4afe9b3eac1416e7b42df91a4 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1,7 +1,7 @@
:: pregmod widgets [nobr widget]
<<widget "initPC">>
- <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, genes: "XY", pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, birthFutaSis: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, faceShape: "normal", actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0, girlsOnly: 0}}>>
+ <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, genes: "XY", pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, fertKnown: 0, fertPeak: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, birthFutaSis: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, faceShape: "normal", actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0, girlsOnly: 0}}>>
<<set WombInit($PC)>>
@@ -107,8 +107,10 @@
<<if ndef $args[0].pubertyXX>>
<<if $args[0].physicalAge >= $args[0].pubertyAgeXX>>
<<set $args[0].pubertyXX = 1>>
+ <<set $args[0].fertKnown = 1>>
<<else>>
<<set $args[0].pubertyXX = 0>>
+ <<set $args[0].fertKnown = 0>>
<</if>>
<</if>>
<<if ndef $args[0].pubertyAgeXY>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 369d194bec4a949551081062faa88be630a2f76d..069a181ed860a4a86f82fb4eb55be3735242321d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2803,15 +2803,41 @@ Setting missing slave variables:
<<set _Slave.override_Arm_H_Color = 0>>
<</if>>
-<<if _Slave.skin == "red dyed">>
+<<switch _Slave.skin>>
+<<case "red dyed">>
<<set _Slave.skin = "dyed red">>
-<</if>>
-<<if _Slave.skin == "green dyed">>
+<<case "green dyed">>
<<set _Slave.skin = "dyed green">>
-<</if>>
-<<if _Slave.skin == "blue dyed">>
+<<case "blue dyed">>
<<set _Slave.skin = "dyed blue">>
-<</if>>
+<<case "tanned">>
+ <<set _Slave.skin = "tan">>
+<<case "lightened">>
+ <<set _Slave.skin = "light">>
+<<case "bronzed">>
+ <<set _Slave.skin = "bronze">>
+<<case "darkened">>
+ <<set _Slave.skin = "dark">>
+<<case "natural">>
+<</switch>>
+
+<<switch _Slave.origSkin>>
+<<case "red dyed">>
+ <<set _Slave.origSkin = "dyed red">>
+<<case "green dyed">>
+ <<set _Slave.origSkin = "dyed green">>
+<<case "blue dyed">>
+ <<set _Slave.origSkin = "dyed blue">>
+<<case "tanned">>
+ <<set _Slave.origSkin = randomRaceSkin(_Slave.origRace)>>
+<<case "lightened">>
+ <<set _Slave.origSkin = "light">>
+<<case "bronzed">>
+ <<set _Slave.origSkin = "bronze">>
+<<case "darkened">>
+ <<set _Slave.origSkin = "dark">>
+<<case "natural">>
+<</switch>>
<<if _Slave.markings == "heavily">>
<<set _Slave.markings = "heavily freckled">>
@@ -3046,49 +3072,49 @@ Setting missing slave variables:
<</if>>
<<if (($ver.startsWith("0.6") && !$ver.startsWith("10.6")) || ($ver.startsWith("0.7")) || ($ver.startsWith("0.8")) || ($ver.startsWith("0.9"))) && (!$ver.startsWith("0.9.5")) && (!$ver.startsWith("0.9.6")) && (!$ver.startsWith("0.9.7")) && (!$ver.startsWith("0.9.8")) && (!$ver.startsWith("0.9.9")) && (!$ver.startsWith("0.9.10"))>>
- <<if _Slave.oralSkill > 0>>
- <<if _Slave.oralSkill == 3>>
- <<set _Slave.oralSkill = 100>>
- <<elseif _Slave.oralSkill == 2>>
- <<set _Slave.oralSkill = 65>>
+ <<if _Slave.skill.oral > 0>>
+ <<if _Slave.skill.oral == 3>>
+ <<set _Slave.skill.oral = 100>>
+ <<elseif _Slave.skill.oral == 2>>
+ <<set _Slave.skill.oral = 65>>
<<else>>
- <<set _Slave.oralSkill = 35>>
+ <<set _Slave.skill.oral = 35>>
<</if>>
<</if>>
- <<if _Slave.vaginalSkill > 0>>
- <<if _Slave.vaginalSkill == 3>>
- <<set _Slave.vaginalSkill = 100>>
- <<elseif _Slave.vaginalSkill == 2>>
- <<set _Slave.vaginalSkill = 65>>
+ <<if _Slave.skill.vaginal > 0>>
+ <<if _Slave.skill.vaginal == 3>>
+ <<set _Slave.skill.vaginal = 100>>
+ <<elseif _Slave.skill.vaginal == 2>>
+ <<set _Slave.skill.vaginal = 65>>
<<else>>
- <<set _Slave.vaginalSkill = 35>>
+ <<set _Slave.skill.vaginal = 35>>
<</if>>
<</if>>
- <<if _Slave.analSkill > 0>>
- <<if _Slave.analSkill == 3>>
- <<set _Slave.analSkill = 100>>
- <<elseif _Slave.analSkill == 2>>
- <<set _Slave.analSkill = 65>>
+ <<if _Slave.skill.anal > 0>>
+ <<if _Slave.skill.anal == 3>>
+ <<set _Slave.skill.anal = 100>>
+ <<elseif _Slave.skill.anal == 2>>
+ <<set _Slave.skill.anal = 65>>
<<else>>
- <<set _Slave.analSkill = 35>>
+ <<set _Slave.skill.anal = 35>>
<</if>>
<</if>>
- <<if _Slave.whoreSkill > 0>>
- <<if _Slave.whoreSkill == 3>>
- <<set _Slave.whoreSkill = 100>>
- <<elseif _Slave.whoreSkill == 2>>
- <<set _Slave.whoreSkill = 65>>
+ <<if _Slave.skill.whore > 0>>
+ <<if _Slave.skill.whore == 3>>
+ <<set _Slave.skill.whore = 100>>
+ <<elseif _Slave.skill.whore == 2>>
+ <<set _Slave.skill.whore = 65>>
<<else>>
- <<set _Slave.whoreSkill = 35>>
+ <<set _Slave.skill.whore = 35>>
<</if>>
<</if>>
- <<if _Slave.entertainSkill > 0>>
- <<if _Slave.entertainSkill == 3>>
- <<set _Slave.entertainSkill = 100>>
- <<elseif _Slave.entertainSkill == 2>>
- <<set _Slave.entertainSkill = 65>>
+ <<if _Slave.skill.entertainment > 0>>
+ <<if _Slave.skill.entertainment == 3>>
+ <<set _Slave.skill.entertainment = 100>>
+ <<elseif _Slave.skill.entertainment == 2>>
+ <<set _Slave.skill.entertainment = 65>>
<<else>>
- <<set _Slave.entertainSkill = 35>>
+ <<set _Slave.skill.entertainment = 35>>
<</if>>
<</if>>
<<if ($ver != "0.9.4")>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 1723cdec259f0fcfbe3839da2b1002f1cbc72f05..bca9da1815c74ed666d29999e0b78fbda6c8d4e6 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -222,7 +222,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<</replace>>
<</link>>
<</if>>
-<<if ($activeSlave.combatSkill < 1)>>
+<<if ($activeSlave.skill.combat < 1)>>
<br>//Your bodyguard lacks the combat skill required to fight him hand to hand.//
<<else>>
<br><<link "$He fights him hand to hand">>
@@ -250,12 +250,12 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<set $activeSlave.devotion += 4>>
<<for $i = 0; $i < _SL; $i++>>
<<if $slaves[$i].assignment == "work in the brothel">>
- <<if $slaves[$i].oralSkill < 100>>
- <<set $slaves[$i].oralSkill += 5>>
- <<elseif $slaves[$i].analSkill < 100>>
- <<set $slaves[$i].analSkill += 5>>
- <<elseif ($slaves[$i].vaginalSkill < 100) && ($slaves[$i].vagina > 0)>>
- <<set $slaves[$i].vaginalSkill += 5>>
+ <<if $slaves[$i].skill.oral < 100>>
+ <<set $slaves[$i].skill.oral += 5>>
+ <<elseif $slaves[$i].skill.anal < 100>>
+ <<set $slaves[$i].skill.anal += 5>>
+ <<elseif ($slaves[$i].skill.vaginal < 100) && ($slaves[$i].vagina > 0)>>
+ <<set $slaves[$i].skill.vaginal += 5>>
<</if>>
<</if>>
<</for>>
@@ -271,26 +271,26 @@ $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>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].butt < 3>>
<<set $slaves[$i].butt += 1>>
<<set $slaves[$i].buttImplant += 1>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].face < 95 && $slaves[$i].faceImplant <= 10>>
<<set $slaves[$i].face = Math.clamp($slaves[$i].face+20,-100,100)>>
<<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif ($slaves[$i].waist > -10)>>
<<set $slaves[$i].waist -= 20>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].visualAge > 35 && $slaves[$i].ageImplant == 0 && $slaves[$i].faceImplant <= 10>>
<<set $slaves[$i].ageImplant = 1>><<AgeImplantAdjustment $slaves[$i]>>
<<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].lips <= 40>>
<<set $slaves[$i].lips += 10>>
<<set $slaves[$i].lipsImplant += 10>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<</if>>
<</if>>
<</for>>
@@ -379,7 +379,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<br><<link "It can wait until after some lovemaking with the Concubine">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> the kind of lovemaking you're in the mood for, $he spreads $his arms for you, smiling gently. $He kisses you lovingly, <<if !canTalk($activeSlave)>>taking your hand in $hers and drawing a heart on your palm with one finger.<<else>><<say>>ing, "<<Master>>, I love you."<</if>> <<if ($PC.vagina == 1)>>$He lies on $his side and raises one leg for you so you can straddle the other, sliding up to press your pussy against $his submissive groin. You grind against $him; the stimulation is so strong that $he writhes into the sheets, panting and whining.<<if $PC.dick == 1>> Your stiff dick, unused for once, slides deliciously between your warm bodies.<</if>><<else>><<if ($activeSlave.vagina > 0)>>$His pussy is warm and very wet, making penetration easy; $he gasps and arches $his back, clasping you between $his legs as $his <<= App.Desc.EyeColor>> eyes look deep into yours.<<elseif ($activeSlave.anus > 0)>>$His butt is relaxed and welcoming, and $he holds $his legs back to take missionary anal loving as $his <<= App.Desc.EyeColor>> eyes look deep into yours.<<else>>$He holds $his thighs together for frottage so $he can love you without losing $his virginity.<</if>><</if>> You both know each other quite well, and maintain the gentle communion for a long time. When $he senses your climax building, $he lets $himself climb to orgasm with you, holding <<if ($PC.dick == 0)>>your hips in $his hands<<else>>you in $his arms<</if>>. $He quickly cleans you with $his mouth and heads to the shower. When $he gets out you're back at work, but $he comes out to @@.hotpink;plant another kiss on you.@@
+ When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> the kind of lovemaking you're in the mood for, $he spreads $his arms for you, smiling gently. $He kisses you lovingly, <<if !canTalk($activeSlave)>>taking your hand in $hers and drawing a heart on your palm with one finger.<<else>><<say>>ing, "<<Master>>, I love you."<</if>> <<if ($PC.vagina == 1)>>$He lies on $his side and raises one leg for you so you can straddle the other, sliding up to press your pussy against $his submissive groin. You grind against $him; the stimulation is so strong that $he writhes into the sheets, panting and whining.<<if $PC.dick == 1>> Your stiff dick, unused for once, slides deliciously between your warm bodies.<</if>><<else>><<if ($activeSlave.vagina > 0)>>$His pussy is warm and very wet, making penetration easy; $he gasps and arches $his back, clasping you between $his legs as $his <<= App.Desc.eyeColor>> eyes look deep into yours.<<elseif ($activeSlave.anus > 0)>>$His butt is relaxed and welcoming, and $he holds $his legs back to take missionary anal loving as $his <<= App.Desc.eyeColor>> eyes look deep into yours.<<else>>$He holds $his thighs together for frottage so $he can love you without losing $his virginity.<</if>><</if>> You both know each other quite well, and maintain the gentle communion for a long time. When $he senses your climax building, $he lets $himself climb to orgasm with you, holding <<if ($PC.dick == 0)>>your hips in $his hands<<else>>you in $his arms<</if>>. $He quickly cleans you with $his mouth and heads to the shower. When $he gets out you're back at work, but $he comes out to @@.hotpink;plant another kiss on you.@@
<<set $activeSlave.devotion += 10>>
<<set $activeSlave.oralCount += 1>>
<<set $oralTotal += 1>>
@@ -487,7 +487,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<link "Trust $him to tell them">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You tell $him that you're sure $he'll let them know, since $he understands the situation and knows them all well. $His <<if $activeSlave.visualAge > 35>>mature<<elseif $activeSlave.face > 40>>lovely<<else>>attentive<</if>> face flicks <<if $activeSlave.height >= 185>>over<<else>>up<</if>> to look at you, @@.hotpink;$his <<= App.Desc.EyeColor>> eyes glittering at the compliment.@@ "Thank you, <<Master>>," $he murmurs. There's another flash on the horizon, followed by a series of smaller flashes and a low, slowly growing glow as secondaries go off and start a fire. $activeSlave.slaveName seems affected, a certain amount of moisture gathering in $his eyes, but $he turns away to return to $his duties when it becomes clear that you intend to keep watching for a while, and aren't going to have sex with $him right this minute. $He does $his best to communicate the new reality to those of your slaves who are obedient enough to understand the truth: though they are slaves, @@.mediumaquamarine;there is safety to be found in slavery.@@
+ You tell $him that you're sure $he'll let them know, since $he understands the situation and knows them all well. $His <<if $activeSlave.visualAge > 35>>mature<<elseif $activeSlave.face > 40>>lovely<<else>>attentive<</if>> face flicks <<if $activeSlave.height >= 185>>over<<else>>up<</if>> to look at you, @@.hotpink;$his <<= App.Desc.eyeColor>> eyes glittering at the compliment.@@ "Thank you, <<Master>>," $he murmurs. There's another flash on the horizon, followed by a series of smaller flashes and a low, slowly growing glow as secondaries go off and start a fire. $activeSlave.slaveName seems affected, a certain amount of moisture gathering in $his eyes, but $he turns away to return to $his duties when it becomes clear that you intend to keep watching for a while, and aren't going to have sex with $him right this minute. $He does $his best to communicate the new reality to those of your slaves who are obedient enough to understand the truth: though they are slaves, @@.mediumaquamarine;there is safety to be found in slavery.@@
<<for $i = 0; $i < _SL; $i++>>
<<if $slaves[$i].devotion > 20>>
<<set $slaves[$i].trust += 1>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index d847f8e32682abf8877b2ef627538e707e5d9fee..d399bc4640b50664802375c7c82942ee8a465f91 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -373,7 +373,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
<br><<link "Leave the matter between the Attendant and the slave $he's helping">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You let $activeSlave.slaveName deal with $subSlave.slaveName's troubles; after a short time $he sends $subSlave.slaveName off to shower, and submerges, swimming over to you under the water. $He pokes out of the water, comically letting a huge mouthful of the warm, healthy mineral water run out of $his mouth in a stream before giggling at $himself and smiling at you. "<<Master>>, would you like me to tell you about $subSlave.slaveName?" $he asks. You shake your head, and tell $him no, you trust $him to do $his best to heal anything that ails $his charges. $He looks at you with huge <<= App.Desc.EyeColor>> eyes for a long moment before throwing $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> body into your arms. $He looks up at you and asks incredulously, "<<Master>>, you trust me?" You nod. $He looks shocked but kisses you and drops back down under the water. You feel the lovely sensation of $his <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>nice<</if>> lips <<if ($PC.vagina == 1)>>nibbling their way up towards your clit<<else>>forming a seal around your dickhead<</if>>, and although $he has to come up periodically for air, $he gives you quite a @@.hotpink;loving@@ blowjob.
+ You let $activeSlave.slaveName deal with $subSlave.slaveName's troubles; after a short time $he sends $subSlave.slaveName off to shower, and submerges, swimming over to you under the water. $He pokes out of the water, comically letting a huge mouthful of the warm, healthy mineral water run out of $his mouth in a stream before giggling at $himself and smiling at you. "<<Master>>, would you like me to tell you about $subSlave.slaveName?" $he asks. You shake your head, and tell $him no, you trust $him to do $his best to heal anything that ails $his charges. $He looks at you with huge <<= App.Desc.eyeColor>> eyes for a long moment before throwing $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> body into your arms. $He looks up at you and asks incredulously, "<<Master>>, you trust me?" You nod. $He looks shocked but kisses you and drops back down under the water. You feel the lovely sensation of $his <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>nice<</if>> lips <<if ($PC.vagina == 1)>>nibbling their way up towards your clit<<else>>forming a seal around your dickhead<</if>>, and although $he has to come up periodically for air, $he gives you quite a @@.hotpink;loving@@ blowjob.
<<set $activeSlave.devotion += 10>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index e13c3b862a998747d142ce0c4178924a7cbf27ed..e8bccfeb47989aee4b5f00051cd3019f81e178c4 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -75,11 +75,9 @@
<</if>>
<</for>>
-<<if ($activeSlave.skin == "tanned") || ($activeSlave.skin == "fair")>>
+<<if (skinToneLevel($activeSlave.skin) < 10)>>
<<set $skinDesc = "pink">>
-<<elseif ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>>
- <<set $skinDesc = "pink">>
-<<elseif ($activeSlave.skin == "brown") || ($activeSlave.race == "black")>>
+<<elseif (skinToneLevel($activeSlave.skin) > 20)>>
<<set $skinDesc = "dark brown">>
<<else>>
<<set $skinDesc = "brown">>
@@ -153,7 +151,7 @@ $His $activeSlave.skin face displays nothing but honest gratitude and devotion.
$his pathetically limp dick is practically dripping precum
<<elseif ($activeSlave.clit > 0)>>$his big clit is visibly erect<<else>>a sheen is visible on $his pussylips<</if>>, $his nipples are <<if $activeSlave.nipples != "fuckable">>stiff<<else>>swollen tight<</if>>, and $he's starting to breathe a little hard.
-When you finish and send the slave you were boning on their way with a light slap on the rump, you seat yourself to inspect $activeSlave.slaveName. As you do, <<if ($PC.dick == 0)>>your rather realistically modeled phallus dangles between your legs<<else>>your half-hard but still quite imposing cock hangs between your legs<</if>>, still slick from fucking the previous inspectee. $activeSlave.slaveName's <<if canSee($activeSlave)>><<= App.Desc.EyeColor>><<else>>blank<</if>> eyes focus on it with painful intensity,
+When you finish and send the slave you were boning on their way with a light slap on the rump, you seat yourself to inspect $activeSlave.slaveName. As you do, <<if ($PC.dick == 0)>>your rather realistically modeled phallus dangles between your legs<<else>>your half-hard but still quite imposing cock hangs between your legs<</if>>, still slick from fucking the previous inspectee. $activeSlave.slaveName's <<if canSee($activeSlave)>><<= App.Desc.eyeColor>><<else>>blank<</if>> eyes focus on it with painful intensity,
<<if ($activeSlave.chastityPenis == 1)>>
and the $desc's chastity cage begins to bother $him even more.
<<elseif ($activeSlave.dick > 0) && canAchieveErection($activeSlave)>>
@@ -207,7 +205,7 @@ $He arches $his back and bats $his eyes at you. "A lot."
poor flaccid member, which $he uses a thumb and forefinger to pull upright.
<<elseif ($activeSlave.labia > 0)>>pussy, whose lips are so generous that $he uses both hands to peel them apart.<<elseif ($activeSlave.vagina > 1)>>nice big cunt, which $he spreads shamelessly for you.<<else>>tight pussy.<</if>>
<br><br>
-You often pepper slaves with questions during this inspection; it helps you gauge their mental state, and it's just as important to verbally inspect slaves' minds as it is to visually inspect their parts. You remember with sudden clarity what $activeSlave.slaveName was like when you acquired $him. $He seemed older then.<<if $activeSlave.faceImplant > 0>> $His face has been improved since then, of course, making $him a good deal prettier.<</if>><<if $activeSlave.ageImplant > 0>> The age lift $he received has certainly hidden some of the most evident signs of $his years.<</if>> Decent care, diet, and exercise have done wonders. But more than all of that trivial physical stuff, the sexual hunger visible in $his <<= App.Desc.EyeColor>> eyes makes $him look like a teenager. You ask $him if $he remembers what $he was like when you enslaved $him. $He hesitates, wondering how to answer, but decides that honesty is the best policy and <<say>>s, "I remember it every day, <<Master>>. I'm grateful. I didn't think of my<<s>>elf a<<s>> too pretty, then." $He giggles. "Becoming a fuck<<s>>lave really improved my <<s>>elf e<<s>>teem.
+You often pepper slaves with questions during this inspection; it helps you gauge their mental state, and it's just as important to verbally inspect slaves' minds as it is to visually inspect their parts. You remember with sudden clarity what $activeSlave.slaveName was like when you acquired $him. $He seemed older then.<<if $activeSlave.faceImplant > 0>> $His face has been improved since then, of course, making $him a good deal prettier.<</if>><<if $activeSlave.ageImplant > 0>> The age lift $he received has certainly hidden some of the most evident signs of $his years.<</if>> Decent care, diet, and exercise have done wonders. But more than all of that trivial physical stuff, the sexual hunger visible in $his <<= App.Desc.eyeColor>> eyes makes $him look like a teenager. You ask $him if $he remembers what $he was like when you enslaved $him. $He hesitates, wondering how to answer, but decides that honesty is the best policy and <<say>>s, "I remember it every day, <<Master>>. I'm grateful. I didn't think of my<<s>>elf a<<s>> too pretty, then." $He giggles. "Becoming a fuck<<s>>lave really improved my <<s>>elf e<<s>>teem.
<<if ($activeSlave.energy > 95)>>
I can't imagine going back to having a<<s>> little <<s>>e<<x>> a<<s>> I u<<s>>ed to have. It would be awful.
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
@@ -269,7 +267,7 @@ I try to be a good <<s>>lave girl for you, <<Master>>. Can I — can I be a good
<<EventNameLink>> comes in for an inspection. You have a relaxed day scheduled, so you take the time to do an unusually thorough job. On a whim, you pull up $his complete file, flipping the virtual pages out across your desk. The induction pictures are particularly striking. $He doesn't look much like that, anymore, and that's a good thing. $He was not a pretty girl when you got here, though $he's pretty enough now. With a desk control gesture you flip a full frontal shot of $him on the day of $his enslavement up onto a wallscreen.
<br><br>
-$His <<= App.Desc.EyeColor>> eyes track your sudden motion, of course, and $he follows it to the screen. Suddenly, the $desc is eye to eye with a life-size picture of who $he used to be, just a few <<if $showInches == 2>>feet<<else>>meters<</if>> away. $He gasps with recognition, and then $his face clouds inscrutably. $He takes a couple of hesitant steps forward, and then reaches out to touch the cheek of the $girl in the picture. As $his fingertips brush the smooth surface of the wallscreen, $his other hand ghosts along $his own face. $His expression is not sad, so it's surprising when a single tear rolls down $his cheek. You order $him to tell you how the picture makes $him feel.
+$His <<= App.Desc.eyeColor>> eyes track your sudden motion, of course, and $he follows it to the screen. Suddenly, the $desc is eye to eye with a life-size picture of who $he used to be, just a few <<if $showInches == 2>>feet<<else>>meters<</if>> away. $He gasps with recognition, and then $his face clouds inscrutably. $He takes a couple of hesitant steps forward, and then reaches out to touch the cheek of the $girl in the picture. As $his fingertips brush the smooth surface of the wallscreen, $his other hand ghosts along $his own face. $His expression is not sad, so it's surprising when a single tear rolls down $his cheek. You order $him to tell you how the picture makes $him feel.
<br><br>
$He looks pensive, and goes through two false starts before $he clears $his throat, wrenches $his gaze away from $his picture, and <<say>>s introspectively, "<<Master>>, it'<<s>> <<s>>trange. We — we don't have picture<<s>> of our<<s>>elve<<s>>, from before we were en<<s>>laved. I didn't really reali<<z>>e how much I'd changed. <<S>>ome day<<s>> being a <<s>>lave i<<s>> hard. But <<s>>eeing that picture, it make<<s>> me feel better about it. You — you're really <<if $PC.title == 1>>hand<<s>>ome<<else>>pretty<</if>>, <<Master>>. I bet you alway<<s>> were." $He inclines $his head towards the homely $girl on the screen. "It'<<s>> hard to be ugly, <<Master>>. Really hard. I feel <<s>>orry for that $girl, and I'm glad I don't look like $him anymore." $He laughs suddenly, a little self-consciously. "The cra<<z>>y thing i<<s>>, if you'd told that $girl that
<<if $activeSlave.assignment == "whore">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index b7197cb4beddc164b875a53a0ff7ee42388c528a..2aeb27d1a3f6b959810d2fdc30d5ef4a12222bc2 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -200,7 +200,7 @@ $He was mindbroken, but seems to have snapped out of it due to a deep love of yo
<<case "mutinery attempt">>
<<set $mutinery = 1>>
-Finishing your work, you lean back for a break well deserved break. Your peace is quickly disturbed by several loud smashes from down the penthouse hall. As you get up from your desk, you hear somebody running down the hallway, and before you know it, <<EventNameLink>> is inside. $He is looking quite treacherous and <<if $activeSlave.combatSkill > 0>>relatively confident<<else>>somewhat unsure<</if>>. $He quickly reaches in to grab you,
+Finishing your work, you lean back for a break well deserved break. Your peace is quickly disturbed by several loud smashes from down the penthouse hall. As you get up from your desk, you hear somebody running down the hallway, and before you know it, <<EventNameLink>> is inside. $He is looking quite treacherous and <<if $activeSlave.skill.combat > 0>>relatively confident<<else>>somewhat unsure<</if>>. $He quickly reaches in to grab you,
<<if ($PC.career == "gang")>>
<<if ($personalArms != 0)>>
but when you point your handgun towards $him, $he stutters back with $his hands pointing upwards.
@@ -243,7 +243,7 @@ Finishing your work, you lean back for a break well deserved break. Your peace i
<<setSpokenLocalPronouns $activeSlave $HeadGirl>>
<<run Enunciate($HeadGirl)>>
You jump in surprise as $HeadGirl.slaveName tackles $him off you and to the floor
- <<if $HeadGirl.combatSkill > 0>>
+ <<if $HeadGirl.skill.combat > 0>>
where _he2 twists $his arm in an arm hold until the rebellious slave stops struggling.
<<else>>
where _he2 settles _his2 weight on the struggling rebel, lacking any better idea of what to do.
@@ -361,7 +361,7 @@ With $his back arched and $his thighs together $his <<if $activeSlave.butt > 5>>
<<case "sore shoulders">>
-<<EventNameLink>> comes before you for a routine inspection. The <<if $activeSlave.muscles > 95>>heavily muscled<<elseif $activeSlave.muscles > 30>>ripped<<else>>toned<</if>><<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> and heavily pregnant<<elseif $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>pregnant<</if>> $desc is looking good, but as $he raises $his arms over $his head to spin $his nude torso under your gaze, $he winces slightly. <<if canSee($activeSlave)>>$His <<= App.Desc.EyeColor>> eyes flick up to see if you noticed, and $his face falls a little when $he sees that you did. You raise one eyebrow, and the obedient slave explains $himself<<elseif canHear($activeSlave)>>$His ears perk up to hear if you noticed. You clear your throat, startling $him and making $him explain $himself<<else>>$He tries to affect a stoic expression, but when you tentatively touch one of $his shoulders, $he grimaces slightly and quickly opts to explain $himself<</if>>.
+<<EventNameLink>> comes before you for a routine inspection. The <<if $activeSlave.muscles > 95>>heavily muscled<<elseif $activeSlave.muscles > 30>>ripped<<else>>toned<</if>><<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> and heavily pregnant<<elseif $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>pregnant<</if>> $desc is looking good, but as $he raises $his arms over $his head to spin $his nude torso under your gaze, $he winces slightly. <<if canSee($activeSlave)>>$His <<= App.Desc.eyeColor>> eyes flick up to see if you noticed, and $his face falls a little when $he sees that you did. You raise one eyebrow, and the obedient slave explains $himself<<elseif canHear($activeSlave)>>$His ears perk up to hear if you noticed. You clear your throat, startling $him and making $him explain $himself<<else>>$He tries to affect a stoic expression, but when you tentatively touch one of $his shoulders, $he grimaces slightly and quickly opts to explain $himself<</if>>.
<<if !canTalk($activeSlave)>>
$He uses gestures to beg your pardon, and explains that yesterday was arm day for $him, and $he went out a little hard. $His shoulders are a little sore, but $he gestures that $he's all right.
<<else>>
@@ -424,10 +424,12 @@ clings to you in $his sleep as the warmth of your body begins to move away from
<<case "confident tanning">>
It's an unusually nice day, with mild sunshine, light breezes, and nothing offensive or dangerous in the atmosphere. In the middle of the afternoon, you take a break from your busy schedule of sex and business and stroll out onto one of your penthouse balconies. It seems <<EventNameLink>> was struck by a similar impulse. <<if $activeSlave.assignment == "rest">>$He's assigned to do little but rest<<else>>This is one of $his rest periods<</if>>, so $he's come out here to lay naked on a towel and enjoy the sun.
-<<if ["black", "brown", "dark brown", "dark olive", "dark", "ebony", "pure black"].includes($activeSlave.skin)>>
+<<if (skinToneLevel($activeSlave.skin) > 20)>>
$His $activeSlave.skin doesn't tan much, so $he's just out here to bask in its warmth. $His body shines with lotion from a bottle lying next to $him, but it's just general-purpose stuff.
-<<elseif ($activeSlave.skin == "tanned")>>
+<<elseif ($activeSlave.skin == "sun tanned")>>
$His tanned skin shines with lotion from a bottle lying next to $him.
+<<elseif ($activeSlave.skin == "spray tanned")>>
+ Since $his fake tan would otherwise be (rather ironically) ruined by the sun, $his skin shines with sunblock lotion from a bottle lying next to $him.
<<else>>
$His skin shines with sunblock lotion from a bottle lying next to $him. It would be foolish of $him to let the sun ruin $his $activeSlave.skin skin.
<</if>>
@@ -449,7 +451,7 @@ $He's lying on $his back with $his arms outstretched, $his <<if ($activeSlave.bo
<<default>>
nipples look pleasantly soft and warm in the sun.
<</switch>>
-As you consider $his radiant body, $he senses your presence, either realizing you're there through $his closed eyes or coming out of a light sleep at your proximity. $He opens $his <<= App.Desc.EyeColor>> eyes a slit and stretches deliciously, arching $his back luxuriantly, and murmurs, "Hi <<Master>>."
+As you consider $his radiant body, $he senses your presence, either realizing you're there through $his closed eyes or coming out of a light sleep at your proximity. $He opens $his <<= App.Desc.eyeColor>> eyes a slit and stretches deliciously, arching $his back luxuriantly, and murmurs, "Hi <<Master>>."
<<case "devoted nympho">>
@@ -585,7 +587,7 @@ provides just enough stimulation that $he climaxes. $His hands ball into fists a
<</if>>
of girlcum out onto $his legs and the floor.
<</if>>
-$He stands up straight, but this brings $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes up to gaze straight into yours<<else>>face to face with you<</if>>, and the mixed release, humiliation, and naughtiness of having climaxed prematurely right in front of $his <<= WrittenMaster()>> produces an aftershock, adding to the mess on the floor.
+$He stands up straight, but this brings $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes up to gaze straight into yours<<else>>face to face with you<</if>>, and the mixed release, humiliation, and naughtiness of having climaxed prematurely right in front of $his <<= WrittenMaster()>> produces an aftershock, adding to the mess on the floor.
<<case "devoted exhibition">>
@@ -657,7 +659,7 @@ Slaves with powerful sex drives like $hers often find it necessary to masturbate
<<case "terrified inspection">>
-<<EventNameLink>> appears in the door of your office for a scheduled inspection. $He hesitates in the doorway, <<if canSee($activeSlave)>>staring fixedly downward with huge <<= App.Desc.EyeColor>> eyes<<else>>$his face towards the floor<</if>>, before stumbling forward to stand in front of your desk. $His chest is rising and falling with panicked hyperventilation. The poor
+<<EventNameLink>> appears in the door of your office for a scheduled inspection. $He hesitates in the doorway, <<if canSee($activeSlave)>>staring fixedly downward with huge <<= App.Desc.eyeColor>> eyes<<else>>$his face towards the floor<</if>>, before stumbling forward to stand in front of your desk. $His chest is rising and falling with panicked hyperventilation. The poor
$desc
is terrified of you for some reason.
<br><br>
@@ -742,9 +744,9 @@ You pass one of the penthouse's several supply closets by chance, and are surpri
<<else>>
on all fours
<</if>>
-in the middle of the room with the machines all around $him. $He has <<if canDoVaginal($activeSlave)>><<if $activeSlave.vagina > 2>>two large dildos working $his gaping cunt, <<elseif $activeSlave.vagina > 1>>a large dildo working $his cunt, <<elseif $activeSlave.vagina > 0>>a dildo working $his tight pussy, <</if>><</if>><<if canDoAnal($activeSlave)>><<if $activeSlave.anus > 2>>two large dildos fucking $his enormous butthole, <<elseif $activeSlave.anus > 1>>a large dildo fucking $his butthole, <<elseif $activeSlave.anus > 0>>a dildo fucking $his tight butt, <</if>><</if>><<if $activeSlave.boobs > 1200>>has lubricated $his cavernous cleavage to titfuck another, <<elseif $activeSlave.boobs > 400>>has lubricated $his cleavage to titfuck another, <</if>><<if $activeSlave.nipples == "fuckable">>has a pair pistoning in and out of $his nipples, <</if>><<if $activeSlave.amp != 1>>is performing two handjobs at once, to either side, <</if>><<if $activeSlave.belly >= 5000>>has lubricated the sides of $his _belly <<if $activeSlave.bellyPreg >= 3000>> pregnancy<</if>>, along with $his inner thighs, to create a sort of belly job, <</if>><<if $activeSlave.oralSkill >= 60>>and is making use of $his outstanding oral skills to suck off two more.<<elseif $activeSlave.oralSkill > 30>>and is taking a throatfuck from one more.<<else>>and is giving the final one a blowjob.<</if>> When $he <<if canSee($activeSlave)>>sees that you've entered — which takes a while, since $he's distracted<<elseif canHear($activeSlave)>>hears that you've entered — which takes a while, given the amount of noise<<else>>realizes that you've entered — which takes a while, considering $his state<</if>> — $he tries to smile<<if $activeSlave.amp != 1>> and wave<</if>>.
+in the middle of the room with the machines all around $him. $He has <<if canDoVaginal($activeSlave)>><<if $activeSlave.vagina > 2>>two large dildos working $his gaping cunt, <<elseif $activeSlave.vagina > 1>>a large dildo working $his cunt, <<elseif $activeSlave.vagina > 0>>a dildo working $his tight pussy, <</if>><</if>><<if canDoAnal($activeSlave)>><<if $activeSlave.anus > 2>>two large dildos fucking $his enormous butthole, <<elseif $activeSlave.anus > 1>>a large dildo fucking $his butthole, <<elseif $activeSlave.anus > 0>>a dildo fucking $his tight butt, <</if>><</if>><<if $activeSlave.boobs > 1200>>has lubricated $his cavernous cleavage to titfuck another, <<elseif $activeSlave.boobs > 400>>has lubricated $his cleavage to titfuck another, <</if>><<if $activeSlave.nipples == "fuckable">>has a pair pistoning in and out of $his nipples, <</if>><<if $activeSlave.amp != 1>>is performing two handjobs at once, to either side, <</if>><<if $activeSlave.belly >= 5000>>has lubricated the sides of $his _belly <<if $activeSlave.bellyPreg >= 3000>> pregnancy<</if>>, along with $his inner thighs, to create a sort of belly job, <</if>><<if $activeSlave.skill.oral >= 60>>and is making use of $his outstanding oral skills to suck off two more.<<elseif $activeSlave.skill.oral > 30>>and is taking a throatfuck from one more.<<else>>and is giving the final one a blowjob.<</if>> When $he <<if canSee($activeSlave)>>sees that you've entered — which takes a while, since $he's distracted<<elseif canHear($activeSlave)>>hears that you've entered — which takes a while, given the amount of noise<<else>>realizes that you've entered — which takes a while, considering $his state<</if>> — $he tries to smile<<if $activeSlave.amp != 1>> and wave<</if>>.
<br><br>
-The source of the many-voiced personal assistant becomes clear: probably on the incorrigible $activeSlave.slaveName's request, your sultry personal assistant is voicing each and every one of the machines. When the nymphomaniac masturbator tries to smile <<if $activeSlave.amp != 1>> and wave<</if>>, there's an absolute chorus of "Back to work, slut," "Smile less, suck more," "Take it, bitch," et cetera. Yet another instance of $assistantName chuckles in your ear. "Care to join in, <<= properTitle()>>? I'm sure we can find room somewhere."
+The source of the many-voiced personal assistant becomes clear: probably on the incorrigible $activeSlave.slaveName's request, your sultry personal assistant is voicing each and every one of the machines. When the nymphomaniac masturbator tries to smile <<if $activeSlave.amp != 1>> and wave<</if>>, there's an absolute chorus of "Back to work, slut", "Smile less, suck more", "Take it, bitch", et cetera. Yet another instance of $assistantName chuckles in your ear. "Care to join in, <<= properTitle()>>? I'm sure we can find room somewhere."
<<case "sore ass">>
@@ -1246,7 +1248,7 @@ Your order $him to turn around and present $his anus for inspection. $He doesn't
In the morning the penthouse is a busy bustle of female energy. Slaves get up promptly, eat, shower, dress themselves, and head out to work. They chatter if able and allowed, and draw a good deal of strength from each other. As you pass by the kitchen, you are narrowly avoided by a rush of girls heading to the showers. They're almost bouncing, feeding off each others' youthful energy. At the back of the pack is <<EventNameLink>>. $He looks as young as any of them, but after they're out, $he leans against the door frame for a moment and exhales slowly.
<br><br>
-$His <<= App.Desc.EyeColor>> eyed gaze catches yours for a moment, and you are reminded that $he isn't as young as they are, not at all. $His face might look youthful, but $his eyes don't. <<if canSee($activeSlave)>>$He sees your consideration, and<<else>>You make yourself known, and $he<</if>> murmurs, "<<S>>orry, <<Master>>. Ju<<s>>t a little <<s>>low thi<<s>> morning."
+$His <<= App.Desc.eyeColor>> eyed gaze catches yours for a moment, and you are reminded that $he isn't as young as they are, not at all. $His face might look youthful, but $his eyes don't. <<if canSee($activeSlave)>>$He sees your consideration, and<<else>>You make yourself known, and $he<</if>> murmurs, "<<S>>orry, <<Master>>. Ju<<s>>t a little <<s>>low thi<<s>> morning."
$He hurries after $his sisters, $his
<<if $activeSlave.butt > 12>>
massive
@@ -1307,7 +1309,7 @@ Though it's late, $he's surprised to find the lights in the master suite off. Yo
<<else>>
sits on
<</if>>
-the edge of the bed, preparing to climb quietly in. $He clearly thinks you're asleep, and is doing $his best not to wake you. The dim, blue-toned light of your bedroom at night washes out $his $activeSlave.skin skin and robs $his <<= App.Desc.EyeColor>> eyes of their color, but it highlights
+the edge of the bed, preparing to climb quietly in. $He clearly thinks you're asleep, and is doing $his best not to wake you. The dim, blue-toned light of your bedroom at night washes out $his $activeSlave.skin skin and robs $his <<= App.Desc.eyeColor>> eyes of their color, but it highlights
<<if ($activeSlave.belly >= 100000)>>
$his _belly dome of a stomach,
<<if $activeSlave.bellyPreg >= 3000>>
@@ -1650,7 +1652,7 @@ $He hasn't been with you long; it's been a mere <<print $week-$activeSlave.weekA
<<case "cage relief">>
-You come face to face with <<EventNameLink>> in a hallway of your penthouse, entirely by happenstance. <<if canSee($activeSlave)>>$His <<= App.Desc.EyeColor>> eyes lock with yours, and $he stares at you dumbly for a long moment<<else>>Once $he regains $his footing after bumping into you, $he gazes towards you dumbly for a long moment<</if>>. Then $he squares $his <<if $activeSlave.shoulders > 0>>broad<<elseif $activeSlave.shoulders < 0>>pretty<<else>>feminine<</if>> shoulders and bites $his lower lip, obviously doing $his best to think quickly. Right when you're about to reprimand $him for not greeting you properly, $he surprises you by throwing $himself abjectly on the ground in front of you<<if $activeSlave.belly >= 10000>>, $his rear forced into the air by $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant<<else>>distended<</if>> belly<</if>>.
+You come face to face with <<EventNameLink>> in a hallway of your penthouse, entirely by happenstance. <<if canSee($activeSlave)>>$His <<= App.Desc.eyeColor>> eyes lock with yours, and $he stares at you dumbly for a long moment<<else>>Once $he regains $his footing after bumping into you, $he gazes towards you dumbly for a long moment<</if>>. Then $he squares $his <<if $activeSlave.shoulders > 0>>broad<<elseif $activeSlave.shoulders < 0>>pretty<<else>>feminine<</if>> shoulders and bites $his lower lip, obviously doing $his best to think quickly. Right when you're about to reprimand $him for not greeting you properly, $he surprises you by throwing $himself abjectly on the ground in front of you<<if $activeSlave.belly >= 10000>>, $his rear forced into the air by $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant<<else>>distended<</if>> belly<</if>>.
<br><br>
<<if !canTalk($activeSlave)>>
$He uses gestures to apologize for $his rudeness, and then gets to $his knees so $he can use $his hands to gesture more clearly. $His hands are shaky as $he begs, making two false starts before unmistakably gesturing to ask you to cut $his balls off. Once $he <<if canSee($activeSlave)>>sees<<else>>figures<</if>> that you understand, $he begins to cry openly. $He gestures that $he can barely get off wearing $his chastity cage, that it hurts when $he does, and that $he's constantly oppressed by the need for release. $He thinks that it would be easier to be soft all the time, so $he could climax without discomfort. $He begs hard, and promises to be a good little bitch.
@@ -2013,7 +2015,7 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgment<</if>>, $he
<<if ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1)>>
gives a submissive shudder, and turns to show you $his bare back.
"<<Master>>, may I have a cor<<s>>et pier<<c>>ing? I would love to feel more, um, bound. Tied up. Plea<<s>>e?"
- $He awaits your answer coquettishly, <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes huge<<else>>a look of begging on $his face<</if>>.
+ $He awaits your answer coquettishly, <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor>> eyes huge<<else>>a look of begging on $his face<</if>>.
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1)>>
blows you a wet kiss.
"<<Master>>, may I have a tongue pier<<c>>ing? It would take my dick <<s>>ucking to the next level. Plea<<s>>e?"
@@ -2289,7 +2291,7 @@ You complete the final rep of your first workout of the day, rack the bar, and j
<</if>>
<</if>>
<br><br>
-$His <<= App.Desc.EyeColor>> eyes track up your torso comically until $he's looking into your eyes. $He stares dumbly at you for a moment before realizing what $he's doing and blushing with embarrassment. $He's reasonably well broken, but is still coming to terms with $his sexual place as a $desc.
+$His <<= App.Desc.eyeColor>> eyes track up your torso comically until $he's looking into your eyes. $He stares dumbly at you for a moment before realizing what $he's doing and blushing with embarrassment. $He's reasonably well broken, but is still coming to terms with $his sexual place as a $desc.
In particular, $he hasn't gotten used to the effects of $his training, the slave food, and the atmosphere in the penthouse, all of which are serving to fuel an acceleration of $his sex drive.
<<if !canTalk($activeSlave)>>
$He uses shaky hands to ask you to fuck $him,
@@ -2300,7 +2302,7 @@ and turns to flee.
<<case "dickgirl PC">>
-Having just enjoyed one of your slaves, you take a quick post-coital rinse in one of the showers scattered around the arcology for the purpose. Thus refreshed, you step out and come face to face with <<EventNameLink>>, who is going about $his assigned business. $His <<= App.Desc.EyeColor>> eyes lock with yours for a surprised moment, and then flick down submissively.
+Having just enjoyed one of your slaves, you take a quick post-coital rinse in one of the showers scattered around the arcology for the purpose. Thus refreshed, you step out and come face to face with <<EventNameLink>>, who is going about $his assigned business. $His <<= App.Desc.eyeColor>> eyes lock with yours for a surprised moment, and then flick down submissively.
<br><br>
As $his gaze travels down your body towards the floor,
<<if $activeSlave.attrXY <= 35>>
@@ -2559,7 +2561,7 @@ To go by $his behavior, the likelihood that $he's actually eager to <<if $PC.dic
<<EventNameLink>> is standing before you for an inspection. The obedient
$desc
-has run through the prescribed motions of a normal inspection, and you've reached the part of the routine where you usually ask the slave a few questions, give $him a few orders, or fuck $him. $His <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes are watching you closely<<else>>face is centered on you<</if>>, and $he's <<if canHear($activeSlave)>>listening carefully<<else>>waiting patiently<</if>> for direction. This is probably due to linguistic anxiety: $he can understand the most straightforward commands, but giving $him orders is often an exercise in <<if canSee($activeSlave)>>pointing and gesturing, or when that fails, simply<<else>>frustration, ending with you simply<</if>> pushing and pulling $his usually-compliant body into the proper place.
+has run through the prescribed motions of a normal inspection, and you've reached the part of the routine where you usually ask the slave a few questions, give $him a few orders, or fuck $him. $His <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes are watching you closely<<else>>face is centered on you<</if>>, and $he's <<if canHear($activeSlave)>>listening carefully<<else>>waiting patiently<</if>> for direction. This is probably due to linguistic anxiety: $he can understand the most straightforward commands, but giving $him orders is often an exercise in <<if canSee($activeSlave)>>pointing and gesturing, or when that fails, simply<<else>>frustration, ending with you simply<</if>> pushing and pulling $his usually-compliant body into the proper place.
<<case "kitchen molestation">>
@@ -2656,7 +2658,7 @@ $He's chosen to do it in a dark corner and looks like $he's hurrying; $he clearl
It's a sunny morning, with rare mild weather, and you're stuck at your desk, as usual. After the typical rush of slaves clears the kitchen after the breakfast hour, you see one peel off to stand out on a balcony for a moment with the light on $his face. You pay little attention to such a trifle, but then notice that it's <<EventNameLink>>.
<br><br>
-You head out and find that $he's looking up at the sun with $his <<= App.Desc.EyeColor>> eyes closed, letting the warmth and light envelop $his
+You head out and find that $he's looking up at the sun with $his <<= App.Desc.eyeColor>> eyes closed, letting the warmth and light envelop $his
<<if ($activeSlave.face > 95)>>
incredible
<<elseif ($activeSlave.face > 40)>>
@@ -2915,7 +2917,7 @@ $He comes to a stop right beside your elbow, waiting for further direction, just
<</if>>
showing unmistakably how badly $he needs release.
<<else>>
- $He keeps $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>> slightly downcast, $his back arched, $his chest pressed outward, and $his bottom stuck out a bit. $He's the perfect picture of an obedient little sex slave<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
+ $He keeps $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>> slightly downcast, $his back arched, $his chest pressed outward, and $his bottom stuck out a bit. $He's the perfect picture of an obedient little sex slave<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
<</if>>
<<case "tittymonster inspection">>
@@ -3479,7 +3481,7 @@ $His
<</if>>
malnourished.
<</if>>
-$His $activeSlave.faceShape face is clearly conflicted, and <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes shift<<else>>$he glances about<</if>> with nervous energy. $He is clearly unsure whether $he should say what $he came here to say.
+$His $activeSlave.faceShape face is clearly conflicted, and <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor>> eyes shift<<else>>$he glances about<</if>> with nervous energy. $He is clearly unsure whether $he should say what $he came here to say.
<br><br>
When you finally ask $him what $he wants, $he hesitates for a moment and then suddenly seems to gain $his courage<<if $activeSlave.accent > 1>>, speaking in an atrociously thick accent<<elseif $activeSlave.accent > 0>>, speaking in a cute little accent<</if>>.
"Plea<<s>>e, <<Master>> I'm <<s>>o hungry! It <<s>>eem<<s>> like all I get to eat i<<s>> cum. It'<<s>> di<<s>>gu<<s>>ting! Plea<<s>>e! I have to eat <<s>>o much of it. Can I be allowed to eat regular food again? Plea<<s>>e, <<Master>>, I'm <<s>>o hungry. I need real food!"
@@ -3718,7 +3720,7 @@ The slutty $desc wants it badly.
You happen to come across <<EventNameLink>> during one of $his rest periods. $He's lying on a couch in the slave areas, <<if canSee($activeSlave)>>staring at the ceiling above $him<<else>>leaning back<</if>> with a dreamy expression on $his face. $He's <<if $activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation">>touching $himself idly.<<else>>not allowed to touch $himself, but $he's extremely aroused.<</if>> Whatever's on $his mind, it's so absorbing that $he doesn't realize you're there until you're standing over $him.
<br><br>
-"<<S>>orry, <<Master>>," $he <<say>>s apologetically, <<if $activeSlave.belly >= 10000>>struggling<<else>>scrambling<</if>> to $his feet. "I didn't noti<<c>>e you there." <<if canSee($activeSlave)>>Seeing your questioning look<<elseif canHear($activeSlave)>>Hearing your lack of response<<else>>Sensing a request to continue<</if>>, $he explains $himself further. "I was ju<<s>>t thinking about, um, my favorite pla<<c>>e. I can almo<<s>>t get off ju<<s>>t by thinking about it." There's a wild, perverted gleam <<if canSee($activeSlave)>>in $his <<= App.Desc.EyeColor>> eyes<<else>>on $his face<</if>>. $He's a confirmed sadist, so whatever $his favorite mental masturbation is probably quite strong.
+"<<S>>orry, <<Master>>," $he <<say>>s apologetically, <<if $activeSlave.belly >= 10000>>struggling<<else>>scrambling<</if>> to $his feet. "I didn't noti<<c>>e you there." <<if canSee($activeSlave)>>Seeing your questioning look<<elseif canHear($activeSlave)>>Hearing your lack of response<<else>>Sensing a request to continue<</if>>, $he explains $himself further. "I was ju<<s>>t thinking about, um, my favorite pla<<c>>e. I can almo<<s>>t get off ju<<s>>t by thinking about it." There's a wild, perverted gleam <<if canSee($activeSlave)>>in $his <<= App.Desc.eyeColor>> eyes<<else>>on $his face<</if>>. $He's a confirmed sadist, so whatever $his favorite mental masturbation is probably quite strong.
<<case "ass fitting">>
@@ -4140,7 +4142,7 @@ in front of you, awaiting further direction.
<</if>>
showing unmistakably how badly $he needs release.
<<else>>
- $He keeps $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>> slightly downcast, $his hands lightly smoothing the folds from $his tight skirt while $his breasts visibly rise and fall under $his even tighter blouse<<if $activeSlave.belly >= 5000>>. Between the two, there is little $he can do to cover $his exposed <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>. $He's the perfect picture of an attentive little old world girlfriend<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
+ $He keeps $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>face<</if>> slightly downcast, $his hands lightly smoothing the folds from $his tight skirt while $his breasts visibly rise and fall under $his even tighter blouse<<if $activeSlave.belly >= 5000>>. Between the two, there is little $he can do to cover $his exposed <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>. $He's the perfect picture of an attentive little old world girlfriend<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
<</if>>
<<case "devoted shortstack">>
@@ -4171,7 +4173,7 @@ in front of you, awaiting further direction.
<<else>>
$loli
<</if>>
-is looking good despite $his diminutive height. When $he raises $his arms above $his head to submit to an inspection under your gaze, the top of $his $activeSlave.hColor-haired head doesn't even reach your chest. Despite the discrepancy between your height and $hers, you notice an unmistakable flush of embarrassment tinging $his cheeks. <<if canSee($activeSlave)>>$His <<= App.Desc.EyeColor>> eyes flick up to gaze at you, but $he must crane $his head upwards as well to meet your gaze<<elseif canHear($activeSlave)>>$His ears perk up to hear at the sound of some minute noise you made, before $he cranes $his head upwards so that $his sightless eyes may meet your gaze<<else>>$He knows from training and experience how tall you are, and uses this knowledge to crane $his head exactly so that your gaze meets $his face directly<</if>>.
+is looking good despite $his diminutive height. When $he raises $his arms above $his head to submit to an inspection under your gaze, the top of $his $activeSlave.hColor-haired head doesn't even reach your chest. Despite the discrepancy between your height and $hers, you notice an unmistakable flush of embarrassment tinging $his cheeks. <<if canSee($activeSlave)>>$His <<= App.Desc.eyeColor>> eyes flick up to gaze at you, but $he must crane $his head upwards as well to meet your gaze<<elseif canHear($activeSlave)>>$His ears perk up to hear at the sound of some minute noise you made, before $he cranes $his head upwards so that $his sightless eyes may meet your gaze<<else>>$He knows from training and experience how tall you are, and uses this knowledge to crane $his head exactly so that your gaze meets $his face directly<</if>>.
<<if !canTalk($activeSlave)>>
$He uses gestures to beg your pardon, even as $he continues to blush rosily, and explains that $he doesn't understand why you keep $him in your penthouse, when there are such tall, beautiful slaves in abundance in your arcology. $He pauses, shuffling about a little shamefacedly before signing that $he thinks their bodies could be more fit to pleasure you.
<<else>>
@@ -4255,7 +4257,7 @@ face that the gag is a distressing addition to $his life. When you don't immedia
<<else>>
fatigue after $his long day.
<</if>>
-From $his new position beneath you, $he must crane $his neck so $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>sightless eyes<</if>> may meet yours. With $his mouth gagged, $he is almost the perfect image of a submissive slave.
+From $his new position beneath you, $he must crane $his neck so $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes<<else>>sightless eyes<</if>> may meet yours. With $his mouth gagged, $he is almost the perfect image of a submissive slave.
<<case "back stretch">>
@@ -4793,7 +4795,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Embrace $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You gently grab $his face and stare deeply into $his <<= App.Desc.EyeColor>> eyes. <<if canSee($activeSlave)>>They are full of life as opposed to their usual dullness<<else>>They are as dull as always, but that isn't $his fault. $His facial expressions at the act tell you all you need to know<</if>>. You pull your wife into a tight embrace — $him coming back to you is more than enough of a gift; $he needn't do anything more for now. You pull the covers over the both of you and begin to doze off, smiling at the warmth cuddling ever closer to you.
+ You gently grab $his face and stare deeply into $his <<= App.Desc.eyeColor>> eyes. <<if canSee($activeSlave)>>They are full of life as opposed to their usual dullness<<else>>They are as dull as always, but that isn't $his fault. $His facial expressions at the act tell you all you need to know<</if>>. You pull your wife into a tight embrace — $him coming back to you is more than enough of a gift; $he needn't do anything more for now. You pull the covers over the both of you and begin to doze off, smiling at the warmth cuddling ever closer to you.
$He is @@.green;no longer mindbroken@@ and thanks to your care deeply and sincerely @@.hotpink;loves@@ and @@.mediumaquamarine;trusts@@ you.
<<set $activeSlave.devotion = 100, $activeSlave.oldDevotion = 100, $activeSlave.trust = 100, $activeSlave.oldTrust = 100, $activeSlave.sexualQuirk = "romantic", $activeSlave.fetish = "none", $activeSlave.fetishKnown = 1>>
<<set $activeSlave.intelligence = $genePool[_ress].intelligence>>
@@ -5966,7 +5968,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
kid
<</if>>
- cuddled up beside you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> lowers the temperature in the room and directs another slave to quietly put a couple of warm blankets over you and $activeSlave.slaveName. When you finally wake, several hours later, the effect is magical. You're ensconced in a little island of warmth and comfort, a tiny universe of relaxation populated only by yourself and your slave. $He woke before you did, but remained still to avoid disturbing you. <<if canSee($activeSlave)>>From the lazy, contented look in $his <<= App.Desc.EyeColor>> eyes as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face when you opened your eyes.@@<<else>>From the serene expression on $his face as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face, lost in the soothing sounds of your breathing, when you opened your eyes.@@<</if>>
+ cuddled up beside you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> lowers the temperature in the room and directs another slave to quietly put a couple of warm blankets over you and $activeSlave.slaveName. When you finally wake, several hours later, the effect is magical. You're ensconced in a little island of warmth and comfort, a tiny universe of relaxation populated only by yourself and your slave. $He woke before you did, but remained still to avoid disturbing you. <<if canSee($activeSlave)>>From the lazy, contented look in $his <<= App.Desc.eyeColor>> eyes as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face when you opened your eyes.@@<<else>>From the serene expression on $his face as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face, lost in the soothing sounds of your breathing, when you opened your eyes.@@<</if>>
<br><br>
Since you're awake, $he rolls onto $his face and then further, to place $his back and <<if $activeSlave.butt > 5>>massive ass<<elseif $activeSlave.butt > 2>>healthy rear<<else>>butt<</if>> against you, making sure to drag $his $activeSlave.nipples nipples against you the whole way. You accept the invitation and spoon $him, <<if $activeSlave.height >= 185>>your bodies lining up well, since $he's as tall as you are<<elseif $activeSlave.height >= 160>>$his body fitting neatly within the embrace of your larger frame<<else>>$his small body fitting entirely within your embrace<</if>>. $His <<if $activeSlave.muscles > 30>>muscles<<else>>softness<</if>> and warmth awaken your desire, and $he feels <<if $PC.dick == 1>>your stiffening cock beginning to press against <<if $activeSlave.amp == 1>>$his perineum. $He shifts to slide $himself along its shaft<<if $PC.vagina == 1>> and down to where your pussy begins<</if>><<else>>the place between $his thighs. $He shifts to let your dick slide between them, and reaches down to massage its head<</if>><<else>>heat building against $his butt. <<if $activeSlave.amp == 1>>$He does $his best to grind against you, since $he can't caress you without hands<<else>>$He snakes a hand behind $himself to caress your womanhood, and begins to gently masturbate with the other<</if>><</if>>.
<<if $PC.dick == 1>>
@@ -6279,7 +6281,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Inspect $him normally">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You pay no attention to the unusual circumstances, and conduct a normal inspection of $his naked body. $He understands that $he did the right thing, and @@.mediumaquamarine;trusts@@ you a bit more. Since you're paying no attention to the unusual location for the inspection, $he does $his very best to perform $his role normally, too. $He <<if ($activeSlave.boobs > 2000)>>lifts $his enormous boobs one by one<<elseif ($activeSlave.boobs > 1000)>>hefts $his heavy breasts one by one<<elseif ($activeSlave.boobs > 300)>>squeezes $his boobs one by one<<else>><<if $activeSlave.nipples != "fuckable">>pinches<<else>>fingers<</if>> the nipples capping $his flat tits<</if>>, <<if ($activeSlave.oralSkill > 60)>>opens $his mouth and wiggles $his expert tongue<<elseif ($activeSlave.lips > 40)>>opens $his mouth and licks $his puffy lips<<else>>opens $his mouth and sticks out $his tongue<</if>>,
+ You pay no attention to the unusual circumstances, and conduct a normal inspection of $his naked body. $He understands that $he did the right thing, and @@.mediumaquamarine;trusts@@ you a bit more. Since you're paying no attention to the unusual location for the inspection, $he does $his very best to perform $his role normally, too. $He <<if ($activeSlave.boobs > 2000)>>lifts $his enormous boobs one by one<<elseif ($activeSlave.boobs > 1000)>>hefts $his heavy breasts one by one<<elseif ($activeSlave.boobs > 300)>>squeezes $his boobs one by one<<else>><<if $activeSlave.nipples != "fuckable">>pinches<<else>>fingers<</if>> the nipples capping $his flat tits<</if>>, <<if ($activeSlave.skill.oral > 60)>>opens $his mouth and wiggles $his expert tongue<<elseif ($activeSlave.lips > 40)>>opens $his mouth and licks $his puffy lips<<else>>opens $his mouth and sticks out $his tongue<</if>>,
<<if ($activeSlave.balls > 1)>>
pulls $his ballsack gently downward to display the outline of $his testes,
<<elseif ($activeSlave.dick > 0)>>
@@ -6501,7 +6503,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
going limp and slumping down onto
<</if>>
- the sheets beneath $him. When you climax soon after, $he expects you to get off $him so $he can clean up, but instead, the <<if $PC.dick == 1>>cock up $his butt returns to rock hardness<<if $PC.vagina == 1>> as you use a little manual stimulation of your own cunt to get your cock stiff again<</if>> and<<else>>strap-on up $his butt<</if>> goes back to pumping in and out of $him. $He slides a hand under $himself to <<if $activeSlave.vagina == -1>>jerk off<<else>>rub $himself<</if>> this time. When you finally finish, a long time later, the exhausted slave is lying on a bed wet with lube, <<if ($PC.dick == 1) || ($activeSlave.dick > 0)>> ejaculate,<</if>><<if ($PC.dick == 0) || ($activeSlave.vagina > -1)>> girlcum,<</if>> drool, and sweat. $He doesn't care, and you let $him curl up in $his sex-soaked nest. As you leave, you think $he's asleep already, but <<if !canSee($activeSlave)>>as you go<<else>>$his <<= App.Desc.EyeColor>> eyes open a slit as you go and<</if>> $he murmurs, @@.hotpink;Thank<<s>>,@@ <<Master>>."
+ the sheets beneath $him. When you climax soon after, $he expects you to get off $him so $he can clean up, but instead, the <<if $PC.dick == 1>>cock up $his butt returns to rock hardness<<if $PC.vagina == 1>> as you use a little manual stimulation of your own cunt to get your cock stiff again<</if>> and<<else>>strap-on up $his butt<</if>> goes back to pumping in and out of $him. $He slides a hand under $himself to <<if $activeSlave.vagina == -1>>jerk off<<else>>rub $himself<</if>> this time. When you finally finish, a long time later, the exhausted slave is lying on a bed wet with lube, <<if ($PC.dick == 1) || ($activeSlave.dick > 0)>> ejaculate,<</if>><<if ($PC.dick == 0) || ($activeSlave.vagina > -1)>> girlcum,<</if>> drool, and sweat. $He doesn't care, and you let $him curl up in $his sex-soaked nest. As you leave, you think $he's asleep already, but <<if !canSee($activeSlave)>>as you go<<else>>$his <<= App.Desc.eyeColor>> eyes open a slit as you go and<</if>> $he murmurs, @@.hotpink;Thank<<s>>,@@ <<Master>>."
<<set $activeSlave.devotion += 5>>
<<= AnalVCheck(5)>>
<</replace>>
@@ -6917,11 +6919,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set $activeSlave.mammaryCount += 2, $mammaryTotal += 2>>
<</if>>
<<set $skillIncrease = 10>>
- <<if $activeSlave.analSkill <= 10 && canDoAnal($activeSlave)>>
+ <<if $activeSlave.skill.anal <= 10 && canDoAnal($activeSlave)>>
$He can't help but learn how to take a rough buttfuck.
<<AnalSkillIncrease $activeSlave>>
<</if>>
- <<if $activeSlave.oralSkill <= 10>>
+ <<if $activeSlave.skill.oral <= 10>>
$He can't help but learn how to deepthroat.
<<OralSkillIncrease $activeSlave>>
<</if>>
@@ -8731,11 +8733,11 @@ You tell $him kindly that you understand, and that $he'll be trained to address
You call out to stop $him, and $he turns obediently to listen; you tell $him to take the day off and meet you that evening for a trip to $arcologies[0].name's most fashionable nightclub. You emphasize slightly that it's a place you prefer to enjoy with a young slave, and $his eyes widen a little at the implied compliment and challenge. Right at the proper time, $he arrives in your office wearing neon $activeSlave.hColor makeup to match $his hair, and a tiny iridescent clubgirl outfit of the same color. The hem of the skirt is barely low enough to conceal $him <<if ($activeSlave.dick > 0)>>dick<<elseif $activeSlave.vagina == -1>>total lack of private parts<<else>>pussy<</if>>, and it's backless. The front is held up by a halter around $his pretty neck, and is <<if ($activeSlave.boobs > 2000)>>specially tailored to cover $his massive tits<<elseif ($activeSlave.boobs > 1000)>>strained by $his big tits<<elseif ($activeSlave.boobs > 300)>>tightly filled by $his healthy tits<<else>>tight against $his flat chest<</if>><<if $activeSlave.belly >= 1500>> and _belly <<if $activeSlave.bellyPreg >= 1500>>pregnant <</if>>belly<</if>>. $He makes a gaudy and very fashionable spectacle, and in response to your <<if canSee($activeSlave)>>look<<elseif canHear($activeSlave)>>whistle<<else>>gentle poke<</if>> $he raises both arms over $his head and twirls, shimmying $his body deliciously.
"I hope they let me into the club without checking my I.D., <<Master>>," $he jokes,
for which $he receives a swat on $his rear as you head out. With the full day of rest, $he is full of vigor and ready to dance. $He eagerly heads out onto the floor with you,
- <<if ($activeSlave.entertainSkill >= 100)>>
+ <<if ($activeSlave.skill.entertainment >= 100)>>
masterfully moving $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid<<else>>rounded<</if>><</if>> body to the heavy beat, grabbing the attention of all the men and most of the women in $clubName.
- <<elseif ($activeSlave.entertainSkill > 60)>>
+ <<elseif ($activeSlave.skill.entertainment > 60)>>
expertly moving $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid<<else>>rounded<</if>><</if>> body to the heavy beat, mesmerizing $his neighbors on the floor.
- <<elseif ($activeSlave.entertainSkill > 30)>>
+ <<elseif ($activeSlave.skill.entertainment > 30)>>
skillfully moving $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid<<else>>rounded<</if>><</if>> body to the heavy beat, drawing a lustful gaze or two.
<<else>>
clumsily moving <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid<<else>>rounded<</if>><</if>> $his body to the heavy beat, attracting little notice among the press of novices.
@@ -9271,7 +9273,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Cheer $him up">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You close in on $him, and $he starts to present $himself with the force of long habit. However, you take $him by the hand and draw $him in close, running your fingertips along $his cheekbone, looking into $his <<= App.Desc.EyeColor>> eyes. <<if canSee($activeSlave)>>$He only holds your gaze for a brief moment before blushing and looking down again,<<else>>Once $he feels your hand stop, $he quickly glances down while<</if>> muttering another apology. You raise $his chin again with a gentle hand and give $him a deep kiss. After a moment $he hugs you with almost painful
+ You close in on $him, and $he starts to present $himself with the force of long habit. However, you take $him by the hand and draw $him in close, running your fingertips along $his cheekbone, looking into $his <<= App.Desc.eyeColor>> eyes. <<if canSee($activeSlave)>>$He only holds your gaze for a brief moment before blushing and looking down again,<<else>>Once $he feels your hand stop, $he quickly glances down while<</if>> muttering another apology. You raise $his chin again with a gentle hand and give $him a deep kiss. After a moment $he hugs you with almost painful
<<if $activeSlave.belly >= 100000>>
fierceness, a feat given the size of $his _belly <<if $activeSlave.bellyPreg >= 3000>>gravid <</if>>belly, where
<<elseif $activeSlave.belly >= 5000>>
@@ -9895,7 +9897,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Join $him in the shower">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You step into the running water and help $him to $his feet with exaggerated gallantry. $He seems surprised <<if canSee($activeSlave)>>and stares at<<else>>faces<</if>> you through the steam for a moment before looking away with a blush. Before long you have $his back against the shower wall, $his titanic udders<<if $activeSlave.belly >= 5000>> and _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>> belly<</if>> offering an amusing challenge as they slide soapily between you as you fuck. $He comes in no time at all, and a brief massage of $his huge soapy nipples produces a whimpering aftershock orgasm. <<if canSee($activeSlave)>>$His <<= App.Desc.EyeColor>> eyes stare straight into yours<<else>>You stare into $his <<= App.Desc.EyeColor>> eyes<</if>> as $he writhes with overstimulation, @@.mediumaquamarine;$his trust in your stewardship of $his pleasure total.@@
+ You step into the running water and help $him to $his feet with exaggerated gallantry. $He seems surprised <<if canSee($activeSlave)>>and stares at<<else>>faces<</if>> you through the steam for a moment before looking away with a blush. Before long you have $his back against the shower wall, $his titanic udders<<if $activeSlave.belly >= 5000>> and _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>> belly<</if>> offering an amusing challenge as they slide soapily between you as you fuck. $He comes in no time at all, and a brief massage of $his huge soapy nipples produces a whimpering aftershock orgasm. <<if canSee($activeSlave)>>$His <<= App.Desc.eyeColor>> eyes stare straight into yours<<else>>You stare into $his <<= App.Desc.eyeColor>> eyes<</if>> as $he writhes with overstimulation, @@.mediumaquamarine;$his trust in your stewardship of $his pleasure total.@@
<<if canDoVaginal($activeSlave)>><<= VaginalVCheck()>><<elseif canDoAnal($activeSlave)>><<= AnalVCheck()>><</if>>
<<set $activeSlave.devotion += 4>>
<</replace>>
@@ -10050,7 +10052,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<EventNameDelink $activeSlave>>
<<replace "#result">>
As the sterile doors of the surgical equipment hiss closed over $him, you whisper in $his ear that $he's about to be cut up. $He looks at you with a mix of fear and wild excitement. After nearly a whole week of constant surgery and expensive drug-induced recovery, <<if canSee($activeSlave)>>$he finally gets to see $his new body in the mirror<<elseif $activeSlave.amp == 1>>you finally describe all the new implants in $his body and how they make $him look<<else>>you finally let $him feel $his new body, even helping $his hands to the less obvious changes<</if>>. $He has cartoonishly huge lips, boobs, and buttocks; $he looks like a caricature of a bimbo. $He cries with gratitude <<if canSee($activeSlave)>>to see $himself<<elseif $activeSlave.amp == 1>>to hear how $he looks<<else>>as $he feels $his new body<</if>>, and can scarcely wait to recover enough to get fucked. @@.hotpink;$He has become extremely devoted to you.@@
- <<run cashX(-125, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(125*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<set $activeSlave.devotion += 10>>
<<set _surgeryAddict = Math.clamp(20000-$activeSlave.boobs, 0, 2000)>>
<<set $activeSlave.boobsImplant += _surgeryAddict, $activeSlave.boobs += _surgeryAddict>>
@@ -10248,7 +10250,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
$he says fervently, and gestures at the tablet.
"I've noti<<c>>ed a couple of the girl<<s>> working better together re<<c>>ently, <<s>>o I'm making <<s>>ome minor adju<<s>>tment<<s>> to give them more <<sh>>ift<<s>> together."
<br><br>
- You're sure $he'll do $his best, and you tell $him so. $He thanks you again, and you both go back to your work. Though your Head Girl continues manipulating $his tablet diligently, $he can't seem to stop $himself from @@.hotpink;stealing the occasional glance at you.@@ $His <<= App.Desc.EyeColor>> eyes, dark in the dimness of the office, seem to have an unaccountable sheen.
+ You're sure $he'll do $his best, and you tell $him so. $He thanks you again, and you both go back to your work. Though your Head Girl continues manipulating $his tablet diligently, $he can't seem to stop $himself from @@.hotpink;stealing the occasional glance at you.@@ $His <<= App.Desc.eyeColor>> eyes, dark in the dimness of the office, seem to have an unaccountable sheen.
<<if $assistant != 0>>
<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>'s $assistantAppearance avatar appears on your desktop, glowing brightly, and ruins the moment. "$activeSlave.slaveName loooves $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Maaaster<<else>>Miiistress<</if>>," $he taunts,
<<switch $assistantAppearance>>
@@ -10587,7 +10589,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><<link "Work on broadening $his sexual horizons">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- $He seems a little too focused on $his hot cunt. You order $him to get up on your desk, and $he obeys eagerly, $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes shining<<else>>facial expression filled<</if>> with lust. <<if canSee($activeSlave)>>They focus<<else>>$He focuses<</if>> on <<if $PC.dick == 1>>your cock as you bring it to bear<<if $PC.vagina == 1>>, not to mention the pussy at its base<</if>><<else>>your strap-on as you step into it<</if>>, and $he's about to express $his gratitude when you push the slave, who is sitting on the edge of your desk with $his legs spread to provide you access to $his pussy, over onto $his back. $He barely has time to reorient $himself when $he feels <<if $activeSlave.anus > 2>>a sudden fullness in $his loose ass<<elseif $activeSlave.anus == 2>>a presence inside $his experienced ass<<else>>something starting to push its way up $his poor little bottom<</if>>.
+ $He seems a little too focused on $his hot cunt. You order $him to get up on your desk, and $he obeys eagerly, $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes shining<<else>>facial expression filled<</if>> with lust. <<if canSee($activeSlave)>>They focus<<else>>$He focuses<</if>> on <<if $PC.dick == 1>>your cock as you bring it to bear<<if $PC.vagina == 1>>, not to mention the pussy at its base<</if>><<else>>your strap-on as you step into it<</if>>, and $he's about to express $his gratitude when you push the slave, who is sitting on the edge of your desk with $his legs spread to provide you access to $his pussy, over onto $his back. $He barely has time to reorient $himself when $he feels <<if $activeSlave.anus > 2>>a sudden fullness in $his loose ass<<elseif $activeSlave.anus == 2>>a presence inside $his experienced ass<<else>>something starting to push its way up $his poor little bottom<</if>>.
<br><br>
$He cannot hide $his disappointment, but has the presence of mind not to protest as you assfuck $him hard enough that $his <<if $activeSlave.boobs > 2000>>ridiculous tits almost hit $him in the face with each stroke<<elseif $activeSlave.boobs > 800>>big boobs bounce all over the place<<else>>boobs bounce<</if>><<if $activeSlave.belly >= 10000>> and taut belly is forced back<</if>>. $His orgasm sneaks up on $him, and comes by surprise, forcing a squeal out of $him as $his sphincter tightens down involuntarily. $He gets up gingerly, clearly feeling sore,
<<if (random(0,1) == 1)>>
@@ -10939,7 +10941,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
$He <<say>>s, a little tearfully, "<<Master>>, thi<<s>> guy wanted to u<<s>>e my butt in public. <<S>>o of cour<<s>>e I let him, and he made me <<s>>it in hi<<s>> lap to do it, and held my leg<<s>> back <<s>>o everyone could <<s>>ee! And then another guy thought it wa<<s>> hot and waited, and then fucked me in my a<<ss>> too. Another girl finally noti<<c>>ed and re<<s>>cued me after four cock<<s>>, <<Master>>. I'm really <<s>>ore."
<</if>>
- $He <<if canSee($activeSlave)>>looks up at you with big <<= App.Desc.EyeColor>> eyes<<else>>gazes at you<</if>> for a long moment, a final tear leaking down $his $activeSlave.skin cheek, before $he suddenly
+ $He <<if canSee($activeSlave)>>looks up at you with big <<= App.Desc.eyeColor>> eyes<<else>>gazes at you<</if>> for a long moment, a final tear leaking down $his $activeSlave.skin cheek, before $he suddenly
<<if !canTalk($activeSlave)>>
shakes with mute laughter.
<<else>>
@@ -11819,7 +11821,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><<link "Drive up $his anal count">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You make a ceremony of querying $assistantName, aloud for everyone to hear, into $activeSlave.slaveName's sexual history. $He soon realizes this is a sort of recitation of $his service for the benefit of the other slaves, and $he stands a little straighter. $His <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes glitter<<else>>face beams<</if>> with @@.mediumaquamarine;pride@@ as $assistantName finishes, "...and $his anus has been penetrated $activeSlave.analCount times." You announce that $activeSlave.analCount isn't nearly enough, detail a slave to fetch you a comfortable chair, seat yourself, and draw the compliant $activeSlave.slaveName's head down towards your <<if $PC.dick == 0>>pussy<<else>>cock<</if>>. $He gets eagerly to work, surrounded by a circle of slaves staring at the show. You select a favored girl and tell $him to get to work driving that anal count up. $activeSlave.slaveName keeps <<if $PC.dick == 0>>eating you out<<else>>sucking your dick<</if>> as the chosen girl pulls $activeSlave.slaveName's hips up a little and
+ You make a ceremony of querying $assistantName, aloud for everyone to hear, into $activeSlave.slaveName's sexual history. $He soon realizes this is a sort of recitation of $his service for the benefit of the other slaves, and $he stands a little straighter. $His <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes glitter<<else>>face beams<</if>> with @@.mediumaquamarine;pride@@ as $assistantName finishes, "...and $his anus has been penetrated $activeSlave.analCount times." You announce that $activeSlave.analCount isn't nearly enough, detail a slave to fetch you a comfortable chair, seat yourself, and draw the compliant $activeSlave.slaveName's head down towards your <<if $PC.dick == 0>>pussy<<else>>cock<</if>>. $He gets eagerly to work, surrounded by a circle of slaves staring at the show. You select a favored girl and tell $him to get to work driving that anal count up. $activeSlave.slaveName keeps <<if $PC.dick == 0>>eating you out<<else>>sucking your dick<</if>> as the chosen girl pulls $activeSlave.slaveName's hips up a little and
<<if $activeSlave.butt > 18>>
struggles into $his immense butt.
<<elseif $activeSlave.butt > 10>>
@@ -14580,18 +14582,18 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
slave's shoulders possessively, and name them. "<<Sh>>oulder<<s>>."
<br><br>
- You continue from there. "Neck," "Chin," "Lip<<s>>," "Che<<s>>t," "Boob<<s>>," "N-nipple<<if $activeSlave.nipples == "fuckable">>cunt<</if>><<s>>," "Belly," "Hip<<s>>,"
+ You continue from there. "Neck. Chin. Lip<<s>>. Che<<s>>t. Boob<<s>>. N-nipple<<if $activeSlave.nipples == "fuckable">>cunt<</if>><<s>>. Belly. Hip<<s>>,
<<if ($activeSlave.dick > 0)>>
<<if ($activeSlave.balls > 0)>>
- "C-cock, oh <<Master>>, p-plea<<s>>e, augh, ball<<s>>,"
+ c-cock, oh <<Master>>, p-plea<<s>>e, augh, ball<<s>>,
<<else>>
- "B-bitchclit, oh <<Master>>, p-plea<<s>>e,"
+ b-bitchclit, oh <<Master>>, p-plea<<s>>e,
<</if>>
<</if>>
<<if ($activeSlave.vagina > -1)>>
- "Pu<<ss>>y," "Cliiiiiit, oh <<Master>> n-nuh,"
+ pu<<ss>>y. Cliiiiiit, oh <<Master>> n-nuh,
<</if>>
- "Butt," and finally, "B-butt, um, butthole."
+ Butt," and finally, "B-butt, um, butthole."
<br><br><span id="result2">
<<link "Now let $him review">>
<<replace "#result2">>
@@ -15087,7 +15089,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#result">>
Simple problems require simple solutions — $he'll get fucked in the mouth until $he either gets over $his hang-ups about oral or learns to hide them. You drag the protesting $activeSlave.slaveName out in public, chain $him low so that $his mouth is available, and tell $him that $he'll suck dicks until $he gets through five in a row without grimacing, gagging, or resisting. You have a comfortable chair brought out to you and settle in to watch the show.
$activeSlave.slaveName tries, $he really does. But when word gets out as to the conditions of $his enslavement, $his users take a perverse enjoyment in being rougher than usual to evoke the exact reactions $he's trying to avoid. By the third failed streak, you've started to grow bored of the spectacle, but luckily you find entertainment in conversation with those who have already been entertained by poor $activeSlave.slaveName. Before long more chairs have been brought up and an impromptu salon has been set up alongside the blowbang line. By the sixth failed streak, an enterprising citizen has set up a small bar and is serving drinks. By the ninth, you've delegated watching $activeSlave.slaveName to your assistant. You personally break the eleventh streak after $he reached four, to general acclaim from your newfound friends and a toast to your virility.
- When the fourteenth streak is finally successful, there are serious talks about making these blowbang salons a regular occurrence and some backslapping directed towards you for your innovation in genteel hedonism. While you seriously doubt $activeSlave.slaveName enjoys oral sex any more than $he did at the start of the day, $he's certainly @@.green;learned to keep $his feelings on the matter to $himself.@@ $He did, however, @@.red;have quite a rough time@@ of it<<if $activeSlave.oralSkill <= 30>>, though $he did learn a thing or two about sucking dick.<<set $skillIncrease = 10>><<OralSkillIncrease $activeSlave>><<else>>.<</if>> And last of all, you and $activeSlave.slaveName did make @@.green;quite a good impression@@ today, though for widely differing reasons.
+ When the fourteenth streak is finally successful, there are serious talks about making these blowbang salons a regular occurrence and some backslapping directed towards you for your innovation in genteel hedonism. While you seriously doubt $activeSlave.slaveName enjoys oral sex any more than $he did at the start of the day, $he's certainly @@.green;learned to keep $his feelings on the matter to $himself.@@ $He did, however, @@.red;have quite a rough time@@ of it<<if $activeSlave.skill.oral <= 30>>, though $he did learn a thing or two about sucking dick.<<set $skillIncrease = 10>><<OralSkillIncrease $activeSlave>><<else>>.<</if>> And last of all, you and $activeSlave.slaveName did make @@.green;quite a good impression@@ today, though for widely differing reasons.
<<set $activeSlave.health -= 10, $activeSlave.sexualFlaw = "none">>
<<set _oralSeed = random(65,80)>>
<<set $activeSlave.oralCount += _oralSeed, $activeSlave.publicCount += _oralSeed, $oralTotal += _oralSeed>>
@@ -16403,7 +16405,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Make love to $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You crane your neck down and kiss $him on the lips. $He awakens slowly, gently, $his <<= App.Desc.EyeColor>> eyes fluttering open, looking black in the nighttime gloom. $He smiles into your mouth, and you feel $his pulse quicken through the extensive contact down your bodies. You interlace your fingers between $hers and turn, pressing $him back down into the soft sheets. $He opens $himself for you, spreading $his legs wide and embracing you with them, making sure to run $his heels up the backs of your calves in a way that sends a shiver up your spine. Feeling this through your kissing mouths, $he smiles into you, a pleased expression $he maintains as you
+ You crane your neck down and kiss $him on the lips. $He awakens slowly, gently, $his <<= App.Desc.eyeColor>> eyes fluttering open, looking black in the nighttime gloom. $He smiles into your mouth, and you feel $his pulse quicken through the extensive contact down your bodies. You interlace your fingers between $hers and turn, pressing $him back down into the soft sheets. $He opens $himself for you, spreading $his legs wide and embracing you with them, making sure to run $his heels up the backs of your calves in a way that sends a shiver up your spine. Feeling this through your kissing mouths, $he smiles into you, a pleased expression $he maintains as you
<<if $activeSlave.belly >= 300000 && $PC.belly >= 5000>>
struggle to find a position to handle both your pregnancy and $his <<if $activeSlave.bellyPreg >= 3000>>_belly gravid middle<<else>>_belly belly<</if>> and
<<elseif $activeSlave.belly >= 300000>>
@@ -16585,9 +16587,9 @@ You tell $him kindly that you understand, and that $he'll be trained to address
immediately drops to $his knees
<</if>>
and gets to work,
- <<if $activeSlave.oralSkill >= 100>>
+ <<if $activeSlave.skill.oral >= 100>>
using all of $his mastery in giving oral pleasure.
- <<elseif $activeSlave.oralSkill > 60>>
+ <<elseif $activeSlave.skill.oral > 60>>
using all of $his skills in giving oral pleasure.
<<else>>
doing $his best despite $his mediocre oral skills.
@@ -16675,11 +16677,11 @@ You tell $him kindly that you understand, and that $he'll be trained to address
clit
<</if>>
making sure to cover yourself completely. You recline in your seat, beckoning to $activeSlave.slaveName to lick you clean. $He eagerly complies, eager to get a <<if canTaste($activeSlave)>>taste<<else>>bit<</if>> of $PC.refreshment after nothing but slave food for so long.
- <<if $activeSlave.oralSkill > 60>>
+ <<if $activeSlave.skill.oral > 60>>
$He is extremely skilled with $his tongue; before long, not only are you completely cleaned, but you can barely feel your crotch from $his masterful sucking.
- <<elseif $activeSlave.oralSkill > 30>>
+ <<elseif $activeSlave.skill.oral > 30>>
$He is quite skilled with $his tongue; before long, you are both cleaned off and enjoying some $PC.refreshment after the powerful orgasm $he coaxed out of you.
- <<elseif $activeSlave.oralSkill > 10>>
+ <<elseif $activeSlave.skill.oral > 10>>
$He has basic skill with $his tongue; before long, you are nearly cleaned of all the $PC.refreshment. With one final lick, $he takes the last <<if canTaste($activeSlave)>>taste<<else>>drop<</if>> of it and brings you to climax at the same time.
<<else>>
$He has no idea how to make this pleasurable; $he is merely greedily lapping up the $PC.refreshment off your body. As $he nears finishing your crotch, you grab $his head and hold $him to yourself until you are satisfied with $his licking.
@@ -16886,7 +16888,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><<link "Double penetrate $his mouth for insolence">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You step forward and caress the slave's throat, telling $him to suck like a good little $desc. You make no threat, but give $him the order in a voice of brass. $He knows what you can do to $him, and scrabbles forward to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $him hesitation and insolence. $He can't beg or even moan, since $he's being facefucked by the feeder dildo by now, but $his <<= App.Desc.EyeColor>> eyes widen in terror. $He <<if canSee($activeSlave)>>can't watch you, since $he can't turn $his head,<<else>>can't see what you are doing,<</if>> so $he has almost no time to prepare when you haul $him head most of the way off the feeder and shove <<if $PC.dick == 1>>your own phallus<<else>>a strap-on<</if>> into $his mouth, too. $He gags instantly, almost vomiting, but forces $himself to relax as you begin to thrust into $his throat, alternately with the feeder. The liquid food provides plenty of lubrication, and a lot of liquid for $him to gag on, and before long $he's a degraded, humiliating mess. $He often clamps $his eyes shut as $he desperately concentrates on breathing, squeezing the tears out to run down $his $activeSlave.skin cheeks.
+ You step forward and caress the slave's throat, telling $him to suck like a good little $desc. You make no threat, but give $him the order in a voice of brass. $He knows what you can do to $him, and scrabbles forward to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $him hesitation and insolence. $He can't beg or even moan, since $he's being facefucked by the feeder dildo by now, but $his <<= App.Desc.eyeColor>> eyes widen in terror. $He <<if canSee($activeSlave)>>can't watch you, since $he can't turn $his head,<<else>>can't see what you are doing,<</if>> so $he has almost no time to prepare when you haul $him head most of the way off the feeder and shove <<if $PC.dick == 1>>your own phallus<<else>>a strap-on<</if>> into $his mouth, too. $He gags instantly, almost vomiting, but forces $himself to relax as you begin to thrust into $his throat, alternately with the feeder. The liquid food provides plenty of lubrication, and a lot of liquid for $him to gag on, and before long $he's a degraded, humiliating mess. $He often clamps $his eyes shut as $he desperately concentrates on breathing, squeezing the tears out to run down $his $activeSlave.skin cheeks.
<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>You leave the poor slave to take $his drugs up the ass, since the kitchen administers those by phallus, too. Fortunately for $him, $he doesn't object to that.<</if>>
<<set $activeSlave.trust -= 4, $activeSlave.oralCount++, $oralTotal++>>
<</replace>>
@@ -16895,7 +16897,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><<link "Force-feed $him with your own cock">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You step forward and pull $him away from the feeder, telling $him that since $he doesn't like the cockfeeder $he can suck yours like a good little $desc. You make no threat, but order $him in a steely voice to suck you off until $he's earned a meal of your cum. $He knows what you can do to $him, and hurries forward to obey. $He rushes to open your clothes and get to work, but pauses when <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes take in your massive testicles.<<else>>$his groping hand feels your massive testicles.<</if>> Realizing just how big $his meal will be, $he's obviously @@.gold;frightened.@@ You grab $his head, breaking $him out of $his shocked stillness, and explain that you can't let $him starve. If $he won't eat out of the feeder, you'll just have to feed $him some other way. With that, you ram your cock forward and start fucking $his <<if $activeSlave.face > 95>>heartbreakingly beautiful<<elseif $activeSlave.face > 10>>pretty<<else>>homely<</if>> face. After a few minutes of gagging oral, you start to approach your climax. Your thorough facefucking leaves $him unable to beg or even moan, but $his eyes widen in terror when $he realizes you're about to cum. You don't give $him any time to prepare, instead hilting yourself immediately, and letting $his throat's desperate attempts to swallow bring you over the edge. You begin your long release of pent-up jizz, spraying deciliter after deciliter of cum down $his throat and into $his stomach. By the time you've finished, you can tell $he's struggling for air and in pain from the massive quantity of thick fluid in $his stomach. You give $him a helpful hint before releasing $him, "if you take it all the way in your throat, you don't even have to taste what it's feeding you." You pull out of $his mouth and let $him go. $He gasps for air and almost immediately vomits some of your cum all over $himself, turning $him into a degraded, humiliating mess. $He lays on the floor and desperately concentrates on breathing, squeezing the tears out of $his eyes to run down $his $activeSlave.skin cheeks.
+ You step forward and pull $him away from the feeder, telling $him that since $he doesn't like the cockfeeder $he can suck yours like a good little $desc. You make no threat, but order $him in a steely voice to suck you off until $he's earned a meal of your cum. $He knows what you can do to $him, and hurries forward to obey. $He rushes to open your clothes and get to work, but pauses when <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor>> eyes take in your massive testicles.<<else>>$his groping hand feels your massive testicles.<</if>> Realizing just how big $his meal will be, $he's obviously @@.gold;frightened.@@ You grab $his head, breaking $him out of $his shocked stillness, and explain that you can't let $him starve. If $he won't eat out of the feeder, you'll just have to feed $him some other way. With that, you ram your cock forward and start fucking $his <<if $activeSlave.face > 95>>heartbreakingly beautiful<<elseif $activeSlave.face > 10>>pretty<<else>>homely<</if>> face. After a few minutes of gagging oral, you start to approach your climax. Your thorough facefucking leaves $him unable to beg or even moan, but $his eyes widen in terror when $he realizes you're about to cum. You don't give $him any time to prepare, instead hilting yourself immediately, and letting $his throat's desperate attempts to swallow bring you over the edge. You begin your long release of pent-up jizz, spraying deciliter after deciliter of cum down $his throat and into $his stomach. By the time you've finished, you can tell $he's struggling for air and in pain from the massive quantity of thick fluid in $his stomach. You give $him a helpful hint before releasing $him, "if you take it all the way in your throat, you don't even have to taste what it's feeding you." You pull out of $his mouth and let $him go. $He gasps for air and almost immediately vomits some of your cum all over $himself, turning $him into a degraded, humiliating mess. $He lays on the floor and desperately concentrates on breathing, squeezing the tears out of $his eyes to run down $his $activeSlave.skin cheeks.
<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>You leave the poor slave to take $his drugs up the ass, since the kitchen administers those by phallus, too. Fortunately for $him, $he doesn't object to that.<</if>>
<<set $activeSlave.trust -= 2, $activeSlave.oralCount++, $oralTotal++>>
<</replace>>
@@ -17051,7 +17053,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
Knowing that $he'll need to get dressed before the next part of $his day, you help $him to <<if $activeSlave.livingRules == "luxurious">>$his room<<else>>the part of the common area with where clothes are kept<</if>>. $He lets you do most of the work, letting $himself be guided without a word. When you set $him on $his bed,
<</if>>
- there's a little unaccountable moisture in $his <<= App.Desc.EyeColor>> eyes @@.mediumaquamarine;for some reason.@@ $He gives you a kiss and thanks you prettily.
+ there's a little unaccountable moisture in $his <<= App.Desc.eyeColor>> eyes @@.mediumaquamarine;for some reason.@@ $He gives you a kiss and thanks you prettily.
<<set $activeSlave.trust += 4>>
<</replace>>
<</link>>
@@ -17693,7 +17695,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = either("black", "blonde", "brown", "red")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "latina")>>
<<set $activeSlave.race = "latina">>
- <<set $activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tanned")>>
+ <<set $activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tan")>>
<<set $activeSlave.hColor = either("black", "black", "brown", "brown")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "black")>>
<<set $activeSlave.race = "black">>
@@ -17705,7 +17707,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "middle eastern")>>
<<set $activeSlave.race = "middle eastern">>
- <<set $activeSlave.skin = either("dark olive", "light olive", "tanned")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "tan")>>
<<set $activeSlave.hColor = "black">>
<<elseif ($arcologies[0].FSSubjugationistRace == "indo-aryan")>>
<<set $activeSlave.race = "indo-aryan">>
@@ -17713,7 +17715,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = "black">>
<<elseif ($arcologies[0].FSSubjugationistRace == "amerindian")>>
<<set $activeSlave.race = "amerindian">>
- <<set $activeSlave.skin = either("dark", "light", "tanned")>>
+ <<set $activeSlave.skin = either("dark", "light", "tan")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "pacific islander")>>
<<set $activeSlave.race = "pacific islander">>
@@ -17729,7 +17731,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "semitic")>>
<<set $activeSlave.race = "semitic">>
- <<set $activeSlave.skin = either("dark olive", "light olive", "tanned")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "tan")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "mixed race")>>
<<set $activeSlave.race = "mixed race">>
@@ -17877,7 +17879,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Fuck $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You announce that you're going to fuck $his <<if $activeSlave.anus == 0>>virgin <</if>>asspussy. To your complete lack of surprise, $he can't hide $his horror at the prospect of <<if $PC.dick == 1>>having a cock inside $his<<else>>being fucked with a strap-on<</if>>, and $his <<if canSee($activeSlave)>>wide, <<= App.Desc.EyeColor>> eyes track<<else>>terrified face follows<</if>> your movements closely as you stand up and <<if $PC.dick == 1>>reveal the formidable member<<else>>don the strap-on<</if>> you're about to breed $him with. You order $him to kneel on the couch, which $he does, @@.gold;cringing in fear of being buttfucked, but knowing disobedience will be worse;@@ and then you order $him to reach down and spread $his butt for you, as wide as it'll go. $He complies,
+ You announce that you're going to fuck $his <<if $activeSlave.anus == 0>>virgin <</if>>asspussy. To your complete lack of surprise, $he can't hide $his horror at the prospect of <<if $PC.dick == 1>>having a cock inside $his<<else>>being fucked with a strap-on<</if>>, and $his <<if canSee($activeSlave)>>wide, <<= App.Desc.eyeColor>> eyes track<<else>>terrified face follows<</if>> your movements closely as you stand up and <<if $PC.dick == 1>>reveal the formidable member<<else>>don the strap-on<</if>> you're about to breed $him with. You order $him to kneel on the couch, which $he does, @@.gold;cringing in fear of being buttfucked, but knowing disobedience will be worse;@@ and then you order $him to reach down and spread $his butt for you, as wide as it'll go. $He complies,
<<if $activeSlave.butt > 12>>
grabbing as much flesh as $he can of each monstrous buttock and heaving them as far apart as $he can manage in an attempt
<<elseif $activeSlave.butt > 6>>
@@ -18079,7 +18081,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
closer than ever.
<</if>>
- You take your other hand and place a firm but loving grip under $his chin, lifting $his <<= App.Desc.EyeColor>>-eyed gaze to meet yours before kissing $him again. All the while, you
+ You take your other hand and place a firm but loving grip under $his chin, lifting $his <<= App.Desc.eyeColor>>-eyed gaze to meet yours before kissing $him again. All the while, you
<<if $PC.dick == 1>>
fuck $him powerfully, withdrawing your dick almost all the way and then hilting yourself in $his soaked slit.
<<= VaginalVCheck()>>
@@ -18414,7 +18416,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#result">>
You schedule $him for the surgery. Like all invasive procedures, it @@.red;affects $his health,@@ but @@.lime;$he's effectively an anal virgin again.@@ $He @@.mediumaquamarine;trusts you a bit more@@ for granting $his request, and is eager for buttsex that's more interesting than having a hotdog thrown down $his hallway.
<<set $activeSlave.trust += 3, $activeSlave.health -= 10, $activeSlave.anus = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
- <<if $activeSlave.analSkill > 10>><<set $activeSlave.analSkill -= 10>><</if>>
+ <<if $activeSlave.skill.anal > 10>><<set $activeSlave.skill.anal -= 10>><</if>>
<br><br>
<span id="result2">
<<link "Break $him in again">>
@@ -18527,7 +18529,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<if $activeSlave.height < 170>>
The short $desc has to go up on tiptoe to reach.
<</if>>
- "@@.hotpink;I really do love you,@@ <<Master>>," $he <<say>>s, <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes shining<<else>>face filled with joy<</if>>.
+ "@@.hotpink;I really do love you,@@ <<Master>>," $he <<say>>s, <<if canSee($activeSlave)>><<= App.Desc.eyeColor>> eyes shining<<else>>face filled with joy<</if>>.
<<set $activeSlave.devotion += 5>>
<</replace>>
<</link>>
@@ -18786,7 +18788,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Polish this">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You tell $him to polish this instead, advancing even closer. $He turns, finding your cockhead so close to $his face that $his eyes cross ludicrously as they attempt to focus on it. $He does not like dicks, and obviously does not find the prospect of sucking this one appealing right now, but $he knows it's in $his best interests to <<if $activeSlave.oralSkill > 10>>put $his oral knowledge to work<<else>>do $his best<</if>> right now. $He closes $his eyes and takes you into $his mouth, forming a seal around your cock with $his
+ You tell $him to polish this instead, advancing even closer. $He turns, finding your cockhead so close to $his face that $his eyes cross ludicrously as they attempt to focus on it. $He does not like dicks, and obviously does not find the prospect of sucking this one appealing right now, but $he knows it's in $his best interests to <<if $activeSlave.skill.oral > 10>>put $his oral knowledge to work<<else>>do $his best<</if>> right now. $He closes $his eyes and takes you into $his mouth, forming a seal around your cock with $his
<<if $activeSlave.lips > 40>>
ridiculous
<<elseif $activeSlave.lips > 20>>
@@ -18796,7 +18798,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
disappointingly thin
<</if>>
- lips before starting to suck dick. Dissatisfied with $his reluctance, you order $him to open $his eyes and look up at you; $he obeys, the <<= App.Desc.EyeColor>> orbs glittering with a little moisture as $he concentrates on breathing past your penis. You ask if your cock <<if canTaste($activeSlave)>>tastes<<else>>feels<</if>> any different than usual. "Mmm hmm, M'," $he mumbles, producing a nice humming sensation against your cock. You tell $him that $he's <<if canTaste($activeSlave)>>tasting<<else>>feeling<</if>> another slave's <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>. $He gags, but only slightly, and controls $himself immediately. Your dick is desensitized from vigorous use, and $he has to suck it a long time before you cup the back of $his head, ram yourself all the way in, and blow your load straight down $his gullet. You tell $him $he's a good $desc. "Thank you, <<Master>>," $he <<say>>s @@.hotpink;submissively,@@ going back to $his polishing.
+ lips before starting to suck dick. Dissatisfied with $his reluctance, you order $him to open $his eyes and look up at you; $he obeys, the <<= App.Desc.eyeColor>> orbs glittering with a little moisture as $he concentrates on breathing past your penis. You ask if your cock <<if canTaste($activeSlave)>>tastes<<else>>feels<</if>> any different than usual. "Mmm hmm, M'," $he mumbles, producing a nice humming sensation against your cock. You tell $him that $he's <<if canTaste($activeSlave)>>tasting<<else>>feeling<</if>> another slave's <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>. $He gags, but only slightly, and controls $himself immediately. Your dick is desensitized from vigorous use, and $he has to suck it a long time before you cup the back of $his head, ram yourself all the way in, and blow your load straight down $his gullet. You tell $him $he's a good $desc. "Thank you, <<Master>>," $he <<say>>s @@.hotpink;submissively,@@ going back to $his polishing.
<<set $activeSlave.oralCount++, $oralTotal++>>
<<set $activeSlave.devotion += 5>>
<</replace>>
@@ -19273,7 +19275,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Gently acclimate $him to the age difference with some lovemaking">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.EyeColor>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years your senior $he is<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years your senior $he is<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy. Instead, you
+ As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.eyeColor>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years your senior $he is<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years your senior $he is<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy. Instead, you
<<if $activeSlave.belly >= 300000>>
help $him to $his feet and guide $him to bed, aiding the <<if $activeSlave.bellyPreg >= 3000>>child-laden<<else>>tremendously swollen<</if>> older $woman onto the sheets before gently mounting $him.
<<else>>
@@ -19397,7 +19399,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Gently acclimate $him to the age difference with some lovemaking">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.EyeColor>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years $his senior you are<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years $his senior you are<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy.
+ As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.eyeColor>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years $his senior you are<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years $his senior you are<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy.
Instead, you
<<if $activeSlave.belly >= 300000>>
help $him to $his feet and guide $him to bed, aiding the
@@ -19614,7 +19616,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#result">>
You tell $him $he'll get fucked in the mouth until $he either gets over the idea of being special for $his education or until all $his learning is fucked out of $his head. You drag the protesting $activeSlave.slaveName out into a public plaza, restrain $him in stocks so that $his mouth is available, and inform the gathering crowd of citizens that this particular slave thinks $himself more than a fuckhole because of some fancy 'education'.
<br><br>
- When you return later in the evening, it becomes abundantly clear that your citizenry taught $activeSlave.slaveName a harsh lesson about a slave's place in $arcologies[0].name. $activeSlave.slaveName has certainly @@.green;learned to keep any pretentious thoughts about $his education in $his head.@@ $He did, however, @@.red;have quite a rough time@@ sucking all those dicks<<if $activeSlave.oralSkill <= 30>>, though $he did learn about sucking dick, so $he can't claim enslavement isn't educational.<<set $skillIncrease = 10>><<OralSkillIncrease $activeSlave>><<else>>.<</if>> And last of all, you and $activeSlave.slaveName did make @@.green;quite a good impression@@ today, though for widely differing reasons.
+ When you return later in the evening, it becomes abundantly clear that your citizenry taught $activeSlave.slaveName a harsh lesson about a slave's place in $arcologies[0].name. $activeSlave.slaveName has certainly @@.green;learned to keep any pretentious thoughts about $his education in $his head.@@ $He did, however, @@.red;have quite a rough time@@ sucking all those dicks<<if $activeSlave.skill.oral <= 30>>, though $he did learn about sucking dick, so $he can't claim enslavement isn't educational.<<set $skillIncrease = 10>><<OralSkillIncrease $activeSlave>><<else>>.<</if>> And last of all, you and $activeSlave.slaveName did make @@.green;quite a good impression@@ today, though for widely differing reasons.
<<set $activeSlave.health -= 10>>
<<set _blowBang = random(65,80)>>
<<set $activeSlave.oralCount += _blowBang, $activeSlave.publicCount += _blowBang, $oralTotal += _blowBang>>
@@ -19761,9 +19763,9 @@ You tell $him kindly that you understand, and that $he'll be trained to address
sinks to $his knees obediently with $his hands placed placidly on $his thighs
<</if>>
before putting $his mouth to work,
- <<if $activeSlave.oralSkill >= 100>>
+ <<if $activeSlave.skill.oral >= 100>>
$his mastery at giving oral providing a wealth of pleasure.
- <<elseif $activeSlave.oralSkill > 60>>
+ <<elseif $activeSlave.skill.oral > 60>>
$his skills in oral providing ample pleasure.
<<else>>
$his mediocre oral skills providing some relief.
@@ -20283,9 +20285,9 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<EventNameDelink $activeSlave>>
<<replace "#result">>
As pleasant an image as $activeSlave.slaveName's mouth filled by a $activeSlave.collar is, one of $his mouth's primary purposes is still to provide you with ample <<if $PC.dick == 1>>blowjobs<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>cunnilingus<</if>>. With $activeSlave.slaveName already kneeling, it is merely a matter of undoing $his gag before you can put $his mouth to work.
- <<if $activeSlave.oralSkill >= 100>>
+ <<if $activeSlave.skill.oral >= 100>>
Though $he has spent much time gagged, $his mastery at giving oral is unaffected.
- <<elseif $activeSlave.oralSkill > 60>>
+ <<elseif $activeSlave.skill.oral > 60>>
Though $he has spent much time gagged, $his oral skills still provide ample pleasure.
<<else>>
$His time spent gagged has limited the growth of $his mediocre oral skills, though $he is still able to provide some relief.
@@ -20349,7 +20351,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<if $PC.dick == 1>>
<<if $activeSlave.belly >= 300000>>You have to straddle $his _belly stomach to get close enough, but $his tantalizing breasts are worth the strain.<</if>>
You collect some lubrication for it by sticking your dick in $his mouth.
- <<if $activeSlave.oralSkill >= 100>>
+ <<if $activeSlave.skill.oral >= 100>>
$He swallows you to your base, and is such a skilled cocksucker that $he salivates at will, doing $his best to get you
<<else>>
$He does $his best to swallow you as deeply as $he can manage, and get your cock
@@ -20401,7 +20403,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<default>>
You grab each of $his nipples in a merciless grip and pinch them with abandon, adding a cruel twist as soon as you've got them held tightly enough.
<</switch>>
- $His <<= App.Desc.EyeColor>> eyes fly open and $he
+ $His <<= App.Desc.eyeColor>> eyes fly open and $he
<<if $activeSlave.voice == 1>>
bellows with pain, $his deep voice very loud.
<<elseif $activeSlave.voice == 2>>
@@ -20554,7 +20556,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<default>>
$activeSlave.clothes
<</switch>>
- You tell $him that you like how $he looks, and that $he's pretty. $He wasn't expecting such a blunt compliment, and <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes flick down to<<else>>$he faces<</if>> the ground for a moment as $he blushes. "T-thank you, <<Master>>," $he stutters.
+ You tell $him that you like how $he looks, and that $he's pretty. $He wasn't expecting such a blunt compliment, and <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor>> eyes flick down to<<else>>$he faces<</if>> the ground for a moment as $he blushes. "T-thank you, <<Master>>," $he stutters.
<br><br>
You add that $he looks so good that $he had better take $his nice clean
<<switch $activeSlave.clothes>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 7b3008518b3e25b9a4016530206759fee63b5701..9ffe0404d7d6ded9ef2215a106ea8c52ac361139 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -576,7 +576,7 @@ Advancing to get a better view, you identify the bottom as <<if $subSlave.bellyP
two fingers up $subSlave.slaveName's tight ass, which must be so stretched to accommodate them that _his2 anguish is probably due in part to anal pain.
<</if>>
<</if>>
-$activeSlave.slaveName isn't fucking $subSlave.slaveName at all: $he's just <<if canPenetrate($activeSlave)>>holding $his penis stationary<<else>>holding $his fingers<</if>> up $subSlave.slaveName's rear hole. _His2 buttocks has been severely spanked, so some of _his2 unhappiness probably comes from being forced to eat sheets and let $activeSlave.slaveName play with _his2 ass. But then you notice that $activeSlave.slaveName is <<if canPenetrate($activeSlave)>>reaching around<<else>>using $his other hand to reach around<</if>> $subSlave.slaveName, and is <<if $subSlave.dick > 0 && !($subSlave.chastityPenis)>>jerking $subSlave.slaveName off<<else>>manually stimulating $subSlave.slaveName<</if>> <<if ($activeSlave.oralSkill >= 60)>>with all $his considerable expertise<<elseif ($activeSlave.oralSkill > 30)>>with considerable skill<<else>>with every appearance of effort<</if>>. You're not sure what's going on here.
+$activeSlave.slaveName isn't fucking $subSlave.slaveName at all: $he's just <<if canPenetrate($activeSlave)>>holding $his penis stationary<<else>>holding $his fingers<</if>> up $subSlave.slaveName's rear hole. _His2 buttocks has been severely spanked, so some of _his2 unhappiness probably comes from being forced to eat sheets and let $activeSlave.slaveName play with _his2 ass. But then you notice that $activeSlave.slaveName is <<if canPenetrate($activeSlave)>>reaching around<<else>>using $his other hand to reach around<</if>> $subSlave.slaveName, and is <<if $subSlave.dick > 0 && !($subSlave.chastityPenis)>>jerking $subSlave.slaveName off<<else>>manually stimulating $subSlave.slaveName<</if>> <<if ($activeSlave.skill.oral >= 60)>>with all $his considerable expertise<<elseif ($activeSlave.skill.oral > 30)>>with considerable skill<<else>>with every appearance of effort<</if>>. You're not sure what's going on here.
<<case "sadistic description">>
@@ -601,7 +601,7 @@ You look in on your slaves as a group of them heads for bed. $subSlave.slaveName
<<else>>
skinny
<</if>>
-waist to cup _his2 <<if $subSlave.dick > 0>>cock<<elseif $subSlave.vagina == -1>>asshole<<else>>pussy<</if>> possessively with one hand. $subSlave.slaveName closes _his2 <<= App.Desc.EyeColor $subSlave>> eyes.
+waist to cup _his2 <<if $subSlave.dick > 0>>cock<<elseif $subSlave.vagina == -1>>asshole<<else>>pussy<</if>> possessively with one hand. $subSlave.slaveName closes _his2 <<= App.Desc.eyeColor $subSlave>> eyes.
<br><br>
$activeSlave.slaveName chuckles into $subSlave.slaveName's ear, crooning,
<<if $subSlave.bellyPreg >= 120000>>
@@ -624,7 +624,7 @@ $activeSlave.slaveName chuckles into $subSlave.slaveName's ear, crooning,
<</if>>
<<elseif $subSlave.bellyPreg >= 1500>>
"You fat <<s>>lut. You think your growing pregnan<<c>>y i<<s>> going to keep you from getting raped?"
-<<elseif $subSlave.vaginalSkill > 30>>
+<<elseif $subSlave.skill.vaginal > 30>>
"You poor <<s>>orry <<s>>lut. You think you're pretty good in bed, don't you? You have no fucking idea."
<<elseif $subSlave.vagina > 2>>
"You poor gaping <<s>>lut. You think you know what it'<<s>> like to take a pounding, don't you? You have no fucking idea."
@@ -651,7 +651,7 @@ $subSlave.slaveName keeps _his2 eyes clamped shut and _his2 hands down at _his2
<<set _belly = bellyAdjective($subSlave)>>
As you pass the showers, you hear what sounds like a muffled altercation over the noise of the showers running. You look in to see $subSlave.slaveName's $subSlave.skin body facing you, pressed hard up against the glass wall of one of the showers. _His2 <<if $subSlave.face > 95>>gorgeous<<elseif $subSlave.face > 40>>beautiful<<elseif $subSlave.face > 10>>pretty<<elseif $subSlave.face >= -10>>attractive<<else>>homely<</if>> face<<if $subSlave.belly >= 5000>> and <<if $subSlave.bellyPreg >= 5000>>pregnant<<else>>_belly<</if>> belly are<<else>> is<</if>> smashed against the glass, <<if $subSlave.belly >= 5000>>_his2 face <</if>>contorted in pain and fear. The apparent mystery is solved when you notice that there are four legs visible: there's a pair of <<if ($activeSlave.muscles > 95)>>ripped<<elseif ($activeSlave.muscles > 30)>>muscular<<elseif ($activeSlave.muscles > 5)>>toned<<else>>soft<</if>> $activeSlave.skin calves behind $subSlave.slaveName's. <<EventNameLink>>'s face appears at $subSlave.slaveName's ear, and though you can't hear exactly what $he says, it's something along the lines of "Take it, you whiny little bitch." $He's clearly got <<if canPenetrate($activeSlave)>>$his cock<<else>>a couple of fingers<</if>> up $subSlave.slaveName's asshole.
<br><br>
-Both slaves notice you at the same time. $subSlave.slaveName's <<if canSee($subSlave)>><<= App.Desc.EyeColor $subSlave>> eyes widen<<else>>face lights up<</if>>, but _his2 momentary look of hope is snuffed out when _he2 remembers who you are. $activeSlave.slaveName, on the other hand, looks a little doubtful. The rules allow $him to fuck your other slaves, but $he isn't quite sure what the right thing to do is, since $he isn't the most dominant force in the showers any more.
+Both slaves notice you at the same time. $subSlave.slaveName's <<if canSee($subSlave)>><<= App.Desc.eyeColor $subSlave>> eyes widen<<else>>face lights up<</if>>, but _his2 momentary look of hope is snuffed out when _he2 remembers who you are. $activeSlave.slaveName, on the other hand, looks a little doubtful. The rules allow $him to fuck your other slaves, but $he isn't quite sure what the right thing to do is, since $he isn't the most dominant force in the showers any more.
<<case "repressed anal virgin">>
@@ -919,7 +919,7 @@ The slaves are about to go to bed; they're naked, and the horny $activeSlave.sla
"Your torpedoe<<s>> are incredible," $he wheedles. "<<if $subSlave.boobs > 400>>The way they <<s>>way when you move <<sh>>ould be again<<s>>t the rule<<s>>.<<else>>They're <<s>>o tiny and cute!<</if>> I want you<<if !_vaginal>>r a<<ss>><</if>> <<s>>o much!"
<<elseif $subSlave.muscles > 30>>
"You're <<s>>o jacked," $he wheedles. "I ju<<s>>t want to <<if _vaginal>>feel tho<<s>>e huge thigh<<s>> wrap around me a<<s>> I fuck you<<else>>feel that mu<<s>>cular booty fle<<x>> under me a<<s>> I fuck your butt<</if>>!"
-<<elseif $subSlave.entertainSkill > 95>>
+<<elseif $subSlave.skill.entertainment > 95>>
"You're <<s>>o beautiful and gra<<c>>eful," $he wheedles. "I love watching you walk. Look at you, ju<<s>>t <<s>>tanding there you're <<s>>o perfectly feminine. I want to make love to you<<if !_vaginal>>r butt<</if>>!"
<<else>>
"You're <<s>>o, um, cute," $he wheedles, trying to come up with something to say. "And you have a, very, er, pretty <<if _vaginal>>vagina<<else>>anu<<s>><</if>>?"
@@ -1461,7 +1461,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<run Enunciate($subSlave)>>
"N-no," _he2 gasps. "I'm not! Plea<<s>>e t-take <<if canPenetrate($activeSlave)>>it<<else>>them<</if>> out!"
<<run Enunciate($activeSlave)>>
- $activeSlave.slaveName makes no verbal reply, but continues $his manual stimulation, and sticks $his tongue into $subSlave.slaveName's ear. The poor _girl2 lets out a startled yelp that trails off into a moan as $activeSlave.slaveName's <<if ($activeSlave.oralSkill >= 60)>>excellent<<elseif ($activeSlave.oralSkill > 1)>>skillful<<else>>enthusiastic<</if>> ministrations really begin to have an effect on _him2.
+ $activeSlave.slaveName makes no verbal reply, but continues $his manual stimulation, and sticks $his tongue into $subSlave.slaveName's ear. The poor _girl2 lets out a startled yelp that trails off into a moan as $activeSlave.slaveName's <<if ($activeSlave.skill.oral >= 60)>>excellent<<elseif ($activeSlave.skill.oral > 1)>>skillful<<else>>enthusiastic<</if>> ministrations really begin to have an effect on _him2.
<br><br>
$activeSlave.slaveName laughs unpleasantly at the desperately uncomfortable slave, and <<say>>s, "Tell you what, <<s>>lut. I'll leave you alone if thi<<s>> doe<<s>>n't get you off." Already realizing _his2 predicament, $subSlave.slaveName begins to protest, but $activeSlave.slaveName cuts _him2 off. "<<Sh>>ut your fucking cockhol<<s>>ter, bitch, I'm talking. I'll leave you alone if thi<<s>> doe<<s>>n't get you off, but if you come, you've obviou<<s>>ly been lying to me, and you obviou<<s>>ly want me to buttfuck you all night long." $subSlave.slaveName tries very hard, taking a huge breath of air and holding it in, biting _his2 lip, shutting _his2 eyes tight, and more, but it's all for naught. Before long, _he2 stiffens <<if $subSlave.balls > 0 || $subSlave.prostate > 0>>and makes a mess on the bedroll<<else>>with orgasm<</if>>, moaning as _his2 anal sphincter tightens against the invading <<if canPenetrate($activeSlave)>>cock<<else>>fingers<</if>>. Once the climax leaves _him2, _he2 begins to sob, knowing what this means. $activeSlave.slaveName takes _his2 hand away from the crying _girl2's crotch and begins to massage _his2 back with surprising tenderness. "<<Sh>>h, <<s>>weetie, it'<<s>> all right. I promi<<s>>e you'll enjoy thi<<s>>, if you let your<<s>>elf." You leave quietly, letting $activeSlave.slaveName have $his fun. As the week goes on, $subSlave.slaveName's @@.lightcoral;attitude towards anal sex@@ improves quickly, though _he2 feels rather conflicted about $activeSlave.slaveName for forcing this on _him2.
<<set $activeSlave.trust += 4>>
@@ -1544,7 +1544,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<replace "#result">>
You ask $activeSlave.slaveName what $he said in a neutral tone. $He gives you a quick glance, not sure whether to be aroused or afraid, but takes a breath to steady $himself and begins. For _his2 part, $subSlave.slaveName vainly tries to stop crying in front of you. When $activeSlave.slaveName reaches "<<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick == 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole," you hold up a hand to get $him to pause. $He does, and you suddenly shove $subSlave.slaveName towards the couch. _He2 crashes face-down into the cushions, already sobbing in terror. You place a hand on _his2 $activeSlave.skin back to hold _him2 down and then use the other to apply some lube to your <<if $PC.dick == 1>>penis<<else>>strap-on<</if>> before pressing it against the quivering slave's virgin anus. _He2 shakes with anguish, causing <<if $PC.dick == 1>>your cock to rub deliciously<<else>>the strap-on to slide amusingly<</if>> up and down _his2 asscrack. You make a come-on gesture to $activeSlave.slaveName, and $he continues, "You're going to do your be<<s>>t to relax like a good little _girl2."
$subSlave.slaveName desperately takes in a huge breath. $activeSlave.slaveName, who has gotten the idea (and to go by $his furious masturbation, clearly likes it), gasps out, "But it'<<s>> going to be <<s>>o big! It'<<s>> going to burn!" Here you begin to apply inexorable pressure. $subSlave.slaveName manages one more deep breath, but it becomes a squeal of anguish and _he2 tries frantically to burrow into the couch, away from the penetrating <<if $PC.dick == 1>>cock<<else>>strap-on<</if>>. "You're going to panic, and <<s>>truggle, and <<heP>>'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry..."
- $activeSlave.slaveName trails off as $he shakes with orgasm; $he doesn't say any more, but the @@.hotpink;wild satisfaction@@ <<if canSee($activeSlave)>>in $his <<= App.Desc.EyeColor>> eyes<<else>>on $his face<</if>> says it for $him. $subSlave.slaveName, meanwhile, is a mess, but hurries @@.gold;fearfully@@ to obey your instructions to go clean _himself2, and hides _his2 @@.mediumorchid;hatred@@ as _he2 gingerly applies an enema to _his2 @@.lime;loosened butt.@@
+ $activeSlave.slaveName trails off as $he shakes with orgasm; $he doesn't say any more, but the @@.hotpink;wild satisfaction@@ <<if canSee($activeSlave)>>in $his <<= App.Desc.eyeColor>> eyes<<else>>on $his face<</if>> says it for $him. $subSlave.slaveName, meanwhile, is a mess, but hurries @@.gold;fearfully@@ to obey your instructions to go clean _himself2, and hides _his2 @@.mediumorchid;hatred@@ as _he2 gingerly applies an enema to _his2 @@.lime;loosened butt.@@
<<set $activeSlave.devotion += 5>>
<<set $subSlave.trust -= 10, $subSlave.devotion -= 5, $subSlave.analCount++, $subSlave.anus = 1>>
<<set $analTotal++>>
@@ -1923,9 +1923,9 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You stand by and watch the arresting scene until $subSlave.slaveName cums. The milking stations are designed to be pleasurable, so they're calibrated to drain <<print _girl2>>s' balls about as fast as they drain their udders, allowing them to enjoy both kinds of relief for the whole session. But $activeSlave.slaveName has falsified that for once;
- <<if $activeSlave.oralSkill > 95>>
+ <<if $activeSlave.skill.oral > 95>>
the inside of $his wet, hot mouth is really a delightful place for a penis, and $he puts the machine's dick receptacle to shame. $subSlave.slaveName
- <<elseif $activeSlave.oralSkill > 60>>
+ <<elseif $activeSlave.skill.oral > 60>>
$he's a skilled cocksucker, and $his wet, hot mouth is a much more stimulating place for a penis than the machine's dick receptacle. $subSlave.slaveName
<<else>>
$he's no oral master, but $his mouth is wet and hot, and $subSlave.slaveName clearly likes it more than machine's dick receptacle. _He2
@@ -1958,7 +1958,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<else>>
"Thank you, <<Master>>," $he <<say>>s dutifully. "Your, um, your cum i<<s>> the be<<s>>t.<<if $PC.balls > 1>> I'll never go hungry with you either.<</if>>" Momentarily unsure of $himself, $he blushes, and decides to take refuge in dicksucking.
<</if>>
- <<if $activeSlave.oralSkill > 60>>
+ <<if $activeSlave.skill.oral > 60>>
$He's a well-trained cocksucker, and as the suction and $his active tongue go to work, $he reaches up and <<if $PC.vagina>>begins to lavish attention on your pussy with both hands. $He fingers your labia lovingly before starting to dip $his fingers inside you in time with $his oral strokes at your shaft.<<else>>cups your<<if $PC.ballsImplant > 3>>monstrous balls<<elseif $PC.ballsImplant == 3>>hand-filling <<elseif $PC.ballsImplant == 2>>huge <<elseif $PC.ballsImplant == 1>>big <</if>>balls lovingly. A testicular massage during a blowjob might not actually increase ejaculation volume, but the care $he shows suggests that the hungry slut might believe it does.<</if>>
<<else>>
$He's not an outstanding oral slave, so after $he's working away reasonably well, you take $his head in both hands and fuck $his face. Not cruelly, but with comprehensive dominance. $He can breathe, but $he has to concentrate to do so, letting you rape $his throat like a good little bitch.
@@ -2395,4 +2395,4 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
</span>
-<</if>> /* CLOSES EVENT SELECTION */
\ No newline at end of file
+<</if>> /* CLOSES EVENT SELECTION */
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 988a92696d29be383808a5de7821d631606db188..591a0dd8092e93b91fc72cd22cc3e48b715031c7 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -28,10 +28,10 @@
<<set $activeSlave.weight = 0>>
<<set $activeSlave.intelligence = random(15,100)>>
<<set $activeSlave.intelligenceImplant = 15>>
-<<set $activeSlave.entertainSkill = 45>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.entertainment = 45>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -80,10 +80,10 @@
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
<<set $activeSlave.faceImplant = 15>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.combatSkill = 1>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -133,8 +133,8 @@
<<set $activeSlave.weight = 0>>
<<set $activeSlave.intelligence = random(15,100)>>
<<set $activeSlave.intelligenceImplant = 30>>
-<<set $activeSlave.entertainSkill = 45>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.entertainment = 45>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.birthsTotal = 2>>
<<set $activeSlave.pubertyXX = 1>>
<<set $activeSlave.pubertyXY = 0>>
@@ -355,8 +355,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.weight = 0>>
<<set $activeSlave.intelligence = random(-50,70)>>
<<set $activeSlave.intelligenceImplant = 15>>
- <<set $activeSlave.entertainSkill = 25>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = 25>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -406,8 +406,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.weight = 0>>
<<set $activeSlave.intelligence = random(-50,70)>>
<<set $activeSlave.intelligenceImplant = 15>>
- <<set $activeSlave.entertainSkill = 25>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = 25>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -582,8 +582,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.weight = 0>>
<<set $activeSlave.intelligence = random(-50,70)>>
<<set $activeSlave.intelligenceImplant = 15>>
- <<set $activeSlave.entertainSkill = 25>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = 25>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -641,8 +641,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.weight = 0>>
<<set $activeSlave.intelligence = random(-50,70)>>
<<set $activeSlave.intelligenceImplant = 15>>
- <<set $activeSlave.entertainSkill = 25>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = 25>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -698,8 +698,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.weight = 0>>
<<set $activeSlave.intelligence = random(-50,70)>>
<<set $activeSlave.intelligenceImplant = 15>>
- <<set $activeSlave.entertainSkill = 25>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = 25>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -776,8 +776,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.weight = 0>>
<<set $activeSlave.intelligence = random(-50,70)>>
<<set $activeSlave.intelligenceImplant = 15>>
- <<set $activeSlave.entertainSkill = 25>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.entertainment = 25>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index a888abedc597c4e83e54abdd456f8171bd6f8f2d..d2edd8fd75ec409f04f20f6740190a43ace5f512 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -866,7 +866,7 @@ Custom Tats:
Branding:
<<if $activeSlave.brand != 0>>
- <<brandDescription>>
+ <<= App.Desc.brand($activeSlave)>>
[[Remove Brand|Body Modification][$brandApplied = 0, $activeSlave.brand = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation -= 10]]
<<else>>
$His skin is unmarked.
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 1f8437c1fcfc4cfbaeef3ca4540ba3de52c5988a..5c219bc617a4ab229c3912493d4f27ea3347650a 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -57,15 +57,15 @@
<<elseif (_FLsFetish == 2)>>
$He's careful that all of the whores under $his supervision are all warmed up and ready to get fucked every morning, and $he @@.lightsalmon;becomes more dominant.@@
<</if>>
- <<if ($Madam.whoreSkill <= 10)>>
+ <<if ($Madam.skill.whore <= 10)>>
Though $Madam.slaveName does $his best to manage the brothel, with $his lack of skill $he can do little.
- <<elseif ($Madam.whoreSkill <= 30)>>
+ <<elseif ($Madam.skill.whore <= 30)>>
$Madam.slaveName's basic skills marginally @@.yellowgreen;improve@@ business at $brothelName.
<<set $madamCashBonus += 0.05>>
- <<elseif ($Madam.whoreSkill <= 60)>>
+ <<elseif ($Madam.skill.whore <= 60)>>
$Madam.slaveName's skills @@.yellowgreen;improve@@ business at $brothelName.
<<set $madamCashBonus += 0.1>>
- <<elseif ($Madam.whoreSkill < 100)>>
+ <<elseif ($Madam.skill.whore < 100)>>
$Madam.slaveName's skills greatly @@.yellowgreen;improve@@ business at $brothelName.
<<set $madamCashBonus += 0.15>>
<<else>>
@@ -81,11 +81,11 @@
<<if setup.madamCareers.includes($Madam.career)>>
$He has experience from $his life before $he was a slave that helps $him in the seedy business of selling other people's bodies for sex.
<<set $madamCashBonus += 0.05>>
- <<elseif $Madam.skillMD >= $masteredXP>>
+ <<elseif $Madam.skill.madam >= $masteredXP>>
$He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex.
<<set $madamCashBonus += 0.05>>
<<else>>
- <<set $slaves[_FLs].skillMD += random(1,Math.ceil(($Madam.intelligence+$Madam.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.madam += random(1,Math.ceil(($Madam.intelligence+$Madam.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Madam.intelligence+$Madam.intelligenceImplant > 15)>>
$He is a clever manager.
@@ -292,7 +292,7 @@
<<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.33) && ($slaves[$i].broodmother == 0) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
<<set $legendaryWombID = $slaves[$i].ID>>
<</if>>
- <<if ($legendaryWhoreID == 0) && ($slaves[$i].whoreSkill >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<if ($legendaryWhoreID == 0) && ($slaves[$i].skill.whore >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
<<set $legendaryWhoreID = $slaves[$i].ID>>
<</if>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 715c2239ef8c69fbf222f33beadacacf0fa2678a..63778fa3315b0e6d1bf36564976762d1fe1e097f 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -60,11 +60,11 @@
<<if setup.wardenessCareers.includes($Wardeness.career)>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
$He has experience with detecting security issues and grinding down potential miscreants from $his life before $he was a slave, making $him more effective.
- <<elseif $Wardeness.skillWA >= $masteredXP>>
+ <<elseif $Wardeness.skill.wardeness >= $masteredXP>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
$He has experience with detecting security issues and grinding down potential miscreants from working for you, making $him more effective.
<<else>>
- <<set $slaves[_FLs].skillWA += random(1,Math.ceil(($Wardeness.intelligence+$Wardeness.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.wardeness += random(1,Math.ceil(($Wardeness.intelligence+$Wardeness.intelligenceImplant)/15) + 8)>>
<</if>>
<<if $Wardeness.fetish == "sadist">>
$He uses the prisoners to gratify $his sadism, terrifying them and quickly breaking their resistance.
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index dd145f5167cf75f24146b65ed979815d34bb16cd..bd774af0ecfbbd122f5f2b52104a0eb16dab7aa6 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -53,11 +53,11 @@
<<if setup.nurseCareers.includes($Nurse.career)>>
$He has experience with medicine from $his life before $he was a slave, and can often recognize conditions before even the medical scanners can.
<<set _idleBonus++, _healthBonus++>>
- <<elseif $Nurse.skillNU >= $masteredXP>>
+ <<elseif $Nurse.skill.nurse >= $masteredXP>>
$He has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can.
<<set _idleBonus++, _healthBonus++>>
<<else>>
- <<set $slaves[_FLs].skillNU += random(1,Math.ceil(($Nurse.intelligence+$Nurse.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.nurse += random(1,Math.ceil(($Nurse.intelligence+$Nurse.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Nurse.fetish == "dom")>>
$He raps out commands with the confidence of long and partly sexual experience, so patients are inclined to follow even unpleasant medical instructions.
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index f6094d87f5b588045b341955f022d238328425e6..f27d22716421590a27280a0ecade20ab23a45332 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -61,18 +61,18 @@
$His lack of eyesight doesn't slow $him down; rather, it strengthens $his other senses. $His tracks have a distinct sound, since $he experiences noise as $his sight.
<<set $DJRepBonus += 0.15>>
<</if>>
- <<if ($DJ.entertainSkill <= 10)>>
+ <<if ($DJ.skill.entertainment <= 10)>>
Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little.
- <<elseif ($DJ.entertainSkill <= 30)>>
+ <<elseif ($DJ.skill.entertainment <= 30)>>
$DJ.slaveName's basic skills marginally @@.green;improve@@ the atmosphere on $clubName.
<<set $DJRepBonus += 0.05>>
- <<elseif ($DJ.entertainSkill <= 60)>>
+ <<elseif ($DJ.skill.entertainment <= 60)>>
$DJ.slaveName's skills @@.green;improve@@ the atmosphere on $clubName.
<<set $DJRepBonus += 0.1>>
- <<elseif ($DJ.entertainSkill < 100)>>
+ <<elseif ($DJ.skill.entertainment < 100)>>
$DJ.slaveName's skills greatly @@.green;improve@@ the atmosphere on $clubName.
<<set $DJRepBonus += 0.15>>
- <<elseif ($DJ.entertainSkill >= 100)>>
+ <<elseif ($DJ.skill.entertainment >= 100)>>
$DJ.slaveName's mastery immensely @@.green;improves@@ the atmosphere on $clubName.
<<set $DJRepBonus += 0.20>>
<</if>>
@@ -91,11 +91,11 @@
<<if setup.DJCareers.includes($DJ.career)>>
$He has musical experience from $his life before $he was a slave, a grounding that gives $his tracks actual depth.
<<set $DJRepBonus += 0.05>>
- <<elseif $DJ.skillDJ >= $masteredXP>>
+ <<elseif $DJ.skill.DJ >= $masteredXP>>
$He has musical experience from working for you, giving $his tracks actual depth.
<<set $DJRepBonus += 0.05>>
<<else>>
- <<set $slaves[_FLs].skillDJ += random(1,Math.ceil(($DJ.intelligence+$DJ.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.DJ += random(1,Math.ceil(($DJ.intelligence+$DJ.intelligenceImplant)/15) + 8)>>
<</if>>
<<if (_DL < 10)>>
<<set $slavesGettingHelp = 0>>
@@ -108,7 +108,7 @@
<</if>>
<<if (_DL+$slavesGettingHelp < 10)>>
<<set $i = _FLs>> /* apply following SA passages to facility leader */
- <<if ($legendaryEntertainerID == 0) && ($slaves[_FLs].prestige == 0) && ($slaves[_FLs].entertainSkill >= 100) && ($slaves[_FLs].devotion > 50)>>
+ <<if ($legendaryEntertainerID == 0) && ($slaves[_FLs].prestige == 0) && ($slaves[_FLs].skill.entertainment >= 100) && ($slaves[_FLs].devotion > 50)>>
<<set $legendaryEntertainerID = $slaves[_FLs].ID>>
<</if>>
<br> Since $he doesn't have enough sluts in $clubName to make it worthwhile for $him to be on stage 24/7, $he spends $his extra time slutting it up $himself. $He has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
@@ -117,7 +117,7 @@
<<else>>
<<set _dump = saServeThePublic($slaves[$i])>>
<</if>>
- <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[_FLs].entertainSkill))*0.1*0.5), "club", $slaves[_FLs])>>
+ <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[_FLs].skill.entertainment))*0.1*0.5), "club", $slaves[_FLs])>>
<</if>>
<</if>>
<<if (_DL > 0)>><br><br><</if>>
@@ -199,7 +199,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$ClubiIDs[_dI]]>>
<<setLocalPronouns $slaves[$i]>>
- <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50)>>
+ <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].skill.entertainment >= 100) && ($slaves[$i].devotion > 50)>>
<<set $legendaryEntertainerID = $slaves[$i].ID>>
<</if>>
<<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.33) && ($slaves[$i].broodmother == 0) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
@@ -776,4 +776,3 @@
<<if _DL > 0 || $DJ != 0>>
<br><br>
<</if>>
-
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 7b7b5cf9b9382224d6ad91de3fc77fc08c7af273..3dfe357eb9594c13d9e593c51a9492c84c28844d 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -395,7 +395,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
$corpDivTrainSlaves2 = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>.@@
<</if>>
- <<elseif $corpDivTrainSlaves2 > 0>>It is holding <<if $corpDivTrainSlaves2 > 1>>$corpDivTrainSlaves2 trained slaves<<elseif $corpDivTrainSlaves2 == 1>>one trained slave<<else>> at the end of the week.<</if>>
+ <<elseif $corpDivTrainSlaves2 > 0>>It is holding <<if $corpDivTrainSlaves2 > 1>>$corpDivTrainSlaves2 trained slaves<<elseif $corpDivTrainSlaves2 == 1>>one trained slave<</if>> at the end of the week.
<<if $corpDivTrainSlaves2 > Math.trunc($corpDivTrainDev * 0.4)>>
<<if $corpDivTrainSurgeryTimer < 5 || $corpDivSurgery == 0>>
<<set _corpDivTrainCapSlaves = $corpDivTrainSlaves2 - Math.trunc($corpDivTrainDev * 0.4),
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index 08c6f865eca42d3e25ae23ce32715538ca827a56..282907037a1444bdb79104034ac5d262e823ee09 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -620,11 +620,26 @@ Skin tone: <span id = "skin">
<<CustomSlaveSkin>>
<</link>>
|
+<<link "Ivory">>
+ <<set $customSlave.skin = "ivory">>
+ <<CustomSlaveSkin>>
+<</link>>
+|
+<<link "White">>
+ <<set $customSlave.skin = "white">>
+ <<CustomSlaveSkin>>
+<</link>>
+|
<<link "Extremely Pale">>
<<set $customSlave.skin = "extremely pale">>
<<CustomSlaveSkin>>
<</link>>
|
+<<link "Very Pale">>
+ <<set $customSlave.skin = "very pale">>
+ <<CustomSlaveSkin>>
+<</link>>
+|
<<link "Pale">>
<<set $customSlave.skin = "pale">>
<<CustomSlaveSkin>>
@@ -645,23 +660,18 @@ Skin tone: <span id = "skin">
<<CustomSlaveSkin>>
<</link>>
|
-<<link "White">>
- <<set $customSlave.skin = "white">>
- <<CustomSlaveSkin>>
-<</link>>
-|
<<link "Light">>
<<set $customSlave.skin = "light">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Lightened">>
- <<set $customSlave.skin = "lightened">>
+<<link "Light Olive">>
+ <<set $customSlave.skin = "light olive">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Light Olive">>
- <<set $customSlave.skin = "light olive">>
+<<link "Tan">>
+ <<set $customSlave.skin = "tan">>
<<CustomSlaveSkin>>
<</link>>
|
@@ -670,28 +680,33 @@ Skin tone: <span id = "skin">
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Natural">>
- <<set $customSlave.skin = "natural">>
+<<link "Bronze">>
+ <<set $customSlave.skin = "bronze">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Tanned">>
- <<set $customSlave.skin = "tanned">>
+<<link "Dark Olive">>
+ <<set $customSlave.skin = "dark olive">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Bronzed">>
- <<set $customSlave.skin = "bronzed">>
+<<link "Dark">>
+ <<set $customSlave.skin = "dark">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Dark Olive">>
- <<set $customSlave.skin = "dark olive">>
+<<link "Light Beige">>
+ <<set $customSlave.skin = "light beige">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Dark">>
- <<set $customSlave.skin = "dark">>
+<<link "Beige">>
+ <<set $customSlave.skin = "beige">>
+ <<CustomSlaveSkin>>
+<</link>>
+|
+<<link "Dark Beige">>
+ <<set $customSlave.skin = "dark beige">>
<<CustomSlaveSkin>>
<</link>>
|
@@ -1016,40 +1031,40 @@ Skin tone: <span id = "skin">
<br>
<span id = "whoreskills">
-<<if $customSlave.whoreSkills <= 10>>Unskilled at prostitution and entertainment.
-<<elseif $customSlave.whoreSkills <= 15>>Basic skills at prostitution and entertainment.
+<<if $customSlave.skill.whores <= 10>>Unskilled at prostitution and entertainment.
+<<elseif $customSlave.skill.whores <= 15>>Basic skills at prostitution and entertainment.
<<else>>Skilled at prostitution and entertainment.
<</if>>
</span>
<<link "Unskilled">>
- <<set $customSlave.whoreSkills = 0>>
+ <<set $customSlave.skill.whores = 0>>
<<CustomSlaveWhoreSkills>>
<</link>>
|
<<link "Skilled">>
- <<set $customSlave.whoreSkills = 15>>
+ <<set $customSlave.skill.whores = 15>>
<<CustomSlaveWhoreSkills>>
<</link>>
|
<<link "Expert">>
- <<set $customSlave.whoreSkills = 35>>
+ <<set $customSlave.skill.whores = 35>>
<<CustomSlaveWhoreSkills>>
<</link>>
<br>
<span id = "combatskills">
-<<if $customSlave.combatSkills == 0>>Unskilled at combat.
+<<if $customSlave.skill.combats == 0>>Unskilled at combat.
<<else>>Skilled at combat.
<</if>>
</span>
<<link "Unskilled">>
- <<set $customSlave.combatSkills = 0>>
+ <<set $customSlave.skill.combats = 0>>
<<CustomSlaveCombatSkills>>
<</link>>
|
<<link "Skilled">>
- <<set $customSlave.combatSkills = 1>>
+ <<set $customSlave.skill.combats = 1>>
<<CustomSlaveCombatSkills>>
<</link>>
@@ -1274,7 +1289,7 @@ Nationality: $customSlave.nationality.
<br><br>
<<link "Reset custom order form">>
- <<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", amp: 0, eyes: 1, hears: 0}>>
+ <<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, skill: {whore: 15, combat: 0}, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", amp: 0, eyes: 1, hears: 0}>>
<<goto "Custom Slave">>
<</link>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index c66e64ef586510f0092a2b552096c507da5d5c2d..dd1e51dbf7fbcfbe5b4beb29e9d505e75f266655 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -103,8 +103,8 @@
<<if $slaves[_FLs].trust < 60>>
<<set $slaves[_FLs].trust += 5>>
<</if>>
- <<if ($slaves[_FLs].oralSkill > 0)>>
- <<set $milkmaidDevotionBonus += Math.trunc($slaves[_FLs].oralSkill/30)>>
+ <<if ($slaves[_FLs].skill.oral > 0)>>
+ <<set $milkmaidDevotionBonus += Math.trunc($slaves[_FLs].skill.oral/30)>>
<</if>>
<<if ($slaves[_FLs].health >= 80)>>
<<set $milkmaidHealthBonus++>>
@@ -192,10 +192,10 @@
Constantly having to wrestle unruly or aiding heavy cows into their stalls forces $him to @@.lime;build muscle.@@
<<set $slaves[_FLs].muscles++>>
<</if>>
- <<if ($Milkmaid.oralSkill > 30)>>
+ <<if ($Milkmaid.skill.oral > 30)>>
$His skilled tongue helps $him keep $his cattle happy.
<</if>>
- <<if ($Milkmaid.oralSkill < 90)>>
+ <<if ($Milkmaid.skill.oral < 90)>>
<<set $skillIncrease = 3>>
<<OralSkillIncrease $slaves[_FLs]>>
<</if>>
@@ -210,11 +210,11 @@
<<if setup.milkmaidCareers.includes($Milkmaid.career)>>
<<set $milkmaidHealthBonus++>>
$He has career experience dealing with milk animals.
- <<elseif $Milkmaid.skillMM >= $masteredXP>>
+ <<elseif $Milkmaid.skill.milkmaid >= $masteredXP>>
<<set $milkmaidHealthBonus++>>
$He has experience harvesting slave products from working for you.
<<else>>
- <<set $slaves[_FLs].skillMM += random(1,Math.ceil(($Milkmaid.intelligence+$Milkmaid.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.milkmaid += random(1,Math.ceil(($Milkmaid.intelligence+$Milkmaid.intelligenceImplant)/15) + 8)>>
<</if>>
<<if _prostateStim == 1>>
$He uses $his turgid cock to give prostate stimulation to slaves that need help ejaculating.
@@ -739,12 +739,12 @@
<<if ($slaves[$i].trust < -65)>>
<<set _horrified++>>
<</if>>
- <<elseif ($slaves[$i].vaginalSkill > 0)>>
- <<set $slaves[$i].vaginalSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[$i].oralSkill > 0)>>
- <<set $slaves[$i].oralSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[$i].analSkill > 0)>>
- <<set $slaves[$i].analSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.vaginal > 0)>>
+ <<set $slaves[$i].skill.vaginal -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.oral > 0)>>
+ <<set $slaves[$i].skill.oral -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.anal > 0)>>
+ <<set $slaves[$i].skill.anal -= 10, _skillsLost++>>
<<elseif ($slaves[$i].career != "a bioreactor")>>
<<set $slaves[$i].career = "a bioreactor", _careerForgotten++>>
<<elseif ($slaves[$i].intelligenceImplant > 0)>>
@@ -755,10 +755,10 @@
<<set $slaves[$i].devotion -= 10>>
<<elseif ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].trust -= 10>>
- <<elseif ($slaves[$i].whoreSkill > 0)>>
- <<set $slaves[$i].whoreSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[$i].entertainSkill > 0)>>
- <<set $slaves[$i].entertainSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.whore > 0)>>
+ <<set $slaves[$i].skill.whore -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.entertainment > 0)>>
+ <<set $slaves[$i].skill.entertainment -= 10, _skillsLost++>>
<<elseif ($slaves[$i].intelligence >= -50)>>
<<set $slaves[$i].intelligence -= 5>>
<<if $slaves[$i].intelligence < -50>>
@@ -789,12 +789,12 @@
<<if ($slaves[$i].trust < -70)>>
<<set _horrified++>>
<</if>>
- <<elseif ($slaves[$i].vaginalSkill >= 20)>>
- <<set $slaves[$i].vaginalSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[$i].oralSkill >= 20)>>
- <<set $slaves[$i].oralSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[$i].analSkill >= 20)>>
- <<set $slaves[$i].analSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.vaginal >= 20)>>
+ <<set $slaves[$i].skill.vaginal -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.oral >= 20)>>
+ <<set $slaves[$i].skill.oral -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.anal >= 20)>>
+ <<set $slaves[$i].skill.anal -= 10, _skillsLost++>>
<<elseif ($slaves[$i].career != "a bioreactor")>>
<<set $slaves[$i].career = "a bioreactor", _careerForgotten++>>
<<elseif ($slaves[$i].intelligenceImplant > 0)>>
@@ -805,10 +805,10 @@
<<set $slaves[$i].devotion -= 8>>
<<elseif ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].trust -= 8>>
- <<elseif ($slaves[$i].whoreSkill >= 20)>>
- <<set $slaves[$i].whoreSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[$i].entertainSkill >= 20)>>
- <<set $slaves[$i].entertainSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.whore >= 20)>>
+ <<set $slaves[$i].skill.whore -= 10, _skillsLost++>>
+ <<elseif ($slaves[$i].skill.entertainment >= 20)>>
+ <<set $slaves[$i].skill.entertainment -= 10, _skillsLost++>>
<<elseif ($slaves[$i].intelligence >= -50)>>
<<set $slaves[$i].intelligence -= 5>>
<<if $slaves[$i].intelligence < -50>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index b0dec61763cbdb44f8bcd6a8649b979416afa51a..9ec31c1ca8984ff323938016ece9299547a2a3db 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -76,11 +76,11 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
<<set $activeSlave.anus = 2>>
<<if $activeSlave.dick == 0>>
<<set $activeSlave.vagina = 2>>
- <<set $activeSlave.vaginalSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
<</if>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 15>>
<<set $activeSlave.addict = 2>>
<<slaveCost $activeSlave>>
<<elseif $PStrip == 2>>
@@ -92,11 +92,11 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
<<set $activeSlave.anus = 2>>
<<if $activeSlave.dick == 0>>
<<set $activeSlave.vagina = 2>>
- <<set $activeSlave.vaginalSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 35>>
<</if>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 35>>
- <<set $activeSlave.whoreSkill = 35>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 35>>
+ <<set $activeSlave.skill.whore = 35>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.boobsImplant = 600>>
<<set $activeSlave.boobsImplantType = 1>>
@@ -265,11 +265,11 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.attrXX = random(60,90)>>
<<set $activeSlave.attrXY = random(10,50)>>
<<set $activeSlave.energy = random(60,80)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.fetish = "dom">>
<<set $activeSlave.behavioralFlaw = "devout">>
@@ -292,11 +292,11 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.attrXX = random(10,50)>>
<<set $activeSlave.attrXY = random(10,50)>>
<<set $activeSlave.energy = random(5,20)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.behavioralFlaw = "devout">>
<<set $activeSlave.sexualFlaw = "repressed">>
@@ -321,11 +321,11 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.attrXX = random(60,90)>>
<<set $activeSlave.attrXY = random(10,50)>>
<<set $activeSlave.energy = random(60,80)>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.fetish = "dom">>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men", "hates men", "liberated")>>
@@ -347,11 +347,11 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.attrXX = 70>>
<<set $activeSlave.attrXY = random(10,70)>>
<<set $activeSlave.energy = random(50,70)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.fetish = "buttslut">>
<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy")>>
<<set $activeSlave.sexualFlaw = either("hates anal", "idealistic", "shamefast")>>
@@ -428,10 +428,10 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.attrXX = random(10,50)>>
<<set $activeSlave.attrXY = 90>>
<<set $activeSlave.energy = random(30,80)>>
- <<set $activeSlave.oralSkill = random(50,100)>>
- <<set $activeSlave.analSkill = random(50,100)>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = random(15,40)>>
+ <<set $activeSlave.skill.oral = random(50,100)>>
+ <<set $activeSlave.skill.anal = random(50,100)>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = random(15,40)>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.fetish = either("submissive", "cumslut", "buttslut")>>
<<set $activeSlave.fetishStrength = random(1,2)>>
@@ -453,10 +453,10 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.attrXX = random(10,50)>>
<<set $activeSlave.attrXY = random(60,90)>>
<<set $activeSlave.energy = random(30,70)>>
- <<set $activeSlave.oralSkill = random(15,40)>>
- <<set $activeSlave.analSkill = random(15,40)>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.oral = random(15,40)>>
+ <<set $activeSlave.skill.anal = random(15,40)>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.fetish = "buttslut">>
<<set $activeSlave.behavioralFlaw = either("anorexic", "bitchy", "devout", "odd")>>
<<set $activeSlave.sexualFlaw = either("apathetic", "repressed", "shamefast")>>
@@ -510,9 +510,9 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set _missLeader.waist = random(-40,0)>>
<<set _missLeader.attrXY = random(0,10)>>
<<set _missLeader.energy = random(0,20)>>
- <<set _missLeader.vaginalSkill = 50>>
- <<set _missLeader.oralSkill = 75>>
- <<set _missLeader.analSkill = 25>>
+ <<set _missLeader.skill.vaginal = 50>>
+ <<set _missLeader.skill.oral = 75>>
+ <<set _missLeader.skill.anal = 25>>
<<set _missLeader.pubicHStyle = "bushy">>
<<set _missLeader.underarmHStyle = "bushy">>
<<set _missLeader.preg = random(15,25)>>
@@ -555,9 +555,9 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.waist = random(-40,0)>>
<<set $activeSlave.attrXY = random(0,10)>>
<<set $activeSlave.energy = random(0,20)>>
- <<set $activeSlave.vaginalSkill = 50>>
- <<set $activeSlave.oralSkill = 75>>
- <<set $activeSlave.analSkill = 25>>
+ <<set $activeSlave.skill.vaginal = 50>>
+ <<set $activeSlave.skill.oral = 75>>
+ <<set $activeSlave.skill.anal = 25>>
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.underarmHStyle = "bushy">>
<<set $activeSlave.preg = random(30,35)>>
@@ -599,9 +599,9 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.waist = random(-10,0)>>
<<set $activeSlave.attrXY = random(0,10)>>
<<set $activeSlave.energy = random(0,20)>>
- <<set $activeSlave.vaginalSkill = 50>>
- <<set $activeSlave.oralSkill = 75>>
- <<set $activeSlave.analSkill = 25>>
+ <<set $activeSlave.skill.vaginal = 50>>
+ <<set $activeSlave.skill.oral = 75>>
+ <<set $activeSlave.skill.anal = 25>>
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.underarmHStyle = "bushy">>
<<set $activeSlave.preg = 0>>
@@ -652,9 +652,9 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set _missLoli.waist = random(-40,-10)>>
<<set _missLoli.attrXY = random(0,10)>>
<<set _missLoli.energy = random(0,20)>>
- <<set _missLoli.vaginalSkill = 75>>
- <<set _missLoli.oralSkill = 75>>
- <<set _missLoli.analSkill = 50>>
+ <<set _missLoli.skill.vaginal = 75>>
+ <<set _missLoli.skill.oral = 75>>
+ <<set _missLoli.skill.anal = 50>>
<<set _missLoli.pubicHStyle = "bushy">>
<<set _missLoli.underarmHStyle = "bushy">>
<<set _missLoli.preg = 40>>
@@ -706,11 +706,11 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.attrXX = random(10,50)>>
<<set $activeSlave.attrXY = random(60,90)>>
<<set $activeSlave.energy = random(20,80)>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy", "liberated")>>
<<set $activeSlave.sexualFlaw = either("apathetic", "hates anal", "hates oral", "idealistic", "shamefast")>>
<<set _newSlaves.push($activeSlave)>>
@@ -1133,11 +1133,11 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
<<set $activeSlave.lips = random(5,25)>>
<<set $activeSlave.anus = 1>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.vaginalCount += 1>>
<<set $vaginalTotal += 1>>
<<set $activeSlave.devotion = 25>>
@@ -1182,8 +1182,8 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
<<set $activeSlave.lips = random(5,25)>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.vaginalCount += 1>>
<<set $vaginalTotal += 1>>
<<set $activeSlave.devotion = 25>>
@@ -1206,9 +1206,9 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.hips = 3>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.hipsImplant = 1>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.fetish = "pregnancy">>
<<set $activeSlave.fetishStrength = 60>>
<<set $activeSlave.behavioralFlaw = "anorexic">>
@@ -1240,10 +1240,10 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.vaginalCount += 1>>
<<set $vaginalTotal += 1>>
<<set $activeSlave.devotion = -60>>
@@ -1253,7 +1253,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.muscles = 20>>
<<set $activeSlave.weight = 20>>
<<set $activeSlave.health = 30>>
@@ -1289,10 +1289,10 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XY Slave">>
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.analCount += 1>>
<<set $analTotal += 1>>
<<set $activeSlave.vaginalCount += 1>>
@@ -1310,7 +1310,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.clit = 0>>
<<set $activeSlave.preg = -2>>
<<set $activeSlave.anus = 2>>
- <<set $activeSlave.analSkill = 35>>
+ <<set $activeSlave.skill.anal = 35>>
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.health = 30>>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index 0d5c78539eb2e743ee384cc8c53c97bb13fc72d4..51ed0e9ec32604d5bece1f313cc62f642a659561 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -55,7 +55,7 @@ $He helps $activeSlave.slaveName however $he can. The tender care has @@.green;i
<<elseif setup.HGCareers.includes($HeadGirl.career)>>
$He was used to giving commands and being obeyed in $his life before $he was a slave, experience $he can call on now.
<<set _effectiveness += 5>>
-<<elseif $HeadGirl.skillHG >= $masteredXP>>
+<<elseif $HeadGirl.skill.headGirl >= $masteredXP>>
$He is used to giving commands and being obeyed through experience, rendering $him more effective.
<<set _effectiveness += 5>>
<</if>>
diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw
index e8b588b1c8a821714a4cf701fd2baddcdbda154a..48dbc817289e202d1f96d97b0a8659746c085c51 100644
--- a/src/uncategorized/industrialDairyAssignmentScene.tw
+++ b/src/uncategorized/industrialDairyAssignmentScene.tw
@@ -315,9 +315,9 @@ and brutal sodomy.
<<if $activeSlave.devotion > 95>>
$He relaxes and does $his best to enjoy $himself, $his cheeks flushing with arousal. Once $his sphincter is well stretched, the machine withdraws the dildo, and before $his anus can begin to close, the machine replaces it with the main instrument. Despite the preparation, it's so huge that $he moans with fear $he feels the head touch $his buttocks. The moan becomes a long low groan as $his butthole accommodates the enormous thing. When it's all the way in, the dildo begins to withdraw for its first stroke, and $he <<if !canTalk($activeSlave)>>signs<<else>>whispers<</if>>, "<<Master>>, it's <<s>>-<<s>>o b-big." $He relaxes and recollects $himself, and then adds, "I can do thi<<s>>."
<<elseif $activeSlave.devotion > 60>>
- $He tries to <<if $activeSlave.analSkill > 10>>apply $his anal training<<else>>relax<</if>>, but it fucks $his butt so mercilessly that $he eventually gives up and relaxes completely. This is what the machine was aiming for; it withdraws the dildo, and before $his sphincter can close, it replaces it with the main instrument. Despite the preparation, it's so huge that $he begins to scream in terror as $he feels the head touch $his buttocks. $His yelling becomes a drawn-out shriek as $his butthole accommodates the enormous thing. When $he finally runs out of breath and slumps within $his restraints, the dildo begins to withdraw for its first stroke, and $he <<if !canTalk($activeSlave)>>signs<<else>>whispers<</if>>, "<<Master>>, it'<<s>> too b-big. It hu-hurt<<s>>."
+ $He tries to <<if $activeSlave.skill.anal > 10>>apply $his anal training<<else>>relax<</if>>, but it fucks $his butt so mercilessly that $he eventually gives up and relaxes completely. This is what the machine was aiming for; it withdraws the dildo, and before $his sphincter can close, it replaces it with the main instrument. Despite the preparation, it's so huge that $he begins to scream in terror as $he feels the head touch $his buttocks. $His yelling becomes a drawn-out shriek as $his butthole accommodates the enormous thing. When $he finally runs out of breath and slumps within $his restraints, the dildo begins to withdraw for its first stroke, and $he <<if !canTalk($activeSlave)>>signs<<else>>whispers<</if>>, "<<Master>>, it'<<s>> too b-big. It hu-hurt<<s>>."
<<elseif $activeSlave.devotion > 20>>
- Crying, $he tries to <<if $activeSlave.analSkill > 10>>apply $his anal training<<else>>relax<</if>>, but it fucks $his butt so mercilessly that $he eventually gives up and relaxes completely. This is what the machine was aiming for; it withdraws the dildo, and before $his sphincter can close, it replaces it with the main instrument. Despite the preparation, it's so huge that $he begins to beg desperately as $he feels the head touch $his buttocks. $His whining becomes a drawn-out shriek as $his butthole accommodates the enormous thing. When $he finally runs out of breath and slumps within $his restraints, the dildo begins to withdraw for its first stroke, and $he is racked with sobs.
+ Crying, $he tries to <<if $activeSlave.skill.anal > 10>>apply $his anal training<<else>>relax<</if>>, but it fucks $his butt so mercilessly that $he eventually gives up and relaxes completely. This is what the machine was aiming for; it withdraws the dildo, and before $his sphincter can close, it replaces it with the main instrument. Despite the preparation, it's so huge that $he begins to beg desperately as $he feels the head touch $his buttocks. $His whining becomes a drawn-out shriek as $his butthole accommodates the enormous thing. When $he finally runs out of breath and slumps within $his restraints, the dildo begins to withdraw for its first stroke, and $he is racked with sobs.
<<else>>
$He obviously thinks this is what $his butt will suffer, and doesn't like it. $He's tragically wrong. When $he finally relaxes, the machine withdraws the dildo, and before $his sphincter can close, it replaces it with the main instrument. $He screams with the horror of realization and begins to beg desperately as $he feels its head touch $his buttocks. $His cries become a drawn-out shriek as $his butthole accommodates the enormous thing. When $he finally runs out of breath and slumps within $his restraints, the dildo begins to withdraw for its first stroke, and $he is racked with weeping.
<</if>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 81319d3e740317e90aa1a70ed45f5bc62f4c5516..ac79a4d49a89c43430ee2f601981c8fce9500fd6 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -35,11 +35,11 @@
<<set $activeSlave.health = random(80,90)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 3>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.bellySag = 10>>
<<set $activeSlave.bellySagPreg = 10>>
<<set $activeSlave.birthsTotal = 3>>
@@ -59,10 +59,10 @@
<<set $activeSlave.health = random(60,80)>>
<<set $activeSlave.balls = 0>>
<<set $activeSlave.anus = 2>>
- <<set $activeSlave.analSkill = 35>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.whoreSkill = 35>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.anal = 35>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.whore = 35>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.nipplesPiercing = 1>>
<<set $activeSlave.clitPiercing = 1>>
<<set $activeSlave.dickPiercing = 1>>
@@ -102,11 +102,11 @@
<<set $activeSlave.balls = 1>>
<</if>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<case "indenture deal">>
<<set $contractCost = 7500>>
<<set $activeSlaveOneTimeMinAge = 24>>
@@ -118,11 +118,11 @@
<<if $activeSlave.vagina > -1>>
<<set $activeSlave.vagina = 2>>
<</if>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.boobsImplant = 600>>
<<set $activeSlave.butt += 1>>
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index fccb3288d38b27f9f15299c384c0422eb5bc9459..e7729e096ecd97d2cbbcc2eb449f3a33f1e1c232 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -265,7 +265,7 @@
<</if>>
<<if $arcologies[0].FSEgyptianRevivalistSMR == 1>>
While $he was in the slave pens, $he was subjected to Egyptian cultural indoctrination.
- <<if $activeSlave.entertainSkill > 10>>
+ <<if $activeSlave.skill.entertainment > 10>>
$He is now @@.mediumaquamarine;confident@@ that $his entertainment skills will be valued here.
<<set $activeSlave.trust += 10>>
<<elseif $activeSlave.intelligenceImplant >= 15>>
@@ -281,7 +281,7 @@
<<if $activeSlave.nationality == "Japanese">>
$He is now @@.mediumaquamarine;confident@@ that, as a proper Japanese $girl, $he will receive preferential treatment.
<<set $activeSlave.trust += 10>>
- <<elseif $activeSlave.entertainSkill > 30>>
+ <<elseif $activeSlave.skill.entertainment > 30>>
$He now @@.mediumaquamarine;hopes@@ that $his refined entertainment skills will make $him culturally as well as sexually valuable.
<<set $activeSlave.trust += 5>>
<<else>>
@@ -514,4 +514,3 @@ a physical exam, and more.
<</if>>
<<= checkForGingering()>> /* may store a backup of $activeSlave and make temporary changes; call removeGingering() to retrieve backup before making changes to $activeSlave */
-
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index e3e8bb107f4203e61a81d59d1df21a60b28eaeb7..c9c0d80109e20c8233e21098ef3dc45f3dc36549 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -362,7 +362,7 @@ is
<</if>>
<</if>>
-<<= App.Desc.AgeAndHealth($activeSlave)>>
+<<= App.Desc.ageAndHealth($activeSlave)>>
<<if $saleDescription != 1>>
<<if $clinic != 0 && $clinicUpgradeScanner == 1>>
@@ -541,7 +541,7 @@ is
<<if $activeSlave.fuckdoll == 0>> /* NORMAL NON-FUCKDOLL MENTAL REPORT */
- <<= App.Desc.Eyes($activeSlave)>>
+ <<= App.Desc.eyes($activeSlave)>>
<<if $activeSlave.fetish == "mindbroken">>
However, @@.coral;$his mind is fundamentally broken;@@ everything $he experiences will quickly be forgotten.
@@ -1143,7 +1143,7 @@ is
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
<<if ["cheeks", "ears", "left cheek", "left ears", "neck", "right cheek", "right ears"].includes($activeSlave.brandLocation)>>
- <<brandDescription>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</if>>
<</if>>
@@ -1340,7 +1340,7 @@ is
<</if>>
<</if>>
<</if>>
- <<if ($week-$activeSlave.weekAcquired >= 20) && ($activeSlave.entertainSkill >= 100)>>
+ <<if ($week-$activeSlave.weekAcquired >= 20) && ($activeSlave.skill.entertainment >= 100)>>
<<if setup.entertainmentCareers.includes($activeSlave.career)>><<else>>
$He has gotten enough experience to be as charismatic as any professional entertainer<<if ($activeSlave.oralCount + $activeSlave.analCount + $activeSlave.vaginalCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount > 1000)>>, and has been fucked so many times that a free sex worker could teach $him nothing<</if>>.
<</if>>
@@ -1352,52 +1352,52 @@ is
<</if>>
<<set _careers = []>>
-<<if ($activeSlave.skillHG >= $masteredXP)>>
+<<if ($activeSlave.skill.headGirl >= $masteredXP)>>
<<set _careers.push("Head Girl")>>
<</if>>
-<<if ($activeSlave.skillRC >= $masteredXP)>>
+<<if ($activeSlave.skill.recruiter >= $masteredXP)>>
<<set _careers.push("Recruiter")>>
<</if>>
-<<if ($activeSlave.skillBG >= $masteredXP)>>
+<<if ($activeSlave.skill.bodyguard >= $masteredXP)>>
<<set _careers.push("Bodyguard")>>
<</if>>
-<<if ($activeSlave.skillMD >= $masteredXP)>>
+<<if ($activeSlave.skill.madam >= $masteredXP)>>
<<set _careers.push("Madam")>>
<</if>>
-<<if ($activeSlave.skillDJ >= $masteredXP)>>
+<<if ($activeSlave.skill.DJ >= $masteredXP)>>
<<set _careers.push("DJ")>>
<</if>>
-<<if ($activeSlave.skillNU >= $masteredXP)>>
+<<if ($activeSlave.skill.nurse >= $masteredXP)>>
<<set _careers.push("Nurse")>>
<</if>>
-<<if ($activeSlave.skillTE >= $masteredXP)>>
+<<if ($activeSlave.skill.teacher >= $masteredXP)>>
<<set _careers.push("Schoolteacher")>>
<</if>>
-<<if ($activeSlave.skillAT >= $masteredXP)>>
+<<if ($activeSlave.skill.attendant >= $masteredXP)>>
<<set _careers.push("Attendant")>>
<</if>>
-<<if ($activeSlave.skillMT >= $masteredXP)>>
+<<if ($activeSlave.skill.matron >= $masteredXP)>>
<<set _careers.push("Matron")>>
<</if>>
-<<if ($activeSlave.skillST >= $masteredXP)>>
+<<if ($activeSlave.skill.stewardess >= $masteredXP)>>
<<set _careers.push("Stewardess")>>
<</if>>
-<<if ($activeSlave.skillMM >= $masteredXP)>>
+<<if ($activeSlave.skill.milkmaid >= $masteredXP)>>
<<set _careers.push("Milkmaid")>>
<</if>>
-<<if ($activeSlave.skillFA >= $masteredXP)>>
+<<if ($activeSlave.skill.farmer >= $masteredXP)>>
<<set _careers.push("Farmer")>>
<</if>>
-<<if ($activeSlave.skillWA >= $masteredXP)>>
+<<if ($activeSlave.skill.wardeness >= $masteredXP)>>
<<set _careers.push("Wardeness")>>
<</if>>
-<<if ($activeSlave.skillS >= $masteredXP)>>
+<<if ($activeSlave.skill.servant >= $masteredXP)>>
<<set _careers.push("Servant")>>
<</if>>
-<<if ($activeSlave.skillE >= $masteredXP)>>
+<<if ($activeSlave.skill.entertainer >= $masteredXP)>>
<<set _careers.push("Entertainer")>>
<</if>>
-<<if ($activeSlave.skillW >= $masteredXP)>>
+<<if ($activeSlave.skill.whore >= $masteredXP)>>
<<set _careers.push("Whore")>>
<</if>>
<<if _careers.length > 0>>
@@ -1418,48 +1418,48 @@ is
<</if>>
/* old
<<set _numCareers = 0>>
-<<if ($activeSlave.skillHG >= $masteredXP)>>
+<<if ($activeSlave.skill.headGirl >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillRC >= $masteredXP)>>
+<<if ($activeSlave.skill.recruiter >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillBG >= $masteredXP)>>
+<<if ($activeSlave.skill.bodyguard >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillMD >= $masteredXP)>>
+<<if ($activeSlave.skill.madam >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillDJ >= $masteredXP)>>
+<<if ($activeSlave.skill.DJ >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillNU >= $masteredXP)>>
+<<if ($activeSlave.skill.nurse >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillTE >= $masteredXP)>>
+<<if ($activeSlave.skill.teacher >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillAT >= $masteredXP)>>
+<<if ($activeSlave.skill.attendant >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillMT >= $masteredXP)>>
+<<if ($activeSlave.skill.matron >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillST >= $masteredXP)>>
+<<if ($activeSlave.skill.stewardess >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillMM >= $masteredXP)>>
+<<if ($activeSlave.skill.milkmaid >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillFA >= $masteredXP)>>
+<<if ($activeSlave.skill.farmer >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
-<<if ($activeSlave.skillWA >= $masteredXP)>>
+<<if ($activeSlave.skill.wardeness >= $masteredXP)>>
<<set _numCareers += 1>>
<</if>>
<<if _numCareers > 0>>
$He has working experience as a
- <<if $activeSlave.skillHG >= $masteredXP>>
+ <<if $activeSlave.skill.headGirl >= $masteredXP>>
<<if _numCareers == 1>>
Head Girl.
<<elseif _numCareers == 2>>
@@ -1469,7 +1469,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillRC >= $masteredXP>>
+ <<if $activeSlave.skill.recruiter >= $masteredXP>>
<<if _numCareers == 1>>
Recruiter.
<<elseif _numCareers == 2>>
@@ -1479,7 +1479,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillBG >= $masteredXP>>
+ <<if $activeSlave.skill.bodyguard >= $masteredXP>>
<<if _numCareers == 1>>
Bodyguard.
<<elseif _numCareers == 2>>
@@ -1489,7 +1489,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillMD >= $masteredXP>>
+ <<if $activeSlave.skill.madam >= $masteredXP>>
<<if _numCareers == 1>>
Madam.
<<elseif _numCareers == 2>>
@@ -1499,7 +1499,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillDJ >= $masteredXP>>
+ <<if $activeSlave.skill.DJ >= $masteredXP>>
<<if _numCareers == 1>>
DJ.
<<elseif _numCareers == 2>>
@@ -1509,7 +1509,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillNU >= $masteredXP>>
+ <<if $activeSlave.skill.nurse >= $masteredXP>>
<<if _numCareers == 1>>
Nurse.
<<elseif _numCareers == 2>>
@@ -1519,7 +1519,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillTE >= $masteredXP>>
+ <<if $activeSlave.skill.teacher >= $masteredXP>>
<<if _numCareers == 1>>
Schoolteacher.
<<elseif _numCareers == 2>>
@@ -1529,7 +1529,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillAT >= $masteredXP>>
+ <<if $activeSlave.skill.attendant >= $masteredXP>>
<<if _numCareers == 1>>
Attendant.
<<elseif _numCareers == 2>>
@@ -1539,7 +1539,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillMT >= $masteredXP>>
+ <<if $activeSlave.skill.matron >= $masteredXP>>
<<if _numCareers == 1>>
Matron.
<<elseif _numCareers == 2>>
@@ -1549,7 +1549,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillST >= $masteredXP>>
+ <<if $activeSlave.skill.stewardess >= $masteredXP>>
<<if _numCareers == 1>>
Stewardess.
<<elseif _numCareers == 2>>
@@ -1559,7 +1559,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillMM >= $masteredXP>>
+ <<if $activeSlave.skill.milkmaid >= $masteredXP>>
<<if _numCareers == 1>>
Milkmaid.
<<else>>
@@ -1567,7 +1567,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillFA >= $masteredXP>>
+ <<if $activeSlave.skill.farmer >= $masteredXP>>
<<if _numCareers == 1>>
Farmer.
<<else>>
@@ -1575,7 +1575,7 @@ is
<</if>>
<<set _numCareers -= 1>>
<</if>>
- <<if $activeSlave.skillWA >= $masteredXP>>
+ <<if $activeSlave.skill.wardeness >= $masteredXP>>
Wardeness.
<</if>>
<</if>>
@@ -1624,38 +1624,38 @@ is
<</if>>
Entertainment and prostitution skills are irrelevant for a Fuckdoll.
<<else>>
- <<if $activeSlave.whoreSkill <= 10>>
- <<if $activeSlave.entertainSkill <= 10>>
- <<elseif $activeSlave.entertainSkill <= 30>>
+ <<if $activeSlave.skill.whore <= 10>>
+ <<if $activeSlave.skill.entertainment <= 10>>
+ <<elseif $activeSlave.skill.entertainment <= 30>>
$He is @@.aquamarine;reasonably entertaining.@@
- <<elseif $activeSlave.entertainSkill <= 60>>
+ <<elseif $activeSlave.skill.entertainment <= 60>>
$He is a @@.aquamarine;skilled entertainer.@@
- <<elseif $activeSlave.entertainSkill < 100>>
+ <<elseif $activeSlave.skill.entertainment < 100>>
$He is an @@.aquamarine;expert entertainer.@@
<<else>>
$He is a @@.aquamarine;master of entertainment.@@
<</if>>
<<else>>
- <<if $activeSlave.entertainSkill <= 10>>
- <<elseif $activeSlave.entertainSkill <= 30>>
+ <<if $activeSlave.skill.entertainment <= 10>>
+ <<elseif $activeSlave.skill.entertainment <= 30>>
$He is @@.aquamarine;reasonably entertaining@@ and
- <<elseif $activeSlave.entertainSkill <= 60>>
+ <<elseif $activeSlave.skill.entertainment <= 60>>
$He is a @@.aquamarine;skilled entertainer@@ and
- <<elseif $activeSlave.entertainSkill < 100>>
+ <<elseif $activeSlave.skill.entertainment < 100>>
$He is an @@.aquamarine;expert entertainer@@ and
<<else>>
$He is a @@.aquamarine;master of entertainment@@ and
<</if>>
<</if>>
- <<if $activeSlave.whoreSkill <= 10>>
- <<elseif $activeSlave.whoreSkill <= 30>>
- <<if $activeSlave.entertainSkill <= 10>>$He <</if>>has @@.aquamarine;basic experience as a prostitute.@@
- <<elseif $activeSlave.whoreSkill <= 60>>
- <<if $activeSlave.entertainSkill <= 10>>$He is <</if>>a @@.aquamarine;skilled streetwalker.@@
- <<elseif $activeSlave.whoreSkill < 100>>
- <<if $activeSlave.entertainSkill <= 10>>$He is <</if>>an @@.aquamarine;expert working $girl.@@
+ <<if $activeSlave.skill.whore <= 10>>
+ <<elseif $activeSlave.skill.whore <= 30>>
+ <<if $activeSlave.skill.entertainment <= 10>>$He <</if>>has @@.aquamarine;basic experience as a prostitute.@@
+ <<elseif $activeSlave.skill.whore <= 60>>
+ <<if $activeSlave.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;skilled streetwalker.@@
+ <<elseif $activeSlave.skill.whore < 100>>
+ <<if $activeSlave.skill.entertainment <= 10>>$He is <</if>>an @@.aquamarine;expert working $girl.@@
<<else>>
- <<if $activeSlave.entertainSkill <= 10>>$He is <</if>>a @@.aquamarine;masterful whore.@@
+ <<if $activeSlave.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;masterful whore.@@
<</if>>
<</if>>
@@ -1689,7 +1689,7 @@ is
<br>
<<if $activeSlave.amp != 0>>
- <<amputeeDescription>>
+ <<= App.Desc.amputee($activeSlave)>>
<</if>>
<<ClothingDescription>>
@@ -1771,7 +1771,7 @@ and
$His hips are unrealistically wide, it is obvious they have been artificially widened.
<</if>>
-<<waistDescription>>
+<<= App.Desc.waist($activeSlave)>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
<<if $arcologies[0].FSHedonisticDecadence == "unset" && $arcologies[0].FSPhysicalIdealistStrongFat == 0>>
@@ -1917,7 +1917,7 @@ $He is
<<BodyguardWeapon>>
<</if>>
- <<if $activeSlave.combatSkill > 0>>
+ <<if $activeSlave.skill.combat > 0>>
$He is @@.aquamarine;skilled at combat:@@ $he is comfortable with the use of modern firearms and edged weapons, and $his hands <<if $activeSlave.amp == -4>>would be deadly weapons even if they weren't full of deadly weapons already<<elseif $activeSlave.amp > 0>>would be deadly weapons if $he had any<<else>>are deadly weapons<</if>>.
<</if>>
<</if>>
@@ -1963,7 +1963,7 @@ $He is
<<if $showBodyMods == 1>>
/* Check it's not a facial brand: */
<<if ["ankles", "back", "calves", "chest", "feet", "hands", "left ankle", "left calf", "left foot", "left hand", "left lower arm", "left shoulder", "left upper arm", "left wrist", "lower arms", "lower back", "right ankle", "right calf", "right foot", "right hand", "right lower arm", "right shoulder", "right upper arm", "right wrist", "shoulders", "upper arms", "wrists"].includes($activeSlave.brandLocation)>>
- <<brandDescription>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</if>>
<</if>>
@@ -2040,7 +2040,7 @@ $He is
<<if $activeSlave.markings == "birthmark" && $activeSlave.prestige == 0 && $activeSlave.pornPrestige < 2>>
$He has a large, liver-colored birthmark, detracting from $his beauty.
<</if>>
- <<if ($activeSlave.skin == "tanned") && ($activeSlave.origSkin != "tanned")>>
+ <<if ($activeSlave.skin == "sun tanned")>>
<<if ($activeSlave.releaseRules != "restrictive" && $activeSlave.releaseRules != "masturbation" && $activeSlave.releaseRules != "chastity")>>
<<if ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
$His tan is slightly uneven, since $he enjoys
@@ -2082,7 +2082,7 @@ $He is
<<if ($activeSlave.hColor == "red")>>
<<if ($activeSlave.hLength >= 10)>>
<<if ($activeSlave.markings == "freckles") || ($activeSlave.markings == "heavily freckled")>>
- <<if ($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")>>
+ <<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10)>>
It goes perfectly with $his $activeSlave.skin skin and freckles.
<</if>>
<</if>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 0d0ca405b358bca9447957daf12af1ce514749cc..cb91d0229064da7c2bb583fa57f558b819e35d2c 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -172,7 +172,7 @@
<<set $slaves[$i].devotion++>>
<</if>>
<<set $beauty = Beauty($Concubine)>>
- <<run repX($beauty * 5 + ($Concubine.vaginalSkill || 0) + $Concubine.analSkill + $Concubine.oralSkill + $Concubine.whoreSkill + $Concubine.entertainSkill, "concubine", $Concubine)>>
+ <<run repX($beauty * 5 + ($Concubine.skill.vaginal || 0) + $Concubine.skill.anal + $Concubine.skill.oral + $Concubine.skill.whore + $Concubine.skill.entertainment, "concubine", $Concubine)>>
<<else>> /* not Concubine */
''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
@@ -425,4 +425,3 @@
<<if _DL > 0 || $Concubine != 0>>
<br><br>
<</if>>
-
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index ac2237f90c1ca80fce810e707b8e2e1fbe6ad973..b8e478894852e8ced12bcc4e56cb425ada6afa3c 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -93,7 +93,9 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.origSkin = $activeSlave.skin>>
<</if>>
<<if $activeSlave.skin != $activeSlave.origSkin>>
- An epidermis scan reveals that $his skin was originally $activeSlave.origSkin, not $activeSlave.skin<<if $PC.medicine >= 75 || $PC.slaving >= 75>>, just as you suspected<</if>>.
+ <<if ($activeSlave.skin != "sun tanned") || ($activeSlave.skin != "spray tanned")>>
+ An epidermis scan reveals that $his skin was originally $activeSlave.origSkin, not $activeSlave.skin<<if $PC.medicine >= 75 || $PC.slaving >= 75>>, just as you suspected<</if>>.
+ <</if>>
<</if>>
@@ -101,7 +103,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.oldTrust = $activeSlave.trust>>
<<if $activeSlave.vagina < 0>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<</if>>
<<if $activeSlave.nipplesPiercing > 0>>
@@ -641,7 +643,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
<<set $activeSlave.anus += 1>>
- <<set $activeSlave.analSkill += 10>>
+ <<set $activeSlave.skill.anal += 10>>
<<= AnalVCheck()>>
<</link>>
@@ -887,7 +889,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Use $his big sister as an example">>
<<replace "#introResult">>
- Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.vaginalSkill + $eventSlave.analSkill + $eventSlave.oralSkill) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.entertainSkill >= 100>>masterful<<elseif $eventSlave.entertainSkill > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.whoreSkill > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his big sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+ Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his big sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
<</replace>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
@@ -899,7 +901,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Use $his little sister as an example">>
<<replace "#introResult">>
- Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.vaginalSkill + $eventSlave.analSkill + $eventSlave.oralSkill) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.entertainSkill >= 100>>masterful<<elseif $eventSlave.entertainSkill > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.whoreSkill > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his little sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+ Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his little sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
<</replace>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
@@ -911,7 +913,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Use $his sister as an example">>
<<replace "#introResult">>
- Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.vaginalSkill + $eventSlave.analSkill + $eventSlave.oralSkill) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.entertainSkill >= 100>>masterful<<elseif $eventSlave.entertainSkill > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.whoreSkill > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his twin sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+ Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his twin sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
<</replace>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
@@ -923,7 +925,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Use $his mother as an example">>
<<replace "#introResult">>
- You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.vaginalSkill + $eventSlave.analSkill + $eventSlave.oralSkill) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.entertainSkill >= 100>>masterful<<elseif $eventSlave.entertainSkill > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.whoreSkill > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his mother @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+ You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his mother @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
<</replace>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
@@ -935,7 +937,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Use $his parent as an example">>
<<replace "#introResult">>
- You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.vaginalSkill + $eventSlave.analSkill + $eventSlave.oralSkill) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.entertainSkill >= 100>>masterful<<elseif $eventSlave.entertainSkill > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.whoreSkill > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $activeSlave.mother == $eventSlave.ID>>mother<<else>>father<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+ You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $activeSlave.mother == $eventSlave.ID>>mother<<else>>father<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
<</replace>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
@@ -947,7 +949,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Use $his daughter as an example">>
<<replace "#introResult">>
- You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.vaginalSkill + $eventSlave.analSkill + $eventSlave.oralSkill) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.entertainSkill >= 100>>masterful<<elseif $eventSlave.entertainSkill > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.whoreSkill > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $eventSlave.genes == "XX">>daughter<<else>>son<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+ You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $eventSlave.genes == "XX">>daughter<<else>>son<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
<</replace>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
@@ -1153,7 +1155,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<= FSChange("Eugenics", 3)>>
<</if>>
<</replace>>
- <<set $activeSlave.chastityVagina = 0,$activeSlave.dick = 0,$activeSlave.foreskin = 0,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregKnown = 0,$activeSlave.pregSource = 0,$activeSlave.pregType = 0,$activeSlave.pregWeek = -4,$activeSlave.vagina = -1,$activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.chastityVagina = 0,$activeSlave.dick = 0,$activeSlave.foreskin = 0,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregKnown = 0,$activeSlave.pregSource = 0,$activeSlave.pregType = 0,$activeSlave.pregWeek = -4,$activeSlave.vagina = -1,$activeSlave.skill.vaginal = 0>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.health -= 10, $activeSlave.trust = Math.clamp($activeSlave.trust-100, -100, 100)>>
<</link>>
@@ -2029,4 +2031,4 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
<<= IncreasePCSkills('trading', 0.1)>>
-<<if $PC.slaving < 100 && random($PC.slaving,100) > 50>> <<= IncreasePCSkills('slaving', 0.5)>> <<else>> <<= IncreasePCSkills('slaving', 0.1)>> <</if>>
\ No newline at end of file
+<<if $PC.slaving < 100 && random($PC.slaving,100) > 50>> <<= IncreasePCSkills('slaving', 0.5)>> <<else>> <<= IncreasePCSkills('slaving', 0.1)>> <</if>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 8e9ce1b7e5523fabdbf43b88cb9adefd846e650e..d12f5702b41db198b78d39e80047a9d29756fc67 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -25,6 +25,15 @@
<</if>>
<</if>>
<</if>>
+<<if $menstruation == 1>>
+<<elseif $PC.geneticQuirks.superfetation == 2 && $PC.womb.length > 0>>
+ <<if $PC.fertPeak == 0>>
+ <<set $PC.fertPeak = 1>>
+ <</if>>
+ <<set $PC.fertPeak-->>
+<<elseif $PC.fertPeak != 0>>
+ <<set $PC.fertPeak = 0>>
+<</if>>
/*Adding random changes to the economy*/
<<if $difficultySwitch == 1>>
@@ -131,6 +140,15 @@
<<set $slaves[_i].boobs += $slaves[_i].boobsMilk>>
<</if>>
<</if>>
+ <<if $menstruation == 1>>
+ <<elseif $slaves[_i].geneticQuirks.superfetation == 2 && $slaves[_i].womb.length > 0>>
+ <<if $slaves[_i].fertPeak == 0>>
+ <<set $slaves[_i].fertPeak = 1>>
+ <</if>>
+ <<set $slaves[_i].fertPeak-->>
+ <<elseif $slaves[_i].fertPeak != 0>>
+ <<set $slaves[_i].fertPeak = 0>>
+ <</if>>
<<set $slaves[_i].trust = Number($slaves[_i].trust.toFixed(1)), $slaves[_i].devotion = Number($slaves[_i].devotion.toFixed(1))>>
<<set $slaves[_i].oldDevotion = $slaves[_i].devotion, $slaves[_i].oldTrust = $slaves[_i].trust, $slaves[_i].tired = 0, $slaves[_i].minorInjury = 0>>
<<if $slaves[_i].sentence > 1>>
@@ -171,11 +189,11 @@
<<set $slaves[_i].butt = Number($slaves[_i].butt.toFixed(1))>>
<<set $slaves[_i].muscles = Math.clamp($slaves[_i].muscles.toFixed(1), -100, 100)>>
<<set $slaves[_i].lips = Math.clamp($slaves[_i].lips.toFixed(1), 0, 100)>>
- <<set $slaves[_i].oralSkill = Math.clamp($slaves[_i].oralSkill.toFixed(1), 0, 100)>>
- <<set $slaves[_i].vaginalSkill = Math.clamp($slaves[_i].vaginalSkill.toFixed(1), 0, 100)>>
- <<set $slaves[_i].analSkill = Math.clamp($slaves[_i].analSkill.toFixed(1), 0, 100)>>
- <<set $slaves[_i].whoreSkill = Math.clamp($slaves[_i].whoreSkill.toFixed(1), 0, 100)>>
- <<set $slaves[_i].entertainSkill = Math.clamp($slaves[_i].entertainSkill.toFixed(1), 0, 100)>>
+ <<set $slaves[_i].skill.oral = Math.clamp($slaves[_i].skill.oral.toFixed(1), 0, 100)>>
+ <<set $slaves[_i].skill.vaginal = Math.clamp($slaves[_i].skill.vaginal.toFixed(1), 0, 100)>>
+ <<set $slaves[_i].skill.anal = Math.clamp($slaves[_i].skill.anal.toFixed(1), 0, 100)>>
+ <<set $slaves[_i].skill.whore = Math.clamp($slaves[_i].skill.whore.toFixed(1), 0, 100)>>
+ <<set $slaves[_i].skill.entertainment = Math.clamp($slaves[_i].skill.entertainment.toFixed(1), 0, 100)>>
<<set $slaves[_i].lactationAdaptation = Math.clamp($slaves[_i].lactationAdaptation.toFixed(1), 0, 100)>>
<<set $slaves[_i].intelligenceImplant = Number($slaves[_i].intelligenceImplant.toFixed(1), 0, 30)>>
<<set $slaves[_i].prematureBirth = 0>>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index 160f9ae27cdc35e6a923fc11f28c99c0592c0804..ffa32c4b738725acd85bc503a47dd05fcd28e014 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -13,18 +13,18 @@
<<setLocalPronouns $activeSlave>>
<<if random(1,2) == 1>>
This includes a sex toy based on $activeSlave.slaveName's
- <<if (random(1,3) == 1) && ($activeSlave.vaginalSkill >= 100)>>
+ <<if (random(1,3) == 1) && ($activeSlave.skill.vaginal >= 100)>>
<<if $activeSlave.vagina > 3>>massive vagina<<elseif $activeSlave.vagina > 2>>gaping cunt<<elseif $activeSlave.vagina > 1>>hot cunt<<elseif $activeSlave.vagina > 0>>tight pussy<<else>>virgin pussy<</if>>.
- <<elseif (random(1,2) == 1) && ($activeSlave.oralSkill >= 100)>>
+ <<elseif (random(1,2) == 1) && ($activeSlave.skill.oral >= 100)>>
<<if $activeSlave.lips > 40>>huge<<elseif $activeSlave.lips > 20>>pillowlike<<elseif $activeSlave.lips > 10>>pretty<<else>>thin<</if>> lips and throat.
<<else>>
<<if $activeSlave.anus > 3>>blown-out butthole<<elseif $activeSlave.anus > 2>>roomy anus<<elseif $activeSlave.anus > 1>>big butthole<<elseif $activeSlave.anus > 0>>tight asshole<<else>>virgin backdoor<</if>>.
<</if>>
<<else>>
There is a figurine of $activeSlave.slaveName; $he's depicted
- <<if (random(1,3) == 1) && ($activeSlave.vaginalSkill >= 100)>>
+ <<if (random(1,3) == 1) && ($activeSlave.skill.vaginal >= 100)>>
lying nude on $his back, spreading $his legs to <<if $activeSlave.vagina > 3>>exhibit $his massive vagina<<elseif $activeSlave.vagina > 2>>show off $his gaping cunt<<elseif $activeSlave.vagina > 1>>offer $his hot cunt<<elseif $activeSlave.vagina > 0>>display $his tight pussy<<else>>tantalize with $his virgin pussy<</if>>.
- <<elseif (random(1,2) == 1) && ($activeSlave.oralSkill >= 100)>>
+ <<elseif (random(1,2) == 1) && ($activeSlave.skill.oral >= 100)>>
with $his <<if $activeSlave.lips > 40>>huge<<elseif $activeSlave.lips > 20>>pillowlike<<elseif $activeSlave.lips > 10>>pretty<<else>>thin<</if>> lips parted, $his tongue partway out.
<<else>>
bending at the waist and spreading $his <<if $activeSlave.butt > 6>>gigantic buttocks<<elseif $activeSlave.butt > 4>>meaty asscheeks<<elseif $activeSlave.butt > 2>>healthy buttocks<<else>>cute butt<</if>> to show off $his <<if $activeSlave.anus > 3>>blown-out butthole<<elseif $activeSlave.anus > 2>>roomy butthole<<elseif $activeSlave.anus > 1>>big butthole<<elseif $activeSlave.anus > 0>>tight asshole<<else>>virgin backdoor<</if>>.
@@ -44,18 +44,18 @@
<<setLocalPronouns $activeSlave>>
<<if random(1,2) == 1>>
This includes a sex toy based on $activeSlave.slaveName's
- <<if (random(1,3) == 1) && ($activeSlave.vaginalSkill >= 100)>>
+ <<if (random(1,3) == 1) && ($activeSlave.skill.vaginal >= 100)>>
<<if $activeSlave.vagina > 3>>massive vagina<<elseif $activeSlave.vagina > 2>>gaping cunt<<elseif $activeSlave.vagina > 1>>hot cunt<<elseif $activeSlave.vagina > 0>>tight pussy<<else>>virgin pussy<</if>>.
- <<elseif (random(1,2) == 1) && ($activeSlave.oralSkill >= 100)>>
+ <<elseif (random(1,2) == 1) && ($activeSlave.skill.oral >= 100)>>
<<if $activeSlave.lips > 40>>huge<<elseif $activeSlave.lips > 20>>pillowlike<<elseif $activeSlave.lips > 10>>pretty<<else>>thin<</if>> lips and throat.
<<else>>
<<if $activeSlave.anus > 3>>blown-out butthole<<elseif $activeSlave.anus > 2>>roomy butthole<<elseif $activeSlave.anus > 1>>big butthole<<elseif $activeSlave.anus > 0>>tight asshole<<else>>virgin backdoor<</if>>.
<</if>>
<<else>>
This includes paired figurines of $activeSlave.slaveName with a faceless male figure;
- <<if (random(1,3) == 1) && ($activeSlave.vaginalSkill >= 100)>>
+ <<if (random(1,3) == 1) && ($activeSlave.skill.vaginal >= 100)>>
$he's shamelessly riding his dick.
- <<elseif (random(1,2) == 1) && ($activeSlave.oralSkill >= 100)>>
+ <<elseif (random(1,2) == 1) && ($activeSlave.skill.oral >= 100)>>
$he's on $his knees with $his <<if $activeSlave.lips > 40>>huge<<elseif $activeSlave.lips > 20>>pillowlike<<elseif $activeSlave.lips > 10>>pretty<<else>>thin<</if>> lips wrapped around his dick.
<<else>>
$he's shown <<if $activeSlave.anus > 3>>looking up teasingly as $he takes his dick up $his blown-out butthole<<elseif $activeSlave.anus > 2>>looking up teasingly as $he takes his dick up $his roomy anus<<elseif $activeSlave.anus > 1>>looking up teasingly as $he takes his dick in $his big butthole<<elseif $activeSlave.anus > 0>>gasping as $he takes his dick in $his tight asshole<<else>>screaming as he fucks $his virgin backdoor<</if>>.
@@ -188,4 +188,3 @@ A $PC.visualAge year old<<if $PC.markings == "freckles">>, freckled<<elseif $PC.
<<PlayerBelly>>
<<PlayerCrotch>>
<<PlayerButt>>
-
diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index e9f9e146a1499319c6fb7b371ed218c86d4cf05f..c0d6b0ba6217e168255fd79ebb454e1dfdb5797a 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -45,7 +45,7 @@ The implant is small, and went off too far ahead to do anything more than stun.
<<run repX(2500, "event", $Bodyguard)>>
<<set $arcologies[0].prosperity += 1>>
-<<elseif $Bodyguard.combatSkill > 0>>
+<<elseif $Bodyguard.skill.combat > 0>>
$Bodyguard.slaveName glances at you to check that $his principal is alive for the moment, already
<<if ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 5>>
getting $his light machine gun into action. Since they're so close, $he doesn't even bother to shoulder the weapon, simply using $his weapon's firepower to dump rounds into each attacker.
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 7a8f6aa6d887d67298f101d6eaed14df04911298..78009ce81ffddf5101cbfe3c1ff33c46f6bb7df9 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -44,11 +44,11 @@
<<set $activeSlave.anus = 3>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.weight = 20>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 100>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 100>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.clitPiercing = 2>>
<<set $activeSlave.nipplesPiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
@@ -81,11 +81,11 @@
<<set $activeSlave.anus = 3>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.weight = -35>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 100>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 100>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.dickPiercing = 2>>
<<set $activeSlave.fetish = "pregnancy">>
<<set $activeSlave.fetishStrength = 100>>
@@ -114,11 +114,11 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.weight = -35>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 100>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 100>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.dickPiercing = 2>>
<<set $activeSlave.pubertyXY = 1>>
<<set $activeSlave.fetish = "pregnancy">>
@@ -147,12 +147,12 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.behavioralFlaw = "hates men">>
<<set $activeSlave.behavioralQuirk = "fitness">>
<<set $activeSlave.sexualFlaw = "hates anal">>
@@ -178,12 +178,12 @@
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.weight = 100>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.behavioralFlaw = "hates men">>
<<set $activeSlave.behavioralQuirk = "insecure">>
<<set $activeSlave.sexualFlaw = "shamefast">>
@@ -212,12 +212,12 @@
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.preg = -1>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.clitPiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
<<set $activeSlave.behavioralFlaw = "hates men">>
@@ -266,12 +266,12 @@
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<run SetBellySize($activeSlave)>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 35>>
- <<set $activeSlave.entertainSkill = 15>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 35>>
+ <<set $activeSlave.skill.entertainment = 15>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.fetish = "pregnancy">>
<<set $activeSlave.fetishStrength = 1000>>
<<set $activeSlave.behavioralFlaw = "odd">>
@@ -300,12 +300,12 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.preg = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $activeSlave.behavioralQuirk = "insecure">>
<<set $activeSlave.sexualFlaw = "shamefast">>
@@ -333,12 +333,12 @@
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.preg = 0>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $activeSlave.behavioralQuirk = "insecure">>
<<set $activeSlave.sexualFlaw = "breast growth">>
@@ -365,12 +365,12 @@
<<set $activeSlave.anus = 2>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.preg = -1>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 35>>
- <<set $activeSlave.whoreSkill = 35>>
- <<set $activeSlave.entertainSkill = 35>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 35>>
+ <<set $activeSlave.skill.whore = 35>>
+ <<set $activeSlave.skill.entertainment = 35>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.clitPiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
@@ -398,12 +398,12 @@
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<set $activeSlave.pregType = setPregType($activeSlave)>>
<<run SetBellySize($activeSlave)>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 100>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 100>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.clitPiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
<<set $activeSlave.behavioralFlaw = "bitchy">>
@@ -471,4 +471,4 @@ the delicious moment of finding your rival on $his knees in front of you with a
<<set $nextLink = "AS Dump", $returnTo = "P rival initiation", $rivalID = $activeSlave.ID>> /* proceed directly to rival initiation event after New Slave Intro */
<<set $rivalRace = 0>>
-<<include "New Slave Intro">>
\ No newline at end of file
+<<include "New Slave Intro">>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index e4f648dead7c1289e6e973809e48e0ab4ba3434e..7c10e6604e3d751a438eee1a3857cd9962dc6076 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -54,8 +54,8 @@
<<set $activeSlave.face = 100>>
<<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.intelligenceImplant = 0>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.entertainSkill = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.entertainment = 100>>
<<case "escort">>
<<set $activeSlave.career = "a prostitute">>
<<if $pedo_mode == 1>>
@@ -66,11 +66,11 @@
<<set $activeSlave.face = 100>>
<<set $activeSlave.intelligence = random(-15,15)>>
<<set $activeSlave.intelligenceImplant = 0>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.entertainSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.whoreSkill = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.entertainment = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.whore = 100>>
<<set $activeSlave.oralCount = 453>>
<<set $activeSlave.vaginalCount = 158>>
<<set $activeSlave.analCount = 76>>
@@ -86,11 +86,11 @@
<<set $activeSlave.face = 25>>
<<set $activeSlave.intelligence = random(-50,-16)>>
<<set $activeSlave.intelligenceImplant = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.oralCount = 57>>
<<set $activeSlave.vaginalCount = 65>>
<<set $activeSlave.analCount = 12>>
@@ -105,7 +105,7 @@
<</if>>
<<set $activeSlave.muscles = 40>>
<<set $activeSlave.health = 100>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "BlackHat">>
<<set $activeSlave.career = "a shut-in">>
<<if $pedo_mode == 1>>
@@ -181,8 +181,8 @@
<<set $activeSlave.face = 100>>
<<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.intelligenceImplant = 0>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.entertainSkill = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.entertainment = 100>>
<<case "arcology owner">>
<<set $activeSlave.career = "a leading arcology citizen">>
<<if $pedo_mode == 1>>
@@ -192,7 +192,7 @@
<</if>>
<<set $activeSlave.face = 100, $activeSlave.faceImplant = 15>>
<<set $activeSlave.intelligence = 100, $activeSlave.intelligenceImplant = 30>>
- <<set $activeSlave.whoreSkill = 100, $activeSlave.entertainSkill = 100>>
+ <<set $activeSlave.skill.whore = 100, $activeSlave.skill.entertainment = 100>>
<</switch>>
<<set $activeSlave.trust = 0>>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index eae19abce4002cd042b98e2632dd5621cd42144e..6587c59ba225e51d49466b5ba7dc1923ae8dbc25 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -23,11 +23,11 @@
<<set $activeSlave.preg = -1>>
<<set $activeSlave.muscles = random(20,50)>>
<<set $activeSlave.ovaries = 1>>
-<<set $activeSlave.vaginalSkill = 35>>
-<<set $activeSlave.oralSkill = 35>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 15>>
+<<set $activeSlave.skill.vaginal = 35>>
+<<set $activeSlave.skill.oral = 35>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
@@ -67,11 +67,11 @@
<<set $activeSlave.height = random(165,190)>>
<<set $activeSlave.muscles = random(20,50)>>
<<set $activeSlave.ovaries = 1>>
-<<set $activeSlave.vaginalSkill = 35>>
-<<set $activeSlave.oralSkill = 35>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 15>>
+<<set $activeSlave.skill.vaginal = 35>>
+<<set $activeSlave.skill.oral = 35>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index ec9571741f77fd1859577a4265ec36f140026b61..bfe3c0dd6b178aa5d554708113321e4000f08d71 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -40,11 +40,11 @@
<<set $activeSlave.areolae = 3>>
<<set $activeSlave.butt += 2>>
<<set $activeSlave.lips = 15>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.birthWeek = 0>>
<<set $activeSlave.voice = 2>>
<<set $activeSlave.weight = 60>>
@@ -103,11 +103,11 @@
<<if $activeSlave.lips < 10>>
<<set $activeSlave.lips += 5>>
<</if>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.birthWeek = 0>>
<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 1, limitMult: [0, 2]}))>>
<<set $activeSlave.weight = 0>>
diff --git a/src/uncategorized/peCombatTraining.tw b/src/uncategorized/peCombatTraining.tw
index 44822dcf88b4507f16eb6c8f491d50dc3e346d38..ddeeaceeeca140645ee9532ab985de5b27c35a91 100644
--- a/src/uncategorized/peCombatTraining.tw
+++ b/src/uncategorized/peCombatTraining.tw
@@ -28,7 +28,7 @@ The feed from the small armory next door shows $him doing the latter. $He has fi
<<replace "#result">>
$activeSlave.slaveName starts as you enter the range and don ear protection. $He is distracted by your body against $hers as you come in close to correct $his stance, but $he concentrates hard for you. You take whatever time you can spare over the week for serious lessons. $He @@.green;is diligent and learns well,@@ and @@.mediumaquamarine;places greater trust@@ in your judgment.
<<set $activeSlave.trust += 4>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<</replace>>
<</link>>
<br><<link "Promise $him a sexual reward if $he improves">>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index af9071e3678e3ce35c3f42b94781f7b75854c671..f629b91227796e73985635af383d82f793b609d9 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -66,10 +66,10 @@ You receive an official communication from a popular talk show e-hosted in one o
<<else>>
resplendent in $activeSlave.clothes.
<</if>>
- <<if $activeSlave.entertainSkill >= 60>>
+ <<if $activeSlave.skill.entertainment >= 60>>
$He's @@.green;graceful and sensual,@@ and entirely at home.
<<run repX(500, "concubine", $activeSlave)>>
- <<elseif $activeSlave.entertainSkill <= 30>>
+ <<elseif $activeSlave.skill.entertainment <= 30>>
$He's @@.red;clumsy and nervous,@@ but does $his best to rally.
<<run repX(-100, "concubine", $activeSlave)>>
<<else>>
@@ -242,7 +242,7 @@ You receive an official communication from a popular talk show e-hosted in one o
$He's rather blunt in $his responses, answering with a little too much detail; not that the audience minds.
<</if>>
The host, taken off guard, laughs in surprise and says he envies you that. He asks a follow up question that hints at $his sexual preferences without coming straight out and asking how $he likes it.
- <<if $activeSlave.intelligence + $activeSlave.intelligenceImplant + $activeSlave.entertainSkill >= 130 && $activeSlave.tankBaby == 0>>
+ <<if $activeSlave.intelligence + $activeSlave.intelligenceImplant + $activeSlave.skill.entertainment >= 130 && $activeSlave.tankBaby == 0>>
$He has enough knowledge of the old world to be able to answer without going too far, and @@.green;subtly alludes@@ to how much $he enjoys
<<if ($activeSlave.fetish == "submissive")>>
submitting to you in bed.
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index ea13ee2cd108930c09ab9752b78afa5fec9c5fea..3441cacdc5c00efadca6108c39f416cdd1d8a156 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -27,7 +27,7 @@ It's time for the fight. It will take place in a back room of a well respected c
Across the ring, $his opponent's owner nods civilly to you and examines $activeSlave.slaveName.
-<<if $activeSlave.combatSkill > 0>>
+<<if $activeSlave.skill.combat > 0>>
$His combat skills greatly increase $his deadliness.
<</if>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 605a154263cdc67c0cbd31f40a74b531911030f5..e6d1e57057d0110770944a39ab6bbed633abfa2a 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -5,7 +5,7 @@
<<set _paSeed = random(1,8)>>
<<switch $assistantAppearance>>
<<case "monstergirl">>
-_HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>monstergirl with <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("fair", "light", "pale")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark olive", "light olive", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark olive", "light olive", "tanned")>><<else>>pale<</if>><<elseif $assistantFSAppearance == "subjugationist">><<if $arcologies[0].FSSubjugationistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSubjugationistRace == "white">><<print either("fair", "light", "pale")>><<elseif $arcologies[0].FSSubjugationistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSubjugationistRace == "asian">><<print either("dark olive", "light olive", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark olive", "light olive", "tanned")>><<else>>pale<</if>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. _HisA eyes are large, expressive, and surprisingly innocent.
+_HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>monstergirl with <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("fair", "light", "pale")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark olive", "light olive", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark olive", "light olive", "tan")>><<else>>pale<</if>><<elseif $assistantFSAppearance == "subjugationist">><<if $arcologies[0].FSSubjugationistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSubjugationistRace == "white">><<print either("fair", "light", "pale")>><<elseif $arcologies[0].FSSubjugationistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSubjugationistRace == "asian">><<print either("dark olive", "light olive", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark olive", "light olive", "tan")>><<else>>pale<</if>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. _HisA eyes are large, expressive, and surprisingly innocent.
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
@@ -87,7 +87,7 @@ _HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0
<<case "shemale">>
-_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>bimbo shemale with bleached blonde hair, <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("fair", "pale")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark olive", "light olive")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark olive", "tanned")>><<else>>tanned<</if>><<elseif $assistantFSAppearance == "subjugationist">><<if $arcologies[0].FSSubjugationistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSubjugationistRace == "white">><<print either("fair", "pale")>><<elseif $arcologies[0].FSSubjugationistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSubjugationistRace == "asian">><<print either("dark olive", "light olive")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark olive", "tanned")>><<else>>tanned<</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. _HisA cock hangs past _hisA knees when limp.
+_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>bimbo shemale with bleached blonde hair, <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("fair", "pale")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark olive", "light olive")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark olive", "tan")>><<else>>tanned<</if>><<elseif $assistantFSAppearance == "subjugationist">><<if $arcologies[0].FSSubjugationistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSubjugationistRace == "white">><<print either("fair", "pale")>><<elseif $arcologies[0].FSSubjugationistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSubjugationistRace == "asian">><<print either("dark olive", "light olive")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark olive", "tan")>><<else>>tanned<</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. _HisA cock hangs past _hisA knees when limp.
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 7e903f39e8cec427eb311c9b22761243b1f37c1e..ad0e7f82d37e55d80dddce157be1f6e9fbd695cd 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -240,13 +240,13 @@
<</if>>
<br>
- <<if ($activeSlave.analSkill >= 100) && ($activeSlave.oralSkill >= 100) && ($activeSlave.vaginalSkill >= 100) && ($activeSlave.whoreSkill > 0) && ($activeSlave.entertainSkill > 0)>>
+ <<if ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.vaginal >= 100) && ($activeSlave.skill.whore > 0) && ($activeSlave.skill.entertainment > 0)>>
//$He knows all the skills you can teach//
- <<elseif ($activeSlave.analSkill >= 100) && ($activeSlave.oralSkill >= 100) && ($activeSlave.whoreSkill > 0) && ($activeSlave.entertainSkill > 0) && ($activeSlave.vagina == -1) && ($activeSlave.balls == 0)>>
+ <<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whore > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.vagina == -1) && ($activeSlave.balls == 0)>>
//$He knows all the skills you can teach a gelded slave//
- <<elseif ($activeSlave.analSkill >= 100) && ($activeSlave.oralSkill >= 100) && ($activeSlave.whoreSkill > 0) && ($activeSlave.entertainSkill > 0) && ($activeSlave.vagina == -1)>>
+ <<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whore > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.vagina == -1)>>
//$He knows all the skills you can teach a shemale slave//
- <<elseif ($activeSlave.analSkill >= 100) && ($activeSlave.oralSkill >= 100) && ($activeSlave.whoreSkill > 0) && ($activeSlave.entertainSkill > 0) && ($activeSlave.chastityVagina)>>
+ <<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whore > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.chastityVagina)>>
//$He knows all the skills you can teach while $he's wearing a chastity belt//
<<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
//$He's too disobedient to learn sex skills//
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index fcfdb1967d8640c2e784d6527550460042a6480d..30d18121cc3bbceb5826669ca42ec9b9972f3eb6 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -72,11 +72,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.nipplesPiercing = 1>>
<<set $activeSlave.nosePiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 100>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 100>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy")>>
@@ -111,11 +111,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.clitPiercing = 1>>
<<set $activeSlave.nipplesPiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.vaginalSkill = 35>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 35>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 35>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 35>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy")>>
@@ -146,12 +146,12 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.eyebrowPiercing = random(0,1)>>
<<set $activeSlave.nosePiercing = random(0,1)>>
<<set $activeSlave.navelPiercing = random(0,1)>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration")>>
@@ -177,11 +177,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant")>>
@@ -246,11 +246,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.navelPiercing = 2>>
<<set $activeSlave.eyebrowPiercing = 2>>
<<set $activeSlave.earPiercing = 2>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 100>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 100>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = "none">>
@@ -287,11 +287,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 100>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 100>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.addict = 20>>
@@ -320,11 +320,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -350,11 +350,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = "none">>
@@ -409,11 +409,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.armsTat = "rude words">>
<<set $activeSlave.legsTat = "rude words">>
<<set $activeSlave.stampTat = "rude words">>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.hStyle = "shaved">>
@@ -441,11 +441,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.weight = 20>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 1>>
- <<set $activeSlave.whoreSkill = 5>>
- <<set $activeSlave.entertainSkill = 70>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 1>>
+ <<set $activeSlave.skill.whore = 5>>
+ <<set $activeSlave.skill.entertainment = 70>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "odd")>>
@@ -477,11 +477,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.attrXX = random(30,50)>>
<<set $activeSlave.attrXY = random(30,50)>>
<<set $activeSlave.energy = random(5,20)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.customDesc = "She has had a very difficult time adjusting to her unusual biology.">>
@@ -510,11 +510,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.attrXX = random(80,100)>>
<<set $activeSlave.attrXY = random(80,100)>>
<<set $activeSlave.energy = random(60,90)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = "none">>
@@ -557,10 +557,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.nipplesPiercing = 1>>
<<set $activeSlave.nosePiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 100>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy")>>
@@ -586,10 +586,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.health = random(60,80)>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.clitPiercing = 1>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -619,11 +619,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.balls = random(3,5)>>
<<if $activeSlave.balls > 0>><<set $activeSlave.scrotum = $activeSlave.balls>><</if>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration")>>
@@ -651,10 +651,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.anus = 2>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = either("hates women")>>
@@ -721,10 +721,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.navelPiercing = 2>>
<<set $activeSlave.eyebrowPiercing = 2>>
<<set $activeSlave.earPiercing = 2>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 100>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 100>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = "none">>
@@ -760,10 +760,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.anus = 1>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 100>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 100>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.addict = 20>>
@@ -790,10 +790,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.health = random(60,80)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<set $activeSlave.customTat = "A small tattoo of the crest of an old world fraternity is visible on $his left shoulder blade.">>
<<set $activeSlave.customDesc = "Her face is still recognizable as that which once graced a million campaign posters.">>
@@ -821,11 +821,11 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.balls = 1>>
<<if $activeSlave.balls > 0>><<set $activeSlave.scrotum = $activeSlave.balls>><</if>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = "none">>
@@ -871,10 +871,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.armsTat = "rude words">>
<<set $activeSlave.legsTat = "rude words">>
<<set $activeSlave.stampTat = "rude words">>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.hStyle = "shaved">>
@@ -903,10 +903,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.anus = 2>>
<<set $activeSlave.weight = 20>>
<<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.oralSkill = 30>>
- <<set $activeSlave.analSkill = 1>>
- <<set $activeSlave.whoreSkill = 5>>
- <<set $activeSlave.entertainSkill = 70>>
+ <<set $activeSlave.skill.oral = 30>>
+ <<set $activeSlave.skill.anal = 1>>
+ <<set $activeSlave.skill.whore = 5>>
+ <<set $activeSlave.skill.entertainment = 70>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "odd")>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 3a13c80c7ade2978ecb3250a0838df8f5a09db78..d6c4dd9e9252f1ee51ceabc1b42891abd5b5e379 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -342,48 +342,48 @@
<<elseif $activeSlave.intelligence+$activeSlave.intelligenceImplant < -15>>
$His stupidity makes $him absorb $his lessons slowly.
<</if>>
- <<if $activeSlave.oralSkill <= 10>>
+ <<if $activeSlave.skill.oral <= 10>>
Since $he's orally unskilled, you start with $his mouth. $He <<if $PC.dick == 1>>sucks your dick<<else>>eats you out<</if>>, of course, but $his training is more creative than just that. You give $him delicious hard candies to suck and feed $him phallic fruits and vegetables that $he must deepthroat before $he can eat. As $his skill improves, $he wears a gag with an inward-facing dildo, which is swapped out for a bigger size every so often. You only let $him orgasm when $he's sucking, and before long $he's associating giving someone oral pleasure with experiencing pleasure $himself. @@.lime;$His oral skills have improved.@@
<<OralSkillIncrease $activeSlave>>
- <<elseif ($activeSlave.vaginalSkill <= 10) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
+ <<elseif ($activeSlave.skill.vaginal <= 10) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
Since $he's vaginally unskilled, and not a virgin, you start with $his pussy. @@.lime;$His vaginal skills have improved.@@
<<VaginalSkillIncrease $activeSlave>>
- <<elseif ($activeSlave.analSkill <= 10) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
+ <<elseif ($activeSlave.skill.anal <= 10) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
Since $he's anally unskilled, and not an anal virgin, you start with $his ass. @@.lime;$His anal skills have improved.@@
<<AnalSkillIncrease $activeSlave>>
- <<elseif $activeSlave.oralSkill <= 30>>
+ <<elseif $activeSlave.skill.oral <= 30>>
Since $he's sexually experienced, you work with $him on the finer points of oral sex. @@.lime;$His oral skills have improved.@@
<<OralSkillIncrease $activeSlave>>
- <<elseif ($activeSlave.vaginalSkill <= 30) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
+ <<elseif ($activeSlave.skill.vaginal <= 30) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
Since $he's sexually experienced, you work with $him on the finer points of penetrative sex. $He can already fuck pretty well, but $his muscular control could be improved. $He works $his Kegel muscles all week, using fingers, dildos, and your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> as training tools. $He becomes expert enough that $he is able to make you cum without any thrusting at all by you or any riding by $him; $he just flexes $his muscles enough to <<if $PC.dick == 0>>grind the fake phallus back against your cunt<<else>>stimulate you<</if>>. @@.lime;$His vaginal skills have improved.@@
<<VaginalSkillIncrease $activeSlave>>
- <<elseif ($activeSlave.analSkill <= 30) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
+ <<elseif ($activeSlave.skill.anal <= 30) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
Since $he's anally experienced, you work with $him on the finer points of penetrative sex. $He can already take it up $his ass, but $his muscular control could be improved. $He works $his Kegel muscles and anal sphincter all week, using fingers, dildos, and your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> as training tools. $He becomes expert enough that $he is able to make you cum without any thrusting at all by you or any riding by $him; $he just flexes $his muscles enough to <<if $PC.dick == 0>>squeeze the fake phallus<<else>>stimulate you<</if>>. @@.lime;$His anal skills have improved.@@
<<AnalSkillIncrease $activeSlave>>
- <<elseif $activeSlave.oralSkill < 100>>
+ <<elseif $activeSlave.skill.oral < 100>>
$He is already a skilled oral whore, but $his skills can be polished further. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also expand $his oral endurance, enabling $him to deepthroat for extended periods. @@.lime;$His oral skills have improved.@@
<<OralSkillIncrease $activeSlave>>
- <<elseif ($activeSlave.vaginalSkill < 100) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
+ <<elseif ($activeSlave.skill.vaginal < 100) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
$He is already a skilled pussy slut, but $his skills can be polished further. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also work with $him to develop a personal regimen of vaginal muscle exercises. This will enable $him to squeeze and massage dicks with $his practiced vaginal walls. @@.lime;$His vaginal skills have improved.@@
<<VaginalSkillIncrease $activeSlave>>
- <<elseif ($activeSlave.analSkill < 100) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
+ <<elseif ($activeSlave.skill.anal < 100) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
$He is already a skilled anal bitch, but $his skills can be polished further. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also expand $his knowledge of sexual positions. $He learns to balance $himself on tiptoe for the challenge of standing anal sex without support. @@.lime;$His sexual skills have improved.@@
<<AnalSkillIncrease $activeSlave>>
- <<elseif $activeSlave.whoreSkill <= 10>>
+ <<elseif $activeSlave.skill.whore <= 10>>
Since $he's dangerously naïve about selling sex, you teach $him the basics of self protection and business. @@.lime;$His prostitution skills have improved.@@
<<WhoreSkillIncrease $activeSlave>>
- <<elseif $activeSlave.entertainSkill <= 10>>
+ <<elseif $activeSlave.skill.entertainment <= 10>>
Since $he's rough and unskilled at entertainment, you teach $him the basics of polite conversation, music, and dance. @@.lime;$His entertainment skills have improved.@@
<<EntertainSkillIncrease $activeSlave>>
- <<elseif $activeSlave.whoreSkill <= 30>>
+ <<elseif $activeSlave.skill.whore <= 30>>
Since $he has only basic entertainment skills, you teach $him to steer clients to more lucrative sex acts. @@.lime;$His prostitution skills have improved.@@
<<WhoreSkillIncrease $activeSlave>>
- <<elseif $activeSlave.entertainSkill <= 30>>
+ <<elseif $activeSlave.skill.entertainment <= 30>>
Since $he has only basic entertainment skills, you teach $him more about poise and Free Cities etiquette. @@.lime;$His entertainment skills have improved.@@
<<EntertainSkillIncrease $activeSlave>>
<<else>>
$He's learned everything you can teach, and is now a masterful
- <<if ($activeSlave.vaginalSkill >= 100)>>
+ <<if ($activeSlave.skill.vaginal >= 100)>>
slut;
<<elseif ($activeSlave.vagina == 0)>>
virgin slut;
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 307ae1e49705b50c288fe34e1f1756e924c5d0c6..824d679150a9249245f7d34e1280724c499833d9 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -48,7 +48,7 @@
<<if $slaves[$i].anus != 0 && canDoAnal($slaves[$i])>>
<<if $slaves[$i].vagina != 0 && canDoVaginal($slaves[$i])>>
<<if $slaves[$i].belly < 2000>>
- <<if $slaves[$i].combatSkill == 0>>
+ <<if $slaves[$i].skill.combat == 0>>
<<if $slaves[$i].muscles <= 30>>
<<set $RESimpleAssaultIDs.push($slaves[$i].ID)>>
<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index abef6a35fefd2df7a59e609f6da76cdbf68988f1..77ed4b005f735388c1e2a9084322a9621234e612 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -440,7 +440,7 @@
/*<<set $events.push("PE pit fight invite")>>*/
- <<if ($Bodyguard.combatSkill != 0)>>
+ <<if ($Bodyguard.skill.combat != 0)>>
<<set $PESSevent.push("bodyguard bedtime")>>
<</if>>
@@ -459,7 +459,7 @@
<</if>>
<</if>>
- <<if ($Bodyguard.combatSkill == 0)>>
+ <<if ($Bodyguard.skill.combat == 0)>>
<<set $events.push("PE combat training")>>
<<set $events.push("PE combat training")>>
<<set $events.push("PE combat training")>>
@@ -480,11 +480,11 @@
<<set $PETSevent.push("stewardess beating")>>
<</if>>
- <<if ($Madam != 0) && ($brothelSlaves >= 5) && ($Madam.actualAge >= 35 || $AgePenalty == 0) && ($Madam.whoreSkill >= 100)>>
+ <<if ($Madam != 0) && ($brothelSlaves >= 5) && ($Madam.actualAge >= 35 || $AgePenalty == 0) && ($Madam.skill.whore >= 100)>>
<<set $PESSevent.push("madam strategy")>>
<</if>>
- <<if ($DJ != 0) && ($clubSlaves >= 5) && ($DJ.face > 95) && ($DJ.entertainSkill >= 100)>>
+ <<if ($DJ != 0) && ($clubSlaves >= 5) && ($DJ.face > 95) && ($DJ.skill.entertainment >= 100)>>
<<set $PESSevent.push("DJ publicity")>>
<</if>>
@@ -601,10 +601,10 @@
<<if ($cash > 20000)>>
<<set $recruit.push("school sale")>>
<</if>>
- <<if ($HeadGirl.devotion > 50) && ($HeadGirl.entertainSkill >= 100)>>
+ <<if ($HeadGirl.devotion > 50) && ($HeadGirl.skill.entertainment >= 100)>>
<<set $recruit.push("female recruit")>>
<</if>>
- <<if ($HeadGirl.devotion > 50) && ($HeadGirl.whoreSkill >= 100)>>
+ <<if ($HeadGirl.devotion > 50) && ($HeadGirl.skill.whore >= 100)>>
<<set $recruit.push("whore recruit")>>
<</if>>
<<if $PC.hacking >= 50 && random(0,100) < $PC.hacking>>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 305248fa3188492a6f3186cb6c1bc1979363de00..376b4f6e184c4d6b0c770edad9388d5ebf10df30 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -31,9 +31,9 @@
<<set $activeSlave.eyes = 1>>
<<set $activeSlave.hears = 0>>
<<set $activeSlave.anus = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.combatSkill = 1>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.sexualFlaw = "hates men">>
<<set $activeSlave.hStyle = "shaved into a mohawk">>
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index 7abf2d5fb73ae4a3c04ea77cbe8e7e19816d53bc..89a94842852e156ea8e09b030cfdfbd845b6b724 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -29,7 +29,7 @@
As you're making the rounds through your penthouse, you hear $HeadGirl.slaveName speaking in the tones _he2 uses to castigate misbehaving slaves in the next room. When you appear in the doorway, you have little chance to survey the situation before <<EventNameLink>>, apparently the miscreant, flings $himself at your feet. $He clings to one of your legs convulsively, choking on tears as $he stares up at you and tries to muster an explanation. After two false starts, $he manages to start begging. "Plea<<s>>e, <<Master>>," $he wails miserably. "Plea<<s>>e don't let _him2 rape my butt."
<br><br>
-You shoot an amused glance at $HeadGirl.slaveName, who smiles back as _he2 explains the slave's minor sin and _his2 intention to sodomize the malefactor. _He2 does not bother to keep an edge of anticipation out of _his2 voice, and $activeSlave.slaveName cries harder and clings to you with renewed force as your Head Girl pronounces _his2 intention with cruel clarity.<<if $activeSlave.boobs > 4000>> The supplicant's breasts are so huge that $his embrace of your leg has completely surrounded it in deliciously heaving breastflesh.<<elseif $activeSlave.boobs > 1000>> The weight of the supplicant's breasts is quite noticeable as $his embrace of your leg presses them against it.<</if>> You look down at $activeSlave.slaveName. $He stares back with huge wet <<= App.Desc.EyeColor>> eyes, doing $his best to implore you with $his gaze, and scooting $his rear in towards your foot in an unconscious effort to protect it from the promised assrape. $He's quite authentically terrified; $his whole body is shaking.
+You shoot an amused glance at $HeadGirl.slaveName, who smiles back as _he2 explains the slave's minor sin and _his2 intention to sodomize the malefactor. _He2 does not bother to keep an edge of anticipation out of _his2 voice, and $activeSlave.slaveName cries harder and clings to you with renewed force as your Head Girl pronounces _his2 intention with cruel clarity.<<if $activeSlave.boobs > 4000>> The supplicant's breasts are so huge that $his embrace of your leg has completely surrounded it in deliciously heaving breastflesh.<<elseif $activeSlave.boobs > 1000>> The weight of the supplicant's breasts is quite noticeable as $his embrace of your leg presses them against it.<</if>> You look down at $activeSlave.slaveName. $He stares back with huge wet <<= App.Desc.eyeColor>> eyes, doing $his best to implore you with $his gaze, and scooting $his rear in towards your foot in an unconscious effort to protect it from the promised assrape. $He's quite authentically terrified; $his whole body is shaking.
<br><br>
$HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.slaveName has now misbehaved twice by trying to go over your Head Girl's head by appealing to you. $HeadGirl.slaveName is ready to carry out the sentence: <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>_his2 cock is fully erect, and _he2's keeping it hard with one hand. _He2 slaps its head against _his2 other palm<<elseif $HeadGirl.dick > 0>>since _his2 dick isn't an appropriate instrument for inflicting anal pain, _he2's got an elephantine dildo ready. _He2 slaps it against _his2 palm<<else>>_He2's got an elephantine dildo ready, and _he2 slaps it against _his2 palm<</if>>, forcing a frightened moan from $activeSlave.slaveName.
@@ -54,7 +54,7 @@ $HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.sl
<br><br>
After enjoying the spectacle for a while, you judge that the slave's sphincter is loose enough and tell $HeadGirl.slaveName to flip the bitch over. @@.hotpink;_He2 obeys, chuckling,@@ sitting _himself2 down and hauling the reluctant slave onto _his2 lap by seizing a nipple and pulling it into position so the agonized slave is forced to follow. <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>$HeadGirl.slaveName reinserts _his2 dick, <<else>>$HeadGirl.slaveName maneuvers the dildo down over _his2 own crotch, approximating the position of a natural cock and using its base to stimulate _himself2. _He2 reinserts it,<</if>> intentionally missing twice to keep the experience unpleasant despite _his2 victim's well-fucked backdoor.
<br><br>
- $activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick == 1>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<= App.Desc.EyeColor>> eyes @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good giiAAIIEEHH," $he howls. $He gasps for air, tears streaming down $his $activeSlave.skin cheeks, and then continues: "AAAH! FUCK! TAKE IT OUUUT! N-NOOO, PLEA<<S>>E DON'T THRU<<S>>T — AAAH! AAAH! AAAH!"
+ $activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick == 1>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<= App.Desc.eyeColor>> eyes @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good giiAAIIEEHH," $he howls. $He gasps for air, tears streaming down $his $activeSlave.skin cheeks, and then continues: "AAAH! FUCK! TAKE IT OUUUT! N-NOOO, PLEA<<S>>E DON'T THRU<<S>>T — AAAH! AAAH! AAAH!"
<<set $activeSlave.trust -= 5, $activeSlave.analCount += 1>>
<<set $analTotal += 1>>
<<set $HeadGirl.devotion += 4, $HeadGirl.penetrativeCount += 1>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 2d6580a55010943f805037d8d3b2665505cf5688..701d5ab4bc1af474e9b2b0de263cda783748dfab 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -218,7 +218,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "crude", $activeSlave.behavioralQuirk = "devout">>
<<case "roman revivalist arcology">>
"It wa<<s>> horrible." You sold $him to a Roman Revivalist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "I had to kill a girl," $he adds in a small voice. "In the arena." Then, even more quietly: "I had to kill, um, girl<<s>>. I, I can't. Couldn't. Not again."
- <<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "crude", $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "crude", $activeSlave.skill.combat = 1>>
<<case "aztec revivalist arcology">>
"It wa<<s>> horrible." You sold $him to an Aztec Revivalist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "They told me by blood would feed the <<S>>un." $He shudders. "I, they, um, do that to hundred<<s>> of girl<<s>>. I had to help."
<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "apathetic">>
diff --git a/src/uncategorized/reBrothelFunction.tw b/src/uncategorized/reBrothelFunction.tw
index 10335b90d8a0ac6ba7a0205f64ea6401059ad960..76f5ba29e68f7c28b8d2369edfa10cd5c94376ea 100644
--- a/src/uncategorized/reBrothelFunction.tw
+++ b/src/uncategorized/reBrothelFunction.tw
@@ -31,8 +31,8 @@ The last of these requests comes in the form of a letter, stamped with the heral
Though a citizen he may be, this serial seducer may have more notches on his proverbial bedpost than even your oldest slaves. Though you are not present to view his mastery of the sexual craft first-hand, the dreamy fucked-out looks of exhaustion and gratified satisfaction painting every single one of your girls' faces at the end of the day speak volumes. Indeed, all of your brothel slaves with any room for improvement in their whoring skills @@.green;learn from his skillful coupling,@@ while even those with nothing to learn from him @@.hotpink;gain confidence@@ from the intensity of their sexual congress.
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].assignment == "work in the brothel">>
- <<if $slaves[$i].whoreSkill < 100>>
- <<set $slaves[$i].whoreSkill += 10>>
+ <<if $slaves[$i].skill.whore < 100>>
+ <<set $slaves[$i].skill.whore += 10>>
<<else>>
<<set $slaves[$i].devotion += 4>>
<</if>>
diff --git a/src/uncategorized/reBusyBrothel.tw b/src/uncategorized/reBusyBrothel.tw
index 8a9388c2dc97b484c5b03b2018464a5d12226bbd..b372378e386f1acfcbe0ae0b1c07e104d7cd7f0c 100644
--- a/src/uncategorized/reBusyBrothel.tw
+++ b/src/uncategorized/reBusyBrothel.tw
@@ -29,8 +29,8 @@ Of course, $brothelName is the best establishment of its kind in the arcology. C
<<for $i = 0; $i < $BrothiIDs.length; $i++>>
<<set $slaves[$slaveIndices[$BrothiIDs[$i]]].lastWeeksCashIncome += 250>>
<<set $slaves[$slaveIndices[$BrothiIDs[$i]]].lifetimeCashIncome += 250>>
- <<if $slaves[$slaveIndices[$BrothiIDs[$i]]].whoreSkill < 100>>
- <<set $slaves[$i].whoreSkill += 10>>
+ <<if $slaves[$slaveIndices[$BrothiIDs[$i]]].skill.whore < 100>>
+ <<set $slaves[$i].skill.whore += 10>>
<<else>>
<<set $slaves[$slaveIndices[$BrothiIDs[$i]]].devotion += 4>>
<</if>>
diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw
index 9d1d60b400528085a7dc5fc481bc5c20d52541f9..8f263e682c4051476ffe75f3f457737b224c4e49 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -199,7 +199,7 @@ who has paused $his thrusting to issue a peremptory order to the slaves to stay
<br><<link "Slide in up at the head of the bed for some oral">>
<<replace "#result">>
<<setLocalPronouns _msIdx[0] 2>>
- _msIdx[0].slaveName's <<= App.Desc.EyeColor _msIdx[0]>> eyes widen when you push _him2 upright for a moment and slide in under _him2, but _he2 wraps _his2
+ _msIdx[0].slaveName's <<= App.Desc.eyeColor _msIdx[0]>> eyes widen when you push _him2 upright for a moment and slide in under _him2, but _he2 wraps _his2
<<if (_msIdx[0].lips > 95)>>
facepussy
<<elseif (_msIdx[0].lips > 70)>>
@@ -209,7 +209,7 @@ who has paused $his thrusting to issue a peremptory order to the slaves to stay
<<else>>
lips
<</if>>
- around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina == 1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as _msIdx[1].slaveName goes back to sodomizing _him2. The anal train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _msIdx[0].slaveName is still getting enough of a buttfuck that _he2 whimpers quietly into your <<if ($PC.vagina == 1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_msIdx[0].oralSkill >= 100)>>masterful, despite the distraction<<elseif (_msIdx[0].oralSkill > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _msIdx[0].slaveName start groping your concubine $Concubine.slaveName's
+ around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina == 1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as _msIdx[1].slaveName goes back to sodomizing _him2. The anal train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _msIdx[0].slaveName is still getting enough of a buttfuck that _he2 whimpers quietly into your <<if ($PC.vagina == 1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_msIdx[0].skill.oral >= 100)>>masterful, despite the distraction<<elseif (_msIdx[0].skill.oral > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _msIdx[0].slaveName start groping your concubine $Concubine.slaveName's
<<if $activeSlave.butt > 15>>
immeasurable
<<elseif $activeSlave.butt > 10>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index d1e13d434410578e5c23a2f97dfbe0d9410fad67..99815306aa0da2b22230011736b0de1d8b99624e 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -271,11 +271,11 @@
<<set $activeSlave.nipplesPiercing = 1>>
<<set $activeSlave.nosePiercing = 1>>
<<set $activeSlave.earPiercing = 1>>
-<<set $activeSlave.vaginalSkill = random(50,100)>>
-<<set $activeSlave.oralSkill = random(50,100)>>
-<<set $activeSlave.analSkill = random(50,100)>>
-<<set $activeSlave.whoreSkill = random(50,100)>>
-<<set $activeSlave.entertainSkill = random(50,100)>>
+<<set $activeSlave.skill.vaginal = random(50,100)>>
+<<set $activeSlave.skill.oral = random(50,100)>>
+<<set $activeSlave.skill.anal = random(50,100)>>
+<<set $activeSlave.skill.whore = random(50,100)>>
+<<set $activeSlave.skill.entertainment = random(50,100)>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy")>>
@@ -416,9 +416,9 @@
<<set $activeSlave.boobs += 50*random(1,10)>>
<<set $activeSlave.butt += random(0,2)>>
<<set $activeSlave.lips += random(5,15)>>
-<<set $activeSlave.entertainSkill = 35>>
-<<set $activeSlave.analSkill = 35>>
-<<set $activeSlave.oralSkill = 35>>
+<<set $activeSlave.skill.entertainment = 35>>
+<<set $activeSlave.skill.anal = 35>>
+<<set $activeSlave.skill.oral = 35>>
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.sexualFlaw = "none">>
<<set $activeSlave.energy = random(80,90)>>
@@ -869,11 +869,11 @@
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
<<if $activeSlave.vagina != -1>><<set $activeSlave.vagina = 0>><</if>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.intelligence = random(16,95)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
@@ -895,11 +895,11 @@
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
<<if $activeSlave.vagina != -1>><<set $activeSlave.vagina = 0>><</if>>
-<<set $activeSlave.vaginalSkill = 1>>
-<<set $activeSlave.analSkill = 1>>
-<<set $activeSlave.oralSkill = 1>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
+<<set $activeSlave.skill.vaginal = 1>>
+<<set $activeSlave.skill.anal = 1>>
+<<set $activeSlave.skill.oral = 1>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.intelligence = random(16,95)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
@@ -930,9 +930,9 @@
<<set $activeSlave.weight = random(20,100)>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.trueVirgin = 1>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
@@ -957,10 +957,10 @@
<<set $activeSlave.career = "a professor">>
<<set $activeSlave.health = random(10,30)>>
<<set $activeSlave.face = random(15,100)>>
-<<set $activeSlave.oralSkill = 35>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 100>>
+<<set $activeSlave.skill.oral = 35>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 100>>
<<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
@@ -982,10 +982,10 @@
<<set $activeSlave.career = "a businesswoman">>
<<set $activeSlave.health = random(10,30)>>
<<set $activeSlave.face = 15>>
-<<set $activeSlave.oralSkill = random(15,40)>>
-<<set $activeSlave.analSkill = random(15,40)>>
-<<set $activeSlave.whoreSkill = random(15,40)>>
-<<set $activeSlave.entertainSkill = random(15,40)>>
+<<set $activeSlave.skill.oral = random(15,40)>>
+<<set $activeSlave.skill.anal = random(15,40)>>
+<<set $activeSlave.skill.whore = random(15,40)>>
+<<set $activeSlave.skill.entertainment = random(15,40)>>
<<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw
index 03d188ecea407d51ecdbf2dfa984ee0abda09e80..d87e3dcb8907dce3ef888b7fd6eb9b60ede7a4e4 100644
--- a/src/uncategorized/reHGReplacement.tw
+++ b/src/uncategorized/reHGReplacement.tw
@@ -25,7 +25,7 @@
<<set $activeSlave.clothes = _clothesTemp>>
<<set $HeadGirl.clothes = _clothesTemp2>>
-There's a constant traffic of slaves in and out of your office as your chattel comes in and out for instructions, inspections, and sex. Your Head Girl $HeadGirl.slaveName is one of the most frequent visitors, since although you trust _him2, _he2's still a slave and has to check with you before acting on some matters.<<if $HeadGirl.relationship == -3>> (_He2's also your wife, making _his2 visits a pleasant diversion.)<<elseif $arcologies[0].FSEgyptianRevivalistLaw == 1>> (_He2's also your Consort, making _his2 visits a pleasant diversion.)<</if>> During one of _his2 visits, <<EventNameLink>> happens to come in for $his scheduled inspection. $He perches politely on the couch, waiting $his turn like a good $girl. $His <<= App.Desc.EyeColor>> eyes are watchful, however, and $he seems to be paying very close attention to your conversation with your Head Girl.
+There's a constant traffic of slaves in and out of your office as your chattel comes in and out for instructions, inspections, and sex. Your Head Girl $HeadGirl.slaveName is one of the most frequent visitors, since although you trust _him2, _he2's still a slave and has to check with you before acting on some matters.<<if $HeadGirl.relationship == -3>> (_He2's also your wife, making _his2 visits a pleasant diversion.)<<elseif $arcologies[0].FSEgyptianRevivalistLaw == 1>> (_He2's also your Consort, making _his2 visits a pleasant diversion.)<</if>> During one of _his2 visits, <<EventNameLink>> happens to come in for $his scheduled inspection. $He perches politely on the couch, waiting $his turn like a good $girl. $His <<= App.Desc.eyeColor>> eyes are watchful, however, and $he seems to be paying very close attention to your conversation with your Head Girl.
When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $his courage, and <<say>>s, "<<Master>>, I think I would make a better Head Girl than $him." $He takes a deep breath and plunges on. "I'm ju<<s>>t a<<s>> <<s>>mart a<<s>> <<he 2>> i<<s>>. And, <<Master>>, I'm <<s>>ure you've noti<<c>>ed <<he 2>> i<<s>>n't very good at teaching other girl<<s>> vaginal <<s>>kill<<s>>.
<<if $HeadGirl.vagina > 0>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index edef5a7cde3c6d8093c4d1423e9bf63a36bdfa66..a4cad3cef57ab182c932f5346c4eb8989bd2ac5d 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -18,15 +18,15 @@
<<if $activeSlave.dick == 0>>
<<set $activeSlave.balls = 0>>
<<set $activeSlave.vagina = 2>>
- <<set $activeSlave.vaginalSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
<<else>>
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.clit = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<</if>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.analSkill = 35>>
-<<set $activeSlave.whoreSkill = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.anal = 35>>
+<<set $activeSlave.skill.whore = 15>>
<<set $activeSlave.earPiercing = 1>>
<<set $activeSlave.nosePiercing = 1>>
<<set $activeSlave.nipplesPiercing = 1>>
@@ -49,17 +49,17 @@
<<if $activeSlave.dick == 0>>
<<set $activeSlave.balls = 0>>
<<set $activeSlave.vagina = 2>>
- <<set $activeSlave.vaginalSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
<<else>>
<<set $activeSlave.dick = random(4,5)>>
<<set $activeSlave.balls = random(0,2)>>
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.clit = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<</if>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.sexualFlaw = "hates penetration">>
<<set $activeSlave.behavioralFlaw = "odd">>
@@ -88,9 +88,9 @@
<<set $activeSlave.preg = 0>>
<<set $activeSlave.birthsTotal = 2>>
<<set $activeSlave.births = 2>>
-<<set $activeSlave.vaginalSkill = 30>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
+<<set $activeSlave.skill.vaginal = 30>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.anal = 15>>
<<set $activeSlave.sexualFlaw = "crude">>
<<set $activeSlave.behavioralFlaw = "bitchy">>
@@ -114,17 +114,17 @@
<<if $activeSlave.dick == 0>>
<<set $activeSlave.balls = 0>>
<<set $activeSlave.vagina = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<<else>>
<<set $activeSlave.dick = random(1,2)>>
<<set $activeSlave.balls = random(1,2)>>
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.clit = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<</if>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.sexualFlaw = "apathetic">>
<<set $activeSlave.behavioralFlaw = "gluttonous">>
@@ -147,7 +147,7 @@
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.preg = -1>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.boobs += 400>>
<<set $activeSlave.boobsImplant = 400>>
@@ -179,11 +179,11 @@
<<if $activeSlave.dick == 0>>
<<set $activeSlave.balls = 0>>
<<set $activeSlave.vagina = 2>>
- <<set $activeSlave.vaginalSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 35>>
<</if>>
-<<set $activeSlave.oralSkill = 35>>
-<<set $activeSlave.analSkill = 35>>
-<<set $activeSlave.whoreSkill = 35>>
+<<set $activeSlave.skill.oral = 35>>
+<<set $activeSlave.skill.anal = 35>>
+<<set $activeSlave.skill.whore = 35>>
<<set $activeSlave.boobs += 400>>
<<set $activeSlave.boobsImplant = 400>>
<<set $activeSlave.butt += 1>>
@@ -219,8 +219,8 @@
<<set $activeSlave.health = random(0,20)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.balls = random(2,4)>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.sexualFlaw = "hates men">>
@@ -249,7 +249,7 @@
<<set $activeSlave.cervixImplant = 1>>
<<set $activeSlave.pubicHStyle = "shaved">>
<<set $activeSlave.bellySag = 2>>
-<<set $activeSlave.vaginalSkill = 50>>
+<<set $activeSlave.skill.vaginal = 50>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.hips = 0>>
<<set $activeSlave.weight = -60>>
@@ -275,11 +275,11 @@
<<set $activeSlave.muscles = 50>>
<<set $activeSlave.weight = random(-20,30)>>
<<set $activeSlave.waist = random(-10,10)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.combatSkill = 1>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.health = random(60,80)>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
@@ -618,4 +618,4 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
<</switch>>
<</replace>>
<</link>>
-</span>
\ No newline at end of file
+</span>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 3ac75be8482850706c01c7a89498b6b63de60432..b5499f698a8d345b2da959422d7b13904d90953c 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -99,7 +99,7 @@
<<if (($activeSlave.boobs*$activeSlave.lactation) > 1000)>>
<<set $qualifiedNicknames.push("cow")>>
<</if>>
-<<if ($activeSlave.oralSkill <= 30) && ($activeSlave.analSkill <= 30)>>
+<<if ($activeSlave.skill.oral <= 30) && ($activeSlave.skill.anal <= 30)>>
<<set $qualifiedNicknames.push("novice")>>
<</if>>
<<if ($activeSlave.ID == $HeadGirl.ID)>>
@@ -249,10 +249,10 @@
<<if ($activeSlave.height < 150)>>
<<set $qualifiedNicknames.push("short")>>
<</if>>
-<<if ($activeSlave.vagina == 1) && ($activeSlave.vaginalSkill <= 10)>>
+<<if ($activeSlave.vagina == 1) && ($activeSlave.skill.vaginal <= 10)>>
<<set $qualifiedNicknames.push("vaginalWhiner")>>
<</if>>
-<<if ($activeSlave.anus == 1) && ($activeSlave.analSkill <= 10)>>
+<<if ($activeSlave.anus == 1) && ($activeSlave.skill.anal <= 10)>>
<<set $qualifiedNicknames.push("analWhiner")>>
<</if>>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 822fd0c1796529041308992a358a3422c43a7f38..400669c6ac4cefb5c560e236b9d1fc12e285d239 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -87,9 +87,9 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<set $activeSlave.waist = random(-10,50)>>
<</if>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.accent = random(0,1)>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.hLength = 1>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 5e674f146997c64a9fa4715d26664c9b2d12b2b6..1439027ab38b93aeddbd6e8798a544d2f39f3f55 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -43,9 +43,9 @@
<<set $activeSlave.health = random(0,20)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 1>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.earPiercing = 1>>
<<set $activeSlave.nosePiercing = 1>>
<<set $activeSlave.eyebrowPiercing = 1>>
@@ -77,8 +77,8 @@
<<set $activeSlave.trust = random(25,45)>>
<<set $activeSlave.health = random(0,20)>>
<<set $activeSlave.anus = 0>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.earPiercing = 1>>
<<set $activeSlave.nosePiercing = 1>>
<<set $activeSlave.eyebrowPiercing = 1>>
@@ -108,10 +108,10 @@
<<set $activeSlave.health = random(-40,-20)>>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.vagina = 2>>
-<<set $activeSlave.vaginalSkill = 35>>
-<<set $activeSlave.oralSkill = 35>>
-<<set $activeSlave.analSkill = 35>>
-<<set $activeSlave.whoreSkill = 35>>
+<<set $activeSlave.skill.vaginal = 35>>
+<<set $activeSlave.skill.oral = 35>>
+<<set $activeSlave.skill.anal = 35>>
+<<set $activeSlave.skill.whore = 35>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.boobsImplant = 600>>
<<set $activeSlave.butt += 1>>
@@ -160,9 +160,9 @@
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-15,0)>>
<<set $activeSlave.anus = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.hStyle = either("short", "very short")>>
<<case "desperate preg">>
@@ -194,7 +194,7 @@
<<set $activeSlave.butt += 1>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.anus = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.preg = random(30,39)>>
<<set $activeSlave.pregType = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
@@ -228,7 +228,7 @@
<<set $activeSlave.butt += 1>>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.anus = 1>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.preg = 20>>
<<set $activeSlave.pregType = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
@@ -259,9 +259,9 @@
<<set $activeSlave.health = random(0,100)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 1>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.earPiercing = 0>>
<<set $activeSlave.nosePiercing = 0>>
<<set $activeSlave.eyebrowPiercing = 0>>
@@ -317,13 +317,13 @@
<<set $activeSlave.hStyle = either("short", "very short")>>
<<set $activeSlave.weight = random(-40,5)>>
<<set $activeSlave.vagina = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.dick = 0>>
<<set $activeSlave.foreskin = 0>>
<<set $activeSlave.balls = 0>>
<<set $activeSlave.face = 0>>
<<set $activeSlave.preg = -2>>
-<<set $activeSlave.vaginalSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
<<case "school sale">>
@@ -348,9 +348,9 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.trueVirgin = 1>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.hStyle = "long and in twin schoolgirl tails">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
@@ -380,8 +380,8 @@
<<set $activeSlave.balls = 1>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.clit = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.hStyle = "long and in twin schoolgirl tails">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
@@ -406,11 +406,11 @@
<<set $activeSlave.trust = random(-15,-10)>>
<<set $activeSlave.health = random(0,20)>>
<<set $activeSlave.anus = 1>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
<<if $activeSlave.vagina > 0>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.vaginalSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
<</if>>
<<set $activeSlave.birthWeek = random(0,2)>>
<<set $activeSlave.earPiercing = random(0,1)>>
@@ -433,10 +433,10 @@
<<set $activeSlave.health = random(0,20)>>
<<set $activeSlave.face = random(0,20)>>
<<set $activeSlave.anus = 1>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 15>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 15>>
<<set $activeSlave.vagina = 1>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.earPiercing = random(0,1)>>
<<set $activeSlave.navelPiercing = random(0,1)>>
<<set $activeSlave.nosePiercing = random(0,1)>>
@@ -466,8 +466,8 @@
<<set $activeSlave.balls = random(1,2)>>
<<set $activeSlave.scrotum = $activeSlave.balls>>
<<set $activeSlave.anus = 1>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
<<set $activeSlave.boobs += 400>>
<<set $activeSlave.boobsImplant = 400>>
<<set $activeSlave.butt += 1>>
@@ -504,10 +504,10 @@
<<set $activeSlave.trust = random(-20,-5)>>
<<set $activeSlave.health = random(20,40)>>
<<set $activeSlave.face = random(20,60)>>
-<<set $activeSlave.vaginalSkill = random(0,15)>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = random(0,15)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = random(0,15)>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = random(0,15)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(2,6)*100>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.labia = 0>>
@@ -541,10 +541,10 @@
<<set $activeSlave.health = random(20,40)>>
<<set $activeSlave.face = random(20,60)>>
<<set $activeSlave.faceImplant = 15>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = random(0,40)>>
-<<set $activeSlave.oralSkill = random(0,40)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = random(0,40)>>
+<<set $activeSlave.skill.oral = random(0,40)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = 150>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.labia = 0>>
@@ -580,10 +580,10 @@
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.face = random(80,100)>>
<<set $activeSlave.faceShape = "sensual">>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = random(0,30)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = random(0,30)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(2,4)*100>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.labia = 0>>
@@ -634,13 +634,13 @@
<<set $activeSlave.health = random(10,30)>>
<<set $activeSlave.face = random(20,60)>>
<<set $activeSlave.faceImplant = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = random(15,40)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = random(15,40)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(2,6)*100>>
<<set $activeSlave.vagina = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.labia = random(0,1)>>
<<set $activeSlave.clit = 0>>
<<set $activeSlave.ovaries = 1>>
@@ -674,14 +674,14 @@
<<set $activeSlave.health = random(10,30)>>
<<set $activeSlave.face = random(20,60)>>
<<set $activeSlave.faceImplant = 15>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = random(15,40)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = random(15,40)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobsImplant = random(3,6)*100>>
<<set $activeSlave.boobs = $activeSlave.boobsImplant+150>>
<<set $activeSlave.vagina = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.anus = 0>>
@@ -715,10 +715,10 @@
<<set $activeSlave.health = random(10,30)>>
<<set $activeSlave.face = random(20,60)>>
<<set $activeSlave.faceImplant = 15>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 35>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 35>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = 150>>
<<set $activeSlave.boobsImplant = random(2,6)*100>>
<<set $activeSlave.vagina = -1>>
@@ -751,10 +751,10 @@
<<set $activeSlave.health = random(0,20)>>
<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
<<set $activeSlave.faceImplant = 15>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.combatSkill = 1>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.hStyle = either("short", "very short")>>
<<set $activeSlave.boobs = 150>>
<<set $activeSlave.vagina = -1>>
@@ -783,10 +783,10 @@
<<set $activeSlave.trust = -20>>
<<set $activeSlave.health = random(-50,-30)>>
<<set $activeSlave.face = random(0,20)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(2,6)*100>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.labia = 1>>
@@ -823,10 +823,10 @@
<<set $activeSlave.trust = -20>>
<<set $activeSlave.health = random(-50,-30)>>
<<set $activeSlave.face = random(0,20)>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(3,7)*100>>
<<set $activeSlave.vagina = 3>>
<<set $activeSlave.labia = 1>>
@@ -869,10 +869,10 @@
<<set $activeSlave.trust = -20>>
<<set $activeSlave.health = random(-50,-30)>>
<<set $activeSlave.face = random(0,20)>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(3,7)*100>>
<<set $activeSlave.vagina = 3>>
<<set $activeSlave.labia = 1>>
@@ -915,11 +915,11 @@
<<set $activeSlave.trust = random(25,50)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(25,100)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 35>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 35>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 35>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.boobs = random(2,7)*100>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.trueVirgin = 1>>
@@ -961,11 +961,11 @@
<<set $activeSlave.trust = random(25,50)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(20,60)>>
-<<set $activeSlave.vaginalSkill = random(50,100)>>
-<<set $activeSlave.analSkill = random(50,100)>>
-<<set $activeSlave.oralSkill = random(50,100)>>
-<<set $activeSlave.whoreSkill = random(50,100)>>
-<<set $activeSlave.entertainSkill = 35>>
+<<set $activeSlave.skill.vaginal = random(50,100)>>
+<<set $activeSlave.skill.anal = random(50,100)>>
+<<set $activeSlave.skill.oral = random(50,100)>>
+<<set $activeSlave.skill.whore = random(50,100)>>
+<<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.boobs = random(2,7)*100>>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.vaginaLube = 2>>
@@ -1009,10 +1009,10 @@
<<set $activeSlave.health = random(30,50)>>
<<set $activeSlave.shoulders = random(1,2)>>
<<set $activeSlave.face = random(20,60)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = random(0,15)>>
-<<set $activeSlave.oralSkill = random(0,15)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = random(0,15)>>
+<<set $activeSlave.skill.oral = random(0,15)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(1,4)*100>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.ovaries = 0>>
@@ -1053,10 +1053,10 @@
<<set $activeSlave.trust = random(15,25)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(20,60)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = random(0,15)>>
-<<set $activeSlave.oralSkill = random(0,15)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = random(0,15)>>
+<<set $activeSlave.skill.oral = random(0,15)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(1,4)*100>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.labia = 1>>
@@ -1079,7 +1079,7 @@
<<set $activeSlave.muscles = 20>>
<<set $activeSlave.shoulders = 0>>
<<set $activeSlave.intelligence = random(-50,50)>>
-<<set $activeSlave.entertainSkill = 15>>
+<<set $activeSlave.skill.entertainment = 15>>
<<set $activeSlave.career = "an athlete">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.behavioralFlaw = "anorexic">>
@@ -1101,10 +1101,10 @@
<<set $activeSlave.trust = random(10,20)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(20,60)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = random(0,15)>>
-<<set $activeSlave.oralSkill = random(0,15)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = random(0,15)>>
+<<set $activeSlave.skill.oral = random(0,15)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = either(100, 200, 300)>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.trueVirgin = 1>>
@@ -1119,7 +1119,7 @@
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 50>>
<<set $activeSlave.intelligence = random(-15,50)>>
-<<set $activeSlave.entertainSkill = 35>>
+<<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.career = "an athlete">>
<<set $activeSlave.fetish = "pregnancy">>
<<set $activeSlave.behavioralFlaw = "arrogant">>
@@ -1138,11 +1138,11 @@
<<set $activeSlave.trust = random(25,50)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(0,60)>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.entertainSkill = 15>>
-<<set $activeSlave.whoreSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.entertainment = 15>>
+<<set $activeSlave.skill.whore = 15>>
<<set $activeSlave.boobs = random(3,8)*100>>
<<set $activeSlave.vagina = random(1,2)>>
<<set $activeSlave.vaginaLube = 1>>
@@ -1174,11 +1174,11 @@
<<set $activeSlave.trust = random(-50,-25)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(0,60)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.entertainSkill = random(15,40)>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.entertainment = random(15,40)>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(3,8)*100>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.vaginaLube = 1>>
@@ -1215,11 +1215,11 @@
<<set $activeSlave.trust = random(25,50)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(-30,30)>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(8,20)*100>>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.vaginaLube = 1>>
@@ -1264,11 +1264,11 @@
<<set $activeSlave.trust = random(25,50)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(-30,30)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 35>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 35>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = 0>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.vaginaLube = 1>>
@@ -1302,11 +1302,11 @@
<<set $activeSlave.trust = random(25,50)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(-30,30)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(6,12)*100>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.trueVirgin = 1>>
@@ -1340,11 +1340,11 @@
<<set $activeSlave.trust = random(-25,0)>>
<<set $activeSlave.health = random(10,40)>>
<<set $activeSlave.face = random(-30,30)>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 15>>
<<set $activeSlave.boobs = random(4,8)*100>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.vaginaLube = 1>>
@@ -1379,11 +1379,11 @@
<<if $activeSlave.faceShape == "masculine">>
<<set $activeSlave.faceShape = "cute">>
<</if>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 35>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 15>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 35>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 15>>
<<set $activeSlave.boobs = 0>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.vaginaLube = 1>>
@@ -1420,11 +1420,11 @@
<<set $activeSlave.trust = 0>>
<<set $activeSlave.health = 20>>
<<set $activeSlave.face = random(20,60)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(3,10)*100>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.vaginaLube = random(1,2)>>
@@ -1484,11 +1484,11 @@
<<set $activeSlave.trust = 0>>
<<set $activeSlave.health = 80>>
<<set $activeSlave.face = random(15,70)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.boobs = random(3,10)*100>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.vaginaLube = random(1,2)>>
@@ -1536,7 +1536,7 @@
<<set $activeSlave.career = "an artist">>
<<set $activeSlave.health = random(-60,-50)>>
<<set $activeSlave.intelligence = random(16,50)>>
-<<set $activeSlave.entertainSkill = 40>>
+<<set $activeSlave.skill.entertainment = 40>>
<<set $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $activeSlave.fetish = "humiliation">>
@@ -1553,11 +1553,11 @@
<<set $activeSlave.trust = random(25,50)>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.face = random(0,60)>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.analSkill = 25>>
-<<set $activeSlave.oralSkill = 25>>
-<<set $activeSlave.entertainSkill = 25>>
-<<set $activeSlave.whoreSkill = 25>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.anal = 25>>
+<<set $activeSlave.skill.oral = 25>>
+<<set $activeSlave.skill.entertainment = 25>>
+<<set $activeSlave.skill.whore = 25>>
<<set $activeSlave.boobs = random(3,8)*100>>
<<set $activeSlave.vagina = random(1,2)>>
<<set $activeSlave.vaginaLube = 1>>
@@ -1617,8 +1617,8 @@
<</if>>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.anus = 1>>
-<<set $activeSlave.oralSkill = 30>>
-<<set $activeSlave.vaginalSkill = 20>>
+<<set $activeSlave.skill.oral = 30>>
+<<set $activeSlave.skill.vaginal = 20>>
<<set $activeSlave.accent = 3>>
<<set $activeSlave.preg = 0>>
<<if canGetPregnant($activeSlave)>>
@@ -1722,7 +1722,7 @@
<<set $activeSlave.muscles = random(-80, 0)>>
<<set $activeSlave.weight = random(-80, -60)>>
<<set $activeSlave.waist = random(-40, -20)>>
-<<set $activeSlave.combatSkill = 1>>
+<<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.boobs = random(3,6)*100>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $activeSlave.behavioralQuirk = "insecure">>
@@ -1791,7 +1791,7 @@
<<set $activeSlave.health = 100>>
<<set $activeSlave.weight = random(-11 -30)>>
<<set $activeSlave.waist = random(-11, -40)>>
-<<set $activeSlave.combatSkill = 1>>
+<<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.amp = -5>>
<<set $activeSlave.teeth = "pointy">>
<<set $activeSlave.muscles = random(30,70)>>
@@ -1833,11 +1833,11 @@
<<set $activeSlave.trust = random(25,50)>>
<<set $activeSlave.health = random(60,100)>>
<<set $activeSlave.face = random(20,90)>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.entertainSkill = 20>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.entertainment = 20>>
<<set $activeSlave.boobs = random(4,7)*100>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.trueVirgin = 1>>
@@ -1920,8 +1920,8 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.muscles = random(10,40)>>
<<set $activeSlave.anus = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.hStyle = "luxurious">>
<<set $activeSlave.hLength = 2>>
@@ -1946,11 +1946,11 @@
<<set $activeSlave.devotion = random(-100,-90)>>
<<set $activeSlave.trust = random(25,85)>>
<<set $activeSlave.health = random(0,20)>>
-<<set $activeSlave.vaginalSkill = 30>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 50>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 50>>
+<<set $activeSlave.skill.vaginal = 30>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 50>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 50>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.vaginaLube = random(1,2)>>
<<set $activeSlave.pubicHStyle = "waxed">>
@@ -1977,11 +1977,11 @@
<<set $activeSlave.devotion = random(-20,20)>>
<<set $activeSlave.trust = random(-90,-80)>>
<<set $activeSlave.health = random(0,20)>>
-<<set $activeSlave.vaginalSkill = 30>>
-<<set $activeSlave.analSkill = 15>>
-<<set $activeSlave.oralSkill = 50>>
-<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.skill.vaginal = 30>>
+<<set $activeSlave.skill.anal = 15>>
+<<set $activeSlave.skill.oral = 50>>
+<<set $activeSlave.skill.entertainment = 0>>
+<<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.pubicHStyle = "waxed">>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 45fb2275f97ace4fc1cae5aa20d26df3ca10910c..286810197b1ab091ea87d2a7ed2c9dcbe03b2412 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -164,11 +164,11 @@
<</if>>
<<set $activeSlave.weight = random(30,135)>>
<<set $activeSlave.muscles = random(0,15)>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.vaginalSkill = 30>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.whoreSkill = 10>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.vaginal = 30>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.entertainment = 10>>
+ <<set $activeSlave.skill.whore = 10>>
<<set $activeSlave.boobs = (random(12,20)*100)>>
<<set $activeSlave.butt = random(4,6)>>
<<set $activeSlave.boobShape = "saggy">>
@@ -195,8 +195,8 @@
<<set $activeSlave.anus = 2>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.weight = random(70,180)>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 75>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 75>>
<<set $activeSlave.hLength = random(10,20)>>
<<set $activeSlave.hStyle = either("buzzcut", "long", "neat", "trimmed")>>
<<set $activeSlave.voice = 1>>
@@ -217,11 +217,11 @@
<<set $activeSlave.preg = -1>>
<<set $activeSlave.boobs = (random(8,10)*100)>>
<<set $activeSlave.boobsImplant = 600>>
- <<set $activeSlave.oralSkill += random(0,20)>>
- <<set $activeSlave.vaginalSkill += random(0,20)>>
- <<set $activeSlave.analSkill += random(0,20)>>
- <<set $activeSlave.entertainSkill += random(0,20)>>
- <<set $activeSlave.whoreSkill += random(0,20)>>
+ <<set $activeSlave.skill.oral += random(0,20)>>
+ <<set $activeSlave.skill.vaginal += random(0,20)>>
+ <<set $activeSlave.skill.anal += random(0,20)>>
+ <<set $activeSlave.skill.entertainment += random(0,20)>>
+ <<set $activeSlave.skill.whore += random(0,20)>>
<<set $activeSlave.nipplesPiercing = 1>>
<<set $activeSlave.lipsPiercing = 1>>
<<set $activeSlave.tonguePiercing = 1>>
@@ -244,10 +244,10 @@
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.boobs = (random(6,8)*100)>>
<<set $activeSlave.boobsImplant = 600>>
- <<set $activeSlave.oralSkill += random(0,20)>>
- <<set $activeSlave.analSkill += random(0,20)>>
- <<set $activeSlave.entertainSkill += random(0,20)>>
- <<set $activeSlave.whoreSkill += random(0,20)>>
+ <<set $activeSlave.skill.oral += random(0,20)>>
+ <<set $activeSlave.skill.anal += random(0,20)>>
+ <<set $activeSlave.skill.entertainment += random(0,20)>>
+ <<set $activeSlave.skill.whore += random(0,20)>>
<<set $activeSlave.lips = random(60,90)>>
<<set $activeSlave.lipsImplant = 40>>
<<set $activeSlave.lipsPiercing = 1>>
@@ -273,11 +273,11 @@
<<set $activeSlave.actualAge = $eventSlave.actualAge+2>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.oralSkill += random(0,20)>>
- <<set $activeSlave.vaginalSkill += random(0,20)>>
- <<set $activeSlave.analSkill += random(0,20)>>
- <<set $activeSlave.entertainSkill += random(0,20)>>
- <<set $activeSlave.whoreSkill += random(0,20)>>
+ <<set $activeSlave.skill.oral += random(0,20)>>
+ <<set $activeSlave.skill.vaginal += random(0,20)>>
+ <<set $activeSlave.skill.anal += random(0,20)>>
+ <<set $activeSlave.skill.entertainment += random(0,20)>>
+ <<set $activeSlave.skill.whore += random(0,20)>>
<<case "younger sister">>
<<set $activeSlave.origin = "She was recruited into your service by her older sister.">>
@@ -287,7 +287,7 @@
<<set $activeSlave.hips = random(-2,0)>>
<<set $activeSlave.shoulders = random(-2,0)>>
<<set $activeSlave.actualAge = $eventSlave.actualAge-2>>
- <<set $activeSlave.entertainSkill += random(0,20)>>
+ <<set $activeSlave.skill.entertainment += random(0,20)>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.anus = 0>>
@@ -303,8 +303,8 @@
<<set $activeSlave.balls = 4>>
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.actualAge = $eventSlave.actualAge+2>>
- <<set $activeSlave.entertainSkill += random(0,20)>>
- <<set $activeSlave.whoreSkill += random(0,20)>>
+ <<set $activeSlave.skill.entertainment += random(0,20)>>
+ <<set $activeSlave.skill.whore += random(0,20)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.energy = 70>>
@@ -334,12 +334,12 @@
<<set $activeSlave.anus = 3>>
<<set $activeSlave.makeup = 3>>
<<set $activeSlave.nails = 5>>
- <<set $activeSlave.analSkill = 70>>
- <<set $activeSlave.oralSkill = 70>>
- <<set $activeSlave.whoreSkill = 100>>
+ <<set $activeSlave.skill.anal = 70>>
+ <<set $activeSlave.skill.oral = 70>>
+ <<set $activeSlave.skill.whore = 100>>
<<set $activeSlave.energy = 100>>
<<set $activeSlave.actualAge = $eventSlave.actualAge-2>>
- <<set $activeSlave.entertainSkill += random(0,20)>>
+ <<set $activeSlave.skill.entertainment += random(0,20)>>
<<case "twin">>
<<set $activeSlave.origin = "She was recruited into your service by her twin sister.">>
@@ -466,7 +466,7 @@
<<set $activeSlave.armsTat = 0>>
<<set $activeSlave.legsTat = 0>>
<<set $activeSlave.backTat = 0>>
-<<set $activeSlave.combatSkill = 0>>
+<<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.aphrodisiacs = 0>>
<<set $activeSlave.curatives = 0>>
<<set $activeSlave.addict = 0>>
@@ -915,11 +915,11 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
<<set $activeSlave.anus = 0>>
<<if $activeSlave.vagina > -1>><<set $activeSlave.vagina = 0>><</if>>
<<set $activeSlave.preg = -1>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.lactation = 0>>
<<set $activeSlave.lactationDuration = 0>>
<<set $activeSlave.boobsMilk = 0>>
@@ -935,11 +935,11 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
<<set $activeSlave.vagina = 1>>
<</if>>
<<set $activeSlave.preg = -1>>
- <<set $activeSlave.oralSkill += random(0,20)>>
- <<set $activeSlave.vaginalSkill += random(0,20)>>
- <<set $activeSlave.analSkill += random(0,20)>>
- <<set $activeSlave.entertainSkill += random(0,20)>>
- <<set $activeSlave.whoreSkill += random(0,20)>>
+ <<set $activeSlave.skill.oral += random(0,20)>>
+ <<set $activeSlave.skill.vaginal += random(0,20)>>
+ <<set $activeSlave.skill.anal += random(0,20)>>
+ <<set $activeSlave.skill.entertainment += random(0,20)>>
+ <<set $activeSlave.skill.whore += random(0,20)>>
<<set $activeSlave.lactation = 0>>
<<set $activeSlave.lactationDuration = 0>>
<<set $activeSlave.boobsMilk = 0>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index f8aad90409a1aa075a24d8f5d86f807d0f207150..253dccfc7a56a0832fb4b6baffc8dc922e6e6307 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -21,11 +21,11 @@
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.oldTrust = $activeSlave.trust>>
<<set $activeSlave.health = random(30,50)>>
-<<set $activeSlave.analSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.whoreSkill = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.entertainSkill = 0>>
+<<set $activeSlave.skill.anal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.butt = random(4,6)>>
<<set $activeSlave.boobs = 100*random(12,18)>>
<<set $activeSlave.weight = random(20,80)>>
@@ -466,4 +466,4 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<</replace>>
<</link>>
<</if>>
-</span>
\ No newline at end of file
+</span>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index ef7b3ac069a67c96428ffa30dbcc66c8e6207d89..7c11830017c363a27dd8487d163304b583305dc4 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -82,7 +82,7 @@
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.birthsTotal += 1>>
<<set $activeSlave.face = 15>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.boobs += 400>>
<<set $activeSlave.boobsImplant = 400>>
@@ -125,7 +125,7 @@
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.birthsTotal += 1>>
<<set $activeSlave.face = 15>>
-<<set $activeSlave.vaginalSkill = 35>>
+<<set $activeSlave.skill.vaginal = 35>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.lactation = 1>>
@@ -198,7 +198,7 @@
<<set $activeSlave.bellyPreg = 8000>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.face = random(15,40)>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.lactation = 1>>
<<set $activeSlave.lactationDuration = 2>>
@@ -235,7 +235,7 @@
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.face = random(15,40)>>
<<set $activeSlave.attrXX = 80>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.clothes = "cutoffs and a t-shirt">>
<<set $activeSlave.health = random(20,40)>>
<<set $activeSlave.pubicHStyle = "in a strip">>
@@ -301,7 +301,7 @@
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.face = random(15,40)>>
<<set $activeSlave.attrXX = 80>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.clothes = "cutoffs and a t-shirt">>
<<set $activeSlave.health = random(20,40)>>
<<set $activeSlave.pubicHStyle = "in a strip">>
@@ -365,7 +365,7 @@
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.face = random(15,40)>>
<<set $activeSlave.attrXX = 80>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.clothes = "cutoffs and a t-shirt">>
<<set $activeSlave.health = random(20,40)>>
<<set $activeSlave.pubicHStyle = "in a strip">>
@@ -400,7 +400,7 @@
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.birthsTotal += 1>>
<<set $activeSlave.face = random(15,60)>>
-<<set $activeSlave.vaginalSkill = 35>>
+<<set $activeSlave.skill.vaginal = 35>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.boobs += 600>>
<<set $activeSlave.lactation = 1>>
@@ -478,9 +478,9 @@
<<set $activeSlave.balls = 1>>
<<set $activeSlave.face = 15>>
<<set $activeSlave.weight = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.anal = 15>>
<<set $activeSlave.boobs = 600>>
<<set $activeSlave.boobsImplant = 400>>
<<set $activeSlave.butt = either(1, 2)>>
@@ -527,9 +527,9 @@
<<set $activeSlave.clit = 0>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.face = 15>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.anal = 15>>
<<set $activeSlave.boobs = either(500,600)>>
<<set $activeSlave.boobsImplant = 400>>
<<set $activeSlave.butt = either(2, 3)>>
@@ -582,9 +582,9 @@
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.anal = 15>>
<<if $activeSlave.physicalAge >= random(13,17)>>
<<set $activeSlave.boobs = either(500,600)>>
<<set $activeSlave.boobsImplant = 0>>
@@ -637,9 +637,9 @@
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
-<<set $activeSlave.vaginalSkill = 15>>
-<<set $activeSlave.oralSkill = 15>>
-<<set $activeSlave.analSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
+<<set $activeSlave.skill.oral = 15>>
+<<set $activeSlave.skill.anal = 15>>
<<if $activeSlave.physicalAge >= random(13,17)>>
<<set $activeSlave.boobs = either(500,600)>>
<<set $activeSlave.boobsImplant = 0>>
@@ -705,9 +705,9 @@
<<set $activeSlave.birthsTotal = 5>>
<<set $activeSlave.face = 15>>
<<set $activeSlave.vagina = 4>>
-<<set $activeSlave.vaginalSkill = 45>>
-<<set $activeSlave.whoreSkill = 20>>
-<<set $activeSlave.analSkill = 10>>
+<<set $activeSlave.skill.vaginal = 45>>
+<<set $activeSlave.skill.whore = 20>>
+<<set $activeSlave.skill.anal = 10>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.weight = random(-80,-50)>>
<<set $activeSlave.muscles = 0>>
@@ -787,7 +787,7 @@
<<set $activeSlave.butt -= 1>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.anus = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlaveOneTimeMaxAge = Math.max($minimumSlaveAge,Math.min(19, ($activeSlave.actualAge - Math.min(11, $fertilityAge))))>>
<<set $activeSlaveOneTimeMinAge = Math.min(18, $activeSlaveOneTimeMaxAge)>>
<<if $pedo_mode == 1>><<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>><</if>>
@@ -844,7 +844,7 @@
<<set $activeSlave.scrotum = 2>>
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.clit = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.faceShape = "cute">>
<<set $activeSlave.boobs = 0>>
<<set $activeSlave.birthsTotal = 0>>
@@ -897,7 +897,7 @@
<<set $activeSlave.clit = 1>>
<<set $activeSlave.prostate = 0>>
<<set $activeSlave.voice = 2>>
-<<set $activeSlave.vaginalSkill = 50>>
+<<set $activeSlave.skill.vaginal = 50>>
<<set $activeSlave.boobs = (random(3,6)*100)>>
<<set $activeSlave.pregType = 1>>
<<set $activeSlave.pregKnown = 1>>
@@ -948,7 +948,7 @@
<<set $activeSlave.scrotum = 2>>
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.clit = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.faceShape = "masculine">>
<<set $activeSlave.boobs = 0>>
<<set $activeSlave.lactation = 0>>
@@ -1060,7 +1060,7 @@
<<set $activeSlave.scrotum = 2>>
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.clit = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.faceShape = "masculine">>
<<set $activeSlave.boobs = 0>>
<<set $activeSlave.lactation = 0>>
@@ -1101,7 +1101,7 @@
<</if>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.birthsTotal = 0>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.boobs -= 300>>
<<set $activeSlave.lactation = 0>>
@@ -1176,9 +1176,9 @@
<<set $activeSlave.scrotum = 0>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.balls = 0>>
-<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.oralSkill = 0>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.vaginal = 0>>
+<<set $activeSlave.skill.oral = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.sexualFlaw = "hates penetration">>
<<set $activeSlave.boobs = either(400, 500)>>
@@ -1211,7 +1211,7 @@
<<set $activeSlave.clit = 2>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.balls = 0>>
-<<set $activeSlave.vaginalSkill = 15>>
+<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.boobsImplant = 0>>
<<set $activeSlave.buttImplant = 0>>
<<if $familyTesting == 1>>
@@ -1268,9 +1268,9 @@
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.birthsTotal = 0>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.weight = random(-80,-50)>>
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.underArmHStyle = "bushy">>
@@ -1327,9 +1327,9 @@
<<set $activeSlave.labor = 0>>
<<set $activeSlave.birthsTotal = 0>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.weight = random(-80,-50)>>
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.underArmHStyle = "bushy">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index b5634b1768640bdafcc0274206799acd4d4121f0..81bb13dbda4049188f272578d2acb9c4fdf67b2e 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1208,23 +1208,23 @@ Work on $his sex:
<<if ($activeSlave.vagina > -1) && ($activeSlave.dick > 0)>>
<<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
- | [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$activeSlave.vaginalAccessory = "none",$activeSlave.vaginalAttachment = "none",$activeSlave.chastityVagina = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>>
+ | [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.skill.vaginal = 0,$activeSlave.vaginalAccessory = "none",$activeSlave.vaginalAttachment = "none",$activeSlave.chastityVagina = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>>
<</if>>
<<elseif $activeSlave.vagina > -1>>
<<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
- | [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$activeSlave.vaginalAccessory = "none",$activeSlave.vaginalAttachment = "none",$activeSlave.chastityVagina = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>>
+ | [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.skill.vaginal = 0,$activeSlave.vaginalAccessory = "none",$activeSlave.vaginalAttachment = "none",$activeSlave.chastityVagina = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>>
<</if>>
<</if>>
<<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if ($activeSlave.vagina == -1) && ($activeSlave.dick != 0)>>
- | [[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.chastityPenis = 0,$activeSlave.dickTat = 0,$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.ballType = "human",$activeSlave.vasectomy = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.vaginalSkill = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "mtf"]]
+ | [[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.chastityPenis = 0,$activeSlave.dickTat = 0,$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.ballType = "human",$activeSlave.vasectomy = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.skill.vaginal = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "mtf"]]
<</if>>
<<if ($activeSlave.vagina == -1) && ($activeSlave.dick == 0) && ($surgeryUpgrade == 1)>>
- | [[Create a vagina|Surgery Degradation][$activeSlave.vagina = 0,$activeSlave.vaginalSkill = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "ntf"]]
+ | [[Create a vagina|Surgery Degradation][$activeSlave.vagina = 0,$activeSlave.skill.vaginal = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "ntf"]]
<</if>>
<<if ($activeSlave.dick > 0) && ($seeExtreme == 1)>>
- | [[Remove penis|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.chastityPenis = 0,$activeSlave.dickTat = 0,$activeSlave.foreskin = 0,$activeSlave.vaginalSkill = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "chop"]]
+ | [[Remove penis|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.chastityPenis = 0,$activeSlave.dickTat = 0,$activeSlave.foreskin = 0,$activeSlave.skill.vaginal = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "chop"]]
<</if>>
<<if ($activeSlave.foreskin > 0) && $activeSlave.dick > 0>>
<<if $activeSlave.indentureRestrictions < 2>>
@@ -1240,7 +1240,7 @@ Work on $his sex:
<<if ($activeSlave.dick != 0) && ($activeSlave.vagina == -1) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
- | [[Create surgical hermaphrodite|Surgery Degradation][$activeSlave.vagina = 0,$activeSlave.vaginalSkill = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "herm"]]
+ | [[Create surgical hermaphrodite|Surgery Degradation][$activeSlave.vagina = 0,$activeSlave.skill.vaginal = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "herm"]]
<</if>>
<</if>>
@@ -1472,7 +1472,7 @@ Alter $his race:
[[White|Surgery Degradation][$activeSlave.race = "white",$activeSlave.skin = either("fair", "light", "pale"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "brown", "red"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "latina">>
- [[Latina|Surgery Degradation][$activeSlave.race = "latina",$activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tanned"),$activeSlave.hColor = either("black", "black", "brown", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Latina|Surgery Degradation][$activeSlave.race = "latina",$activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tan"),$activeSlave.hColor = either("black", "black", "brown", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "black">>
[[Black|Surgery Degradation][$activeSlave.race = "black",$activeSlave.skin = either("black", "brown", "dark brown"),$activeSlave.hColor = either("black", "black", "black", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
@@ -1481,7 +1481,7 @@ Alter $his race:
[[Asian|Surgery Degradation][$activeSlave.race = "asian",$activeSlave.skin = either("dark olive", "light olive", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "middle eastern">>
- [[Middle Eastern|Surgery Degradation][$activeSlave.race = "middle eastern",$activeSlave.skin = either("fair", "light olive", "light", "tanned"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Middle Eastern|Surgery Degradation][$activeSlave.race = "middle eastern",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "indo-aryan">>
[[Indo-Aryan|Surgery Degradation][$activeSlave.race = "indo-aryan",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
@@ -1496,10 +1496,10 @@ Alter $his race:
[[Amerindian|Surgery Degradation][$activeSlave.race = "amerindian",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "southern european">>
- [[Southern European|Surgery Degradation][$activeSlave.race = "southern european",$activeSlave.skin = either("fair", "light olive", "light", "tanned"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Southern European|Surgery Degradation][$activeSlave.race = "southern european",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "semitic">>
- [[Semitic|Surgery Degradation][$activeSlave.race = "semitic",$activeSlave.skin = either("fair", "light olive", "light", "tanned"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Semitic|Surgery Degradation][$activeSlave.race = "semitic",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "mixed race">>
[[Mixed Race|Surgery Degradation][$activeSlave.race = "mixed race",$activeSlave.skin = either("dark", "light", "pale"),$activeSlave.hColor = either("black", "black", "black", "black", "blonde", "brown", "brown", "red"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]]
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 9fd8ac6fac427baf51af47bb822662f94d9abd21..5167cd02859d9f4d3039a7de593250d2fb1318cd 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -63,19 +63,19 @@
<<set $activeSlave.weight = 0>>
<<set $activeSlave.chem = 20>>
<<if $TSS.schoolUpgrade == 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<else>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 15>>
<</if>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = either("none")>>
@@ -123,12 +123,12 @@
<<set $activeSlave.weight = random(60,160)>>
<<set $activeSlave.muscles = random(60,80)>>
<<set $activeSlave.chem = 10>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.heels = 1>>
@@ -190,12 +190,12 @@
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.actualAge = 19>>
@@ -250,19 +250,19 @@
<<set $activeSlave.preg = 0>>
<<set $activeSlave.weight = -20>>
<<if $SCP.schoolUpgrade == 2>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<else>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<</if>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.actualAge = 19>>
@@ -276,7 +276,7 @@
<<set $activeSlave.pubicHColor = "blonde">>
<<set $activeSlave.underArmHColor = "blonde">>
<<set $activeSlave.race = "white">>
- <<set $activeSlave.skin = "tanned">>
+ <<set $activeSlave.skin = "sun tanned">>
<<set $activeSlave.override_H_Color = 1>>
<<set $activeSlave.override_Arm_H_Color = 1>>
<<set $activeSlave.override_Brow_H_Color = 1>>
@@ -327,12 +327,12 @@
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.weight = random(0,20)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 15>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 15>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.actualAge = 19>>
@@ -382,15 +382,15 @@
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<if $TGA.schoolUpgrade == 2>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<else>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<</if>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
@@ -448,12 +448,12 @@
<<set $activeSlave.height = Math.trunc(Math.clamp(Height.random($activeSlave, {limitMult: [2, 15], spread: .1}),_minHeight, 274))>>
<<set $activeSlave.waist = -15>>
<<set $activeSlave.shoulders = 0>>
- <<set $activeSlave.vaginalSkill = 10>>
- <<set $activeSlave.oralSkill = 10>>
- <<set $activeSlave.analSkill = 10>>
- <<set $activeSlave.whoreSkill = 10>>
- <<set $activeSlave.entertainSkill = either(10,10,30)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.vaginal = 10>>
+ <<set $activeSlave.skill.oral = 10>>
+ <<set $activeSlave.skill.anal = 10>>
+ <<set $activeSlave.skill.whore = 10>>
+ <<set $activeSlave.skill.entertainment = either(10,10,30)>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.sexualFlaw = either("apathetic", "judgemental", "none", "none")>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "none")>>
<<set $activeSlave.pubicHStyle = "waxed">>
@@ -647,12 +647,12 @@
<<if $activeSlave.genes == "XY">>
<<set $activeSlave.shoulders = 1>>
<</if>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 100>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 100>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<if $TFS.schoolUpgrade == 1>>
@@ -731,12 +731,12 @@
<<set $activeSlave.muscles = 20>>
<<set $activeSlave.waist = -15>>
<<set $activeSlave.shoulders = 1>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 100>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 100>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<if $TFS.schoolUpgrade == 1>>
diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw
index 28fc9164f38dcffef7dc11ee700aacedbd418a02..aa93e6b718221719e06ca107ed14ad4e62b40f8c 100644
--- a/src/uncategorized/saBeYourHeadGirl.tw
+++ b/src/uncategorized/saBeYourHeadGirl.tw
@@ -177,6 +177,6 @@
<</if>>
<</if>>
-<<if !setup.HGCareers.includes($slaves[$i].career) && $slaves[$i].skillWA < $masteredXP>>
- <<set $slaves[$i].skillHG += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
+<<if !setup.HGCareers.includes($slaves[$i].career) && $slaves[$i].skill.wardeness < $masteredXP>>
+ <<set $slaves[$i].skill.headGirl += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
<</if>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index c604ce05f734a9c1ee3e1c9fa5aedbae6db640db..a403c8aff639f7e7aadff057e7035dce92c8b9b4 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -445,7 +445,7 @@
<<= assignJob($slaves[$i], "rest")>>
<</if>>
<<else>>
- <<if ($slaves[$i].whoreSkill > $slaves[$i].entertainSkill)>>
+ <<if ($slaves[$i].skill.whore > $slaves[$i].skill.entertainment)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, since $he thinks $himself a better whore than a public slut.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
@@ -453,7 +453,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " decides to whore, since $he thinks $himself a better whore than a public slut.">>
<<= assignJob($slaves[$i], "whore")>>
<</if>>
- <<elseif ($slaves[$i].entertainSkill > $slaves[$i].whoreSkill)>>
+ <<elseif ($slaves[$i].skill.entertainment > $slaves[$i].skill.whore)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be a club $girl, since $he thinks $himself a better public slut than a whore.">>
<<= assignJob($slaves[$i], "serve in the club")>>
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index cf8308de8238ca81698110dd80df017ccc9b4bb9..b713d6b9076f5b6018faf79236933ae9011e44d2 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -18,7 +18,7 @@ gets milked this week.
<<set $dairySpots -= 1>>
<</if>>
<<if ($Milkmaid != 0)>>
- While there, $he gets the benefit of $Milkmaid.slaveName's <<if ($Milkmaid.physicalAge < 21)>>youthful energy<<else>>care<</if>><<if ($Milkmaid.oralSkill >= 100)>> and talented tongue<</if>>.
+ While there, $he gets the benefit of $Milkmaid.slaveName's <<if ($Milkmaid.physicalAge < 21)>>youthful energy<<else>>care<</if>><<if ($Milkmaid.skill.oral >= 100)>> and talented tongue<</if>>.
<<if ($slaves[$i].devotion < $milkmaidDevotionThreshold)>>
<<set $slaves[$i].devotion += $milkmaidDevotionBonus>>
<</if>>
@@ -639,4 +639,4 @@ gets milked this week.
<</if>>
<</if>>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index de9a7292dadd489ce8fc3319fb1b428001d23a0c..dd19908e4780ca412a2a7642a432b4480b12d06c 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -8,16 +8,16 @@ carries arms in your defense.
<<set $deadliness = Deadliness($slaves[$i])>>
-<<if $slaves[$i].combatSkill > 0>>
+<<if $slaves[$i].skill.combat > 0>>
$His combat skills greatly increase $his deadliness.
<</if>>
<<if setup.bodyguardCareers.includes($slaves[$i].career)>>
$He has experience in personal defense from before $he was a slave.
-<<elseif $slaves[$i].skillBG >= $masteredXP>>
+<<elseif $slaves[$i].skill.bodyguard >= $masteredXP>>
$He has experience in personal defense from working for you.
<<else>>
- <<set $slaves[$i].skillBG += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
+ <<set $slaves[$i].skill.bodyguard += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($slaves[$i].muscles > 30) && ($slaves[$i].muscles <= 95)>>
@@ -145,10 +145,10 @@ carries arms in your defense.
$His sharp teeth add nothing to $his actual effectiveness, but they're certainly intimidating.
<</if>>
-<<if ($slaves[$i].combatSkill < 1) && (random(-100,150) <= ($slaves[$i].intelligence+$slaves[$i].intelligenceImplant))>>
+<<if ($slaves[$i].skill.combat < 1) && (random(-100,150) <= ($slaves[$i].intelligence+$slaves[$i].intelligenceImplant))>>
After some experience guarding you, and diligent practice in the armory, @@.green;$his combat skills increase.@@
- <<set $slaves[$i].combatSkill += 1>>
-<<elseif $slaves[$i].combatSkill >= 1>>
+ <<set $slaves[$i].skill.combat += 1>>
+<<elseif $slaves[$i].skill.combat >= 1>>
$He maintains $his combat skill with practice in the armory.
<<else>>
Though $he practices diligently $his basic combat skills do not improve this week.
@@ -178,29 +178,29 @@ Being continually trusted with your life @@.hotpink;increases $his devotion to y
<<set $slaves[$i].devotion += 1>>
<</if>>
-<<if $bodyguardTrains == 1 && $slaves[$i].devotion > 95 && $slaves[$i].trust > 50 && $slaves[$i].combatSkill > 0 && $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15>>
+<<if $bodyguardTrains == 1 && $slaves[$i].devotion > 95 && $slaves[$i].trust > 50 && $slaves[$i].skill.combat > 0 && $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15>>
$He's confident in $his martial skills, but smart enough to know that $he isn't immortal, and devoted enough to worry about who will protect you should $he die.
<<set _successorCandidates = $slaves.filter( function(s) { return (s.assignmentVisible == 1 || s.assignment == "be your Concubine" || s.assignment == "be the Wardeness" || s.assignment == "be your Head Girl" || s.assignment == "work as a servant" || s.assignment == "serve in the master suite") && bodyguardSuccessorEligible(s); } )>>
- <<set _combatSkilled = _successorCandidates.filter( function(s) { return s.combatSkill > 0; })>>
+ <<set _combatSkilled = _successorCandidates.filter( function(s) { return s.skill.combat > 0; })>>
<<if _combatSkilled.length < 2>>
<<unset $subSlave>>
<<set _flawedTrainee = 0>>
<<if $slaves[$i].relationship > 1>>
<<set $subSlave = getSlave($slaves[$i].relationshipTarget)>>
- <<if (def $subSlave) && $subSlave.combatSkill == 0 && bodyguardSuccessorEligible($subSlave)>>
+ <<if (def $subSlave) && $subSlave.skill.combat == 0 && bodyguardSuccessorEligible($subSlave)>>
$He does $his best to train $subSlave.slaveName whenever $he can, hoping that $his
<<if $slaves[$i].relationship > 4>>wife<<elseif $slaves[$i].relationship == 4>>lover<<elseif $slaves[$i].relationship == 3>>girlfriend<<else>>best friend<</if>>
can be made capable of stepping into $his place.
<</if>>
<</if>>
<<if ndef $subSlave>>
- <<if $HeadGirl != 0 && $HeadGirl.combatSkill == 0 && bodyguardSuccessorEligible($HeadGirl)>>
+ <<if $HeadGirl != 0 && $HeadGirl.skill.combat == 0 && bodyguardSuccessorEligible($HeadGirl)>>
$He does $his best to train $HeadGirl.slaveName whenever $he can, hoping that your Head Girl can be made capable of stepping into $his place.
<<set $subSlave = $HeadGirl>>
<</if>>
<</if>>
<<if ndef $subSlave>>
- <<if $Concubine != 0 && $Concubine.combatSkill == 0 && $Concubine.devotion > 50 && $Concubine.muscles >= -30 && $Concubine.weight < 150 && $Concubine.butt < 10 && $Concubine.boobs < 25000 && $Concubine.belly < 5000 && $Concubine.balls < 20 && $Concubine.dick < 15 && $Concubine.fuckdoll == 0 && $Concubine.fetish != "mindbroken" && canWalk($Concubine)>>
+ <<if $Concubine != 0 && $Concubine.skill.combat == 0 && $Concubine.devotion > 50 && $Concubine.muscles >= -30 && $Concubine.weight < 150 && $Concubine.butt < 10 && $Concubine.boobs < 25000 && $Concubine.belly < 5000 && $Concubine.balls < 20 && $Concubine.dick < 15 && $Concubine.fuckdoll == 0 && $Concubine.fetish != "mindbroken" && canWalk($Concubine)>>
$He does $his best to train $Concubine.slaveName whenever $he can, hoping that your Concubine can be made capable of stepping into $his place.
<<if $Concubine.boobs >= 8000 || $Concubine.butt >= 10 || $Concubine.belly >= 5000 || $Concubine.balls >= 10 || $Concubine.dick >= 10 || $Concubine.muscles < 0 || $Concubine.weight >= 100>>
$His body is poorly suited for combat, but $he can learn to work around it with enough effort.
@@ -210,13 +210,13 @@ Being continually trusted with your life @@.hotpink;increases $his devotion to y
<</if>>
<</if>>
<<if ndef $subSlave>>
- <<if $Wardeness != 0 && $Wardeness.combatSkill == 0 && bodyguardSuccessorEligible($Wardeness)>>
+ <<if $Wardeness != 0 && $Wardeness.skill.combat == 0 && bodyguardSuccessorEligible($Wardeness)>>
$He does $his best to train $Wardeness.slaveName whenever $he can, hoping that your Wardeness can be made capable of stepping into $his place.
<<set $subSlave = $Wardeness>>
<</if>>
<</if>>
<<if ndef $subSlave>>
- <<set $subSlave = _successorCandidates.find( function(s) { return s.combatSkill == 0; })>>
+ <<set $subSlave = _successorCandidates.find( function(s) { return s.skill.combat == 0; })>>
<<if def $subSlave>>
$He does $his best to train $subSlave.slaveName whenever $he can, hoping that $his subordinate can be made capable of stepping into $his place.
<</if>>
@@ -225,7 +225,7 @@ Being continually trusted with your life @@.hotpink;increases $his devotion to y
<<if ($slaves[$i].intelligence + $slaves[$i].intelligenceImplant - _flawedTrainee) > random(1,500)>>
By the end of the week, $he is satisfied that $subSlave.slaveName @@.green;has the combat skill@@ to contribute to your defense.
<<set _sgy = $slaveIndices[$subSlave.ID]>>
- <<set $slaves[_sgy].combatSkill = 1>>
+ <<set $slaves[_sgy].skill.combat = 1>>
<</if>>
<<else>>
$He finds no suitable candidates to serve as $his replacement, leaving $him stressed over your future safety. The worry is exhausting and @@.red;bad for $his health.@@
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 2977700968d34dcd2d430400f8cd23409dbc7553..e81178649b19519613b11e5f1475ea188778f02f 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -220,16 +220,16 @@
<</if>>
<<set $skillIncrease = 10>>
-<<if ($slaves[$i].oralSkill <= 30)>>
+<<if ($slaves[$i].skill.oral <= 30)>>
$HeadGirl.slaveName wants to come home to a talented tongue, so _he2 trains $slaves[$i].slaveName's oral skills.
<<OralSkillIncrease $slaves[$i]>>
-<<elseif ($slaves[$i].vagina > 0) && ($slaves[$i].vaginalSkill <= 30)>>
+<<elseif ($slaves[$i].vagina > 0) && ($slaves[$i].skill.vaginal <= 30)>>
$HeadGirl.slaveName wants _his2 personal sex slave to be as skilled with $his pussy as possible, so _he2 trains $slaves[$i].slaveName's vaginal skills.
<<VaginalSkillIncrease $slaves[$i]>>
-<<elseif ($slaves[$i].anus > 0) && ($slaves[$i].analSkill <= 30)>>
+<<elseif ($slaves[$i].anus > 0) && ($slaves[$i].skill.anal <= 30)>>
$HeadGirl.slaveName wants _his2 personal sex slave to be a skillful backdoor whore, so _he2 trains $slaves[$i].slaveName's anal skills.
<<AnalSkillIncrease $slaves[$i]>>
-<<elseif ($slaves[$i].entertainSkill <= 10)>>
+<<elseif ($slaves[$i].skill.entertainment <= 10)>>
$HeadGirl.slaveName wants to be kept amused in _his2 occasional free time, so _he2 trains $slaves[$i].slaveName's entertainment skills.
<<EntertainSkillIncrease $slaves[$i]>>
<<elseif ($slaves[$i].sexualFlaw != "none")>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 4db67ce2c4c61d4bf3cf485c4668ab4e9cce93ec..80bc724af9c26b956b8b2ab3335c7ad204775509 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -17,15 +17,15 @@
<<if $slaves[$i].fuckdoll <= 5>>
This is $his first week as a living sex toy. $He is @@.mediumorchid;utterly terrified@@ by the prospect of spending the rest of $his life like this. $He is @@.green;forced to adapt@@ to life as a Fuckdoll. $He must remain still, and do $his best to cooperate with anyone who guides $him by touch. When $he obeys commands relayed by $his suit, $he is rewarded with orgasms; when $he does not, $he is punished with pain.
<<set $slaves[$i].trust -= 10>>
- <<if $slaves[$i].entertainSkill > 50>>
+ <<if $slaves[$i].skill.entertainment > 50>>
$He @@.red;begins to forget $his entertainment skills@@ under the terrible stress of total confinement.
- <<set $slaves[$i].entertainSkill = 50>>
+ <<set $slaves[$i].skill.entertainment = 50>>
<</if>>
<<elseif $slaves[$i].fuckdoll <= 15>>
This is $his second week as a living sex toy. $His suit continues $his training as a living sex toy, @@.green;forcing $him to accept any treatment@@ $he is subjected to. Though the suit is capable of resisting unacceptable movement to a degree, and it includes integral shackles to secure the toy in any position desired, the Fuckdoll is now severely punished if $he attempts any resistance at all.
- <<if $slaves[$i].whoreSkill > 50>>
+ <<if $slaves[$i].skill.whore > 50>>
$He @@.red;loses $his refined courtesanship,@@ since all $he has to remember now is how to be used.
- <<set $slaves[$i].whoreSkill = 50>>
+ <<set $slaves[$i].skill.whore = 50>>
<</if>>
<<elseif $slaves[$i].fuckdoll <= 25>>
This week $he @@.green;learns the most basic commands@@ $his suit can pass, those for simple postures. <<if $slaves[$i].amp == 1>>These are very simple, since $he lacks limbs.<<else>>One command directs $him to remain standing, but cock $his hips to offer $his rear hole. Another requires $him to get instantly down on all fours and arch $his back, offering both $his face hole and <<if $slaves[$i].vagina > -1>>lower holes<<else>>rear hole<</if>>.<</if>>
@@ -45,19 +45,19 @@
<</if>>
<<elseif $slaves[$i].fuckdoll <= 45>>
This week $he @@.green;learns basic sexual commands@@ from $his suit. Usually, if something is inserted into $his <<if $slaves[$i].vagina > -1>>holes<<else>>lower hole<</if>>, $he is to relax. If a specific command is given, $he is taught to rhythmically tighten <<if $slaves[$i].vagina > -1>>$his holes<<else>>the hole<</if>>, massaging whatever's inside.
- <<if $slaves[$i].vaginalSkill > 25>>
+ <<if $slaves[$i].skill.vaginal > 25>>
Being trained in this uncomplicated act @@.red;quickly teaches $him to ignore $his vaginal talents.@@
- <<set $slaves[$i].vaginalSkill = 25>>
+ <<set $slaves[$i].skill.vaginal = 25>>
<</if>>
- <<if $slaves[$i].analSkill > 25>>
+ <<if $slaves[$i].skill.anal > 25>>
$He's forced to use $his sphincter as hard as $he can, and $he @@.red;quickly forgets all anal refinement.@@
- <<set $slaves[$i].analSkill = 25>>
+ <<set $slaves[$i].skill.anal = 25>>
<</if>>
<<elseif $slaves[$i].fuckdoll <= 55>>
This week $he @@.green;learns more basic sexual commands@@ from $his suit. Usually, if something is inserted into $his throat, $he is to relax and accept a facefucking. If a specific command is given, $he is taught to suck as powerfully as $he can, on pain of punishment.
- <<if $slaves[$i].oralSkill > 25>>
+ <<if $slaves[$i].skill.oral > 25>>
Being trained to suck so hard @@.red;quickly erases $his finer oral habits.@@
- <<set $slaves[$i].oralSkill = 25>>
+ <<set $slaves[$i].skill.oral = 25>>
<</if>>
<<if $slaves[$i].behavioralFlaw != "none">>
$He has now been obeying $his suit out of a desire to avoid punishment for so long that @@.green;$he loses any propensity to misbehave in distinctive ways.@@
@@ -85,13 +85,13 @@
<</if>>
<<elseif $slaves[$i].fuckdoll <= 85>>
This week $he @@.green;learns some more advanced commands@@ from $his suit. <<if $slaves[$i].amp == 1>>If $his limbless torso is placed atop a dick and a command is given, $he is to do $his best to bounce on it.<<else>>$He learns a special command, on which $he is to slowly squat down, impaling $himself on any phallus beneath $him. Once $his hole is filled, $he is to bounce up and down, using $his hole to milk the phallus.<</if>>
- <<if $slaves[$i].entertainSkill > 15>>
+ <<if $slaves[$i].skill.entertainment > 15>>
There is @@.red;no entertainment and no elegance@@ for $him anymore. $He cannot even hear the lewd noises $his holes make.
- <<set $slaves[$i].entertainSkill = 15>>
+ <<set $slaves[$i].skill.entertainment = 15>>
<</if>>
- <<if $slaves[$i].whoreSkill > 15>>
+ <<if $slaves[$i].skill.whore > 15>>
$He @@.red;cannot remember prostitution@@ at all. $He can barely remember anything but being fucked.
- <<set $slaves[$i].whoreSkill = 15>>
+ <<set $slaves[$i].skill.whore = 15>>
<</if>>
<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15>>
$His @@.red;mind steadily degrades@@ under the stress of this treatment.
@@ -122,7 +122,7 @@
<<include "SA clothes">>
<<if $slaves[$i].fetish == "mindbroken">>
- <<set $slaves[$i].fetishStrength = 10, $slaves[$i].attrXY = 50, $slaves[$i].attrXX = 50, $slaves[$i].attrKnown = 1, $slaves[$i].devotion = 40, $slaves[$i].trust = -40, $slaves[$i].vaginalSkill = Math.clamp($slaves[$i].vaginalSkill,0,15), $slaves[$i].oralSkill = Math.clamp($slaves[$i].oralSkill,0,15), $slaves[$i].analSkill = Math.clamp($slaves[$i].analSkill,0,15), $slaves[$i].combatSkill = 0, $slaves[$i].whoreSkill = 0, $slaves[$i].entertainSkill = 0, $slaves[$i].intelligence = -75, $slaves[$i].intelligenceImplant = 0, $slaves[$i].sexualFlaw = "none", $slaves[$i].sexualQuirk = "none", $slaves[$i].behavioralFlaw = "none", $slaves[$i].behavioralQuirk = "none">>
+ <<set $slaves[$i].fetishStrength = 10, $slaves[$i].attrXY = 50, $slaves[$i].attrXX = 50, $slaves[$i].attrKnown = 1, $slaves[$i].devotion = 40, $slaves[$i].trust = -40, $slaves[$i].skill.vaginal = Math.clamp($slaves[$i].skill.vaginal,0,15), $slaves[$i].skill.oral = Math.clamp($slaves[$i].skill.oral,0,15), $slaves[$i].skill.anal = Math.clamp($slaves[$i].skill.anal,0,15), $slaves[$i].skill.combat = 0, $slaves[$i].skill.whore = 0, $slaves[$i].skill.entertainment = 0, $slaves[$i].intelligence = -75, $slaves[$i].intelligenceImplant = 0, $slaves[$i].sexualFlaw = "none", $slaves[$i].sexualQuirk = "none", $slaves[$i].behavioralFlaw = "none", $slaves[$i].behavioralQuirk = "none">>
<<else>>
<<if $slaves[$i].fuckdoll == 0>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 54e041591a318e89f10133c3a2dd03302e7fafd3..fcbf1843199229aa7d18efec6c2988b149fc2cfe 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -106,7 +106,7 @@ serves you this week.
The emotional closeness @@.green;resolves $his hatred of penetration.@@
<<set $slaves[$i].sexualFlaw = "none">>
<</if>>
- <<if ($slaves[$i].vaginalSkill < 100)>>
+ <<if ($slaves[$i].skill.vaginal < 100)>>
After a lot of time spent having vanilla sex, $his vaginal skill improves.
<<VaginalSkillIncrease $slaves[$i]>>
<</if>>
@@ -237,7 +237,7 @@ serves you this week.
$He's devoted enough to derive emotional closeness from buttsex, which @@.green;resolves $his hatred of the act.@@
<<set $slaves[$i].sexualFlaw = "none">>
<</if>>
- <<if ($slaves[$i].analSkill < 100)>>
+ <<if ($slaves[$i].skill.anal < 100)>>
After a lot of time spent getting buttfucked, $his anal skill improves.
<<AnalSkillIncrease $slaves[$i]>>
<</if>>
@@ -381,7 +381,7 @@ serves you this week.
Spending so much time in close proximity to your womanhood @@.green;reconciles $him to serving a pussy.@@
<<set $slaves[$i].behavioralFlaw = "none">>
<</if>>
- <<if ($slaves[$i].oralSkill < 100)>>
+ <<if ($slaves[$i].skill.oral < 100)>>
After a lot of time spent <<if $PC.dick == 1>>sucking you off<<if $PC.vagina == 1>> and eating you out<</if>><<else>>eating you out<</if>>, $his oral skill improves.
<<OralSkillIncrease $slaves[$i]>>
<</if>>
@@ -1053,13 +1053,13 @@ serves you this week.
<<set $slaves[$i].health += 10>>
<</if>>
<<if $slaves[$i].fetish != "mindbroken">>
- <<if ($slaves[$i].oralSkill < 100)>>
+ <<if ($slaves[$i].skill.oral < 100)>>
After a lot of time spent with <<if $PC.dick == 1>>your dick in $his mouth<<else>>$his mouth on your cunt<</if>>, $his oral skill improves.
<<OralSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].vaginalSkill < 100) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
+ <<elseif ($slaves[$i].skill.vaginal < 100) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
After a lot of time spent getting fucked, $his vaginal skill improves.
<<VaginalSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].analSkill < 100) && ($slaves[$i].anus != 0) && canDoAnal($slaves[$i])>>
+ <<elseif ($slaves[$i].skill.anal < 100) && ($slaves[$i].anus != 0) && canDoAnal($slaves[$i])>>
After a lot of time spent taking it up the ass, $his anal skill improves.
<<AnalSkillIncrease $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index f361a51ace0e2ba97d05cfe27eb3959e54b2a9a1..256649b1b23be64e634904e764845f5fec391aec 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -212,7 +212,7 @@
<</if>>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
<<if $arcologies[_j].FSAztecRevivalist != "unset">>
- $He advances Aztec Revivalism there by taking an active part in the bloodier spectacles<<if $slaves[$i].combatSkill >= 1>>, which $he's perfect for, since $he has enough experience with blood to make it look good<<set $arcologies[_j].FSAztecRevivalist++>><</if>>.
+ $He advances Aztec Revivalism there by taking an active part in the bloodier spectacles<<if $slaves[$i].skill.combat >= 1>>, which $he's perfect for, since $he has enough experience with blood to make it look good<<set $arcologies[_j].FSAztecRevivalist++>><</if>>.
<<set $arcologies[_j].FSAztecRevivalist += _influence>>
<</if>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
@@ -222,7 +222,7 @@
<</if>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
<<if $arcologies[_j].FSEdoRevivalist != "unset">>
- $He advances Edo Revivalism there by artfully mixing sexual allure and elegant propriety<<if $slaves[$i].entertainSkill > 95>>, which $he's perfect for, since no slave can claim to better entertain a gentleman caller than $him<<set $arcologies[_j].FSEdoRevivalist++>><</if>>.
+ $He advances Edo Revivalism there by artfully mixing sexual allure and elegant propriety<<if $slaves[$i].skill.entertainment > 95>>, which $he's perfect for, since no slave can claim to better entertain a gentleman caller than $him<<set $arcologies[_j].FSEdoRevivalist++>><</if>>.
<<set $arcologies[_j].FSEdoRevivalist += _influence>>
<</if>>
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
@@ -268,11 +268,11 @@
<<if setup.recruiterCareers.includes($slaves[$i].career)>>
$He has experience in recruitment from before $he was a slave.
<<set $recruiterProgress += 2>>
- <<elseif $slaves[$i].skillRC >= $masteredXP>>
+ <<elseif $slaves[$i].skill.recruiter >= $masteredXP>>
$He has experience in recruitment from working for you.
<<set $recruiterProgress += 2>>
<<else>>
- <<set $slaves[$i].skillRC += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
+ <<set $slaves[$i].skill.recruiter += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
<</if>>
<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 50>>
@@ -280,16 +280,16 @@
<<set $recruiterProgress += 1>>
<</if>>
- <<if $slaves[$i].entertainSkill >= 100>>
+ <<if $slaves[$i].skill.entertainment >= 100>>
$He has the entertainment skills necessary to convince any target.
<<set $recruiterProgress += 2>>
- <<elseif $slaves[$i].entertainSkill > 60>>
+ <<elseif $slaves[$i].skill.entertainment > 60>>
$He has the entertainment expertise to lure in most targets.
<<set $recruiterProgress += 1.5>>
- <<elseif $slaves[$i].entertainSkill > 30>>
+ <<elseif $slaves[$i].skill.entertainment > 30>>
$He has the necessary entertainment skills to banter successfully with $his targets.
<<set $recruiterProgress += 1>>
- <<elseif $slaves[$i].entertainSkill > 10>>
+ <<elseif $slaves[$i].skill.entertainment > 10>>
$His mediocre entertainment skills do nothing to convince $his targets.
<<else>>
$His total lack of entertainment skills seriously hinders $his efforts.
@@ -377,7 +377,7 @@
tries to maintain $his network of prospects without promising anyone a space in $arcologies[0].name, since you already control <<if $slaves.length > _idleTarget>>more sex slaves than<<else>>as many sex slaves as<</if>> $his assigned goal.
<<set _seed = 0>>
- <<set _seed -= (6 - (6*$slaves[$i].entertainSkill/100))>>
+ <<set _seed -= (6 - (6*$slaves[$i].skill.entertainment/100))>>
<<set _seed -= (3 - $slaves[$i].face)>>
<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant < -15>>
<<set _seed = Math.min(_seed, (($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/10)>>
@@ -390,7 +390,7 @@
<</if>>
<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15>>
- <<if $slaves[$i].entertainSkill >= 100>>
+ <<if $slaves[$i].skill.entertainment >= 100>>
$His mastery of flirting and conversation continues to seduce them,
<<if $slaves[$i].face > 95>>
and with $his nearly perfect face they instinctively trust $him.
@@ -417,9 +417,9 @@
<<set _FSIntMod = Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>>
<<if $slaves[$i].face > 40>>
- <<set _seed += $slaves[$i].face*$slaves[$i].entertainSkill/30>>
+ <<set _seed += $slaves[$i].face*$slaves[$i].skill.entertainment/30>>
<<else>>
- <<set _seed += $slaves[$i].entertainSkill/30>>
+ <<set _seed += $slaves[$i].skill.entertainment/30>>
<</if>>
<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15>>
<<set _seed += _FSIntMod>>
@@ -613,7 +613,7 @@
<<set _seed += 1>>
<</if>>
<<elseif $arcologies[0].FSNull != "unset">>
- <<set _seed += (($slaves[$i].entertainSkill/30)*$arcologies[0].FSNull/10)>>
+ <<set _seed += (($slaves[$i].skill.entertainment/30)*$arcologies[0].FSNull/10)>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<if $slaves[$i].clothes == "a toga">>
@@ -661,7 +661,7 @@
<</if>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15 && $HeadGirl != 0 && $Bodyguard != 0 && $HGSuite > 0>>
- <<set _seed += (Math.min((($HeadGirl.entertainSkill/30)+($HeadGirl.intelligenceImplant/10)+$HeadGirl.prestige), 4)+Math.min($Bodyguard.prestige, 1)), _FSdefend++, $arcologies[0].FSChineseRevivalist += 0.03*$FSSingleSlaveRep>>
+ <<set _seed += (Math.min((($HeadGirl.skill.entertainment/30)+($HeadGirl.intelligenceImplant/10)+$HeadGirl.prestige), 4)+Math.min($Bodyguard.prestige, 1)), _FSdefend++, $arcologies[0].FSChineseRevivalist += 0.03*$FSSingleSlaveRep>>
<</if>>
<</if>>
/* and then there's Aztec revivalist, completely forgotten */
@@ -669,21 +669,21 @@
<<run repX(Math.trunc(_seed * 5), "futureSocieties", $slaves[$i])>>
<<if $showEWM == 1>>
- <<if $slaves[$i].entertainSkill > 10>>
+ <<if $slaves[$i].skill.entertainment > 10>>
<<if $slaves[$i].face > 40>>
- <<if $slaves[$i].entertainSkill >= 100>>
+ <<if $slaves[$i].skill.entertainment >= 100>>
$His good looks and innate artistry awe the arcology and leave many starstruck.
- <<elseif $slaves[$i].entertainSkill > 60>>
+ <<elseif $slaves[$i].skill.entertainment > 60>>
$His good looks draw quite an audience; $he entertains them reasonably well.
- <<elseif $slaves[$i].entertainSkill > 30>>
+ <<elseif $slaves[$i].skill.entertainment > 30>>
$His face appeals to a certain crowd, mostly looking for sex tapes rather than quality entertainment.
<</if>>
<<else>>
- <<if $slaves[$i].entertainSkill >= 100>>
+ <<if $slaves[$i].skill.entertainment >= 100>>
All
- <<elseif $slaves[$i].entertainSkill > 60>>
+ <<elseif $slaves[$i].skill.entertainment > 60>>
Many
- <<elseif $slaves[$i].entertainSkill > 30>>
+ <<elseif $slaves[$i].skill.entertainment > 30>>
Some
<<else>>
A few
@@ -932,7 +932,7 @@
<</if>>
<<elseif $arcologies[0].FSNull != "unset">>
$His contribution is one voice among many in the open freedom of $arcologies[0].name's media,
- <<if $slaves[$i].entertainSkill > 10>>
+ <<if $slaves[$i].skill.entertainment > 10>>
but everything that relates to its leadership is usually well-received.
<<else>>
so $his unskilled performances this week hardly cause a ripple.
@@ -1041,7 +1041,7 @@
<</if>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 50 && $HeadGirl != 0 && $Bodyguard != 0 && $HGSuite > 0>>
- <<if (($HeadGirl.entertainSkill/30)+($HeadGirl.intelligenceImplant/10)+$HeadGirl.prestige) >= 4>>
+ <<if (($HeadGirl.skill.entertainment/30)+($HeadGirl.intelligenceImplant/10)+$HeadGirl.prestige) >= 4>>
<<if $Bodyguard.prestige >= 1>>
$He deferentially chronicles the administration of your Imperial household by Head Girl $HeadGirl.slaveName and Bodyguard $Bodyguard.slaveName. The piece explains points of Chinese Revivalist protocol where new slaves or visitors to the Forbidden Penthouse might inadvertently stumble.
<<else>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 2f864ee653c4a0846880d210a28146feab7315d1..253835b25b7d01397a36717a7424f6a13fab69ae 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -1453,15 +1453,15 @@
<</if>>
<<if (_SlaveJ.actualAge - _SlaveI.actualAge > 10) && (_SlaveI.relationship >= 4) && (random(1,300) > (_SlaveI.intelligence) + (_SlaveJ.intelligence)) && (_SlaveJ.devotion > 75) && (_SlaveJ.trust > 50) && (_SlaveJ.intelligence+_SlaveJ.intelligenceImplant > 15) && (_SlaveJ.intelligenceImplant >= 15) && ((_SlaveI.devotion > 20) || ((_SlaveI.devotion >= -20) && (_SlaveI.trust < -20)) || (_SlaveI.trust > -10))>>
- <<if (_SlaveJ.oralSkill > _SlaveI.oralSkill) || ((_SlaveJ.analSkill > _SlaveI.analSkill) && (_SlaveI.anus > 0)) || ((_SlaveJ.vaginalSkill > _SlaveI.vaginalSkill) && (_SlaveI.vagina > 0) && (_SlaveJ.vagina > 0)) || (_SlaveJ.trust > _SlaveI.trust)>>
+ <<if (_SlaveJ.skill.oral > _SlaveI.skill.oral) || ((_SlaveJ.skill.anal > _SlaveI.skill.anal) && (_SlaveI.anus > 0)) || ((_SlaveJ.skill.vaginal > _SlaveI.skill.vaginal) && (_SlaveI.vagina > 0) && (_SlaveJ.vagina > 0)) || (_SlaveJ.trust > _SlaveI.trust)>>
_SlaveI.slaveName's <<if _SlaveI.relationship >= 5>>wife<<else>>lover<</if>> is older, more experienced, and
- <<if (_SlaveJ.oralSkill > _SlaveI.oralSkill)>>
+ <<if (_SlaveJ.skill.oral > _SlaveI.skill.oral)>>
better at blowjobs than $he is. They are such good slaves that the senior _girl2 serves as a mentor to the junior, improving $his oral skills.
<<set $skillIncrease = 5>><<OralSkillIncrease _SlaveI>>
- <<elseif (_SlaveJ.analSkill > _SlaveI.analSkill) && (_SlaveI.anus > 0)>>
+ <<elseif (_SlaveJ.skill.anal > _SlaveI.skill.anal) && (_SlaveI.anus > 0)>>
better at taking a buttfuck than $he is, and they are such good slaves that the senior _girl2 serves as a mentor to the junior, improving $his anal skills.
<<set $skillIncrease = 5>><<AnalSkillIncrease _SlaveI>>
- <<elseif (_SlaveJ.vaginalSkill > _SlaveI.vaginalSkill) && (_SlaveI.vagina > 0) && (_SlaveJ.vagina > 0)>>
+ <<elseif (_SlaveJ.skill.vaginal > _SlaveI.skill.vaginal) && (_SlaveI.vagina > 0) && (_SlaveJ.vagina > 0)>>
a better lover than $he is, and they are such good slaves that the senior _girl2 serves as a mentor to the junior, improving $his vaginal skills.
<<set $skillIncrease = 5>><<VaginalSkillIncrease _SlaveI>>
<<elseif (_SlaveJ.trust > _SlaveI.trust)>>
@@ -1490,98 +1490,21 @@
<</if>>
<<if _SlaveI.mother == $slaves[_j].ID || _SlaveI.father == $slaves[_j].ID || areSisters(_SlaveI, $slaves[_j]) > 0>>
<<if _SlaveI.rivalry != $slaves[_j].ID>>
- <<if _SlaveI.mother == $slaves[_j].ID>>
- _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his mother $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
+ _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his <<print relativeTerm(_SlaveI, $slaves[_j])>> $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
<<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>>
- <<elseif _SlaveI.father == $slaves[_j].ID>>
- _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his father $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
- <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>>
- <<else>>
- <<switch areSisters(_SlaveI, $slaves[_j])>>
- <<case 1>>
- _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his twin sister $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
- <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>>
- <<case 2>>
- _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his sister $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
- <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>>
- <<case 3>>
- _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his half-sister $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
- <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>>
- <</switch>>
- <</if>>
<</if>>
<</if>>
<<else>>
<<if totalRelatives(_SlaveI) > 0>>
- <<if _SlaveI.mother == $slaves[_j].ID>>
- _SlaveI.slaveName knows that $his mother $slaves[_j].slaveName
- <<if $slaves[_j].devotion > 50>>
- loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
- <<set _SlaveI.devotion += 4>>
- <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>>
- is an obedient sex slave, and hopes _he2'll avoid punishment.
- <<else>>
- hates being a sex slave, and is @@.gold;afraid@@ for _him2.
- <<set _SlaveI.trust -= 1>>
- <</if>>
- <<elseif _SlaveI.father == $slaves[_j].ID>>
- _SlaveI.slaveName knows that $his father $slaves[_j].slaveName
- <<if $slaves[_j].devotion > 50>>
- loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
- <<set _SlaveI.devotion += 4>>
- <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>>
- is an obedient sex slave, and hopes _he2'll avoid punishment.
- <<else>>
- hates being a sex slave, and is @@.gold;afraid@@ for _him2.
- <<set _SlaveI.trust -= 1>>
- <</if>>
- <<elseif $slaves[_j].mother == _SlaveI.ID || $slaves[_j].father == _SlaveI.ID>>
- _SlaveI.slaveName knows that $his daughter $slaves[_j].slaveName
- <<if $slaves[_j].devotion > 50>>
- loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
- <<set _SlaveI.devotion += 4>>
- <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>>
- is an obedient sex slave, and hopes _he2'll avoid punishment.
- <<else>>
- hates being a sex slave, and is @@.gold;afraid@@ for _him2.
- <<set _SlaveI.trust -= 1>>
- <</if>>
+ _SlaveI.slaveName knows that $his <<print relativeTerm(_SlaveI, $slaves[_j])>> $slaves[_j].slaveName
+ <<if $slaves[_j].devotion > 50>>
+ loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
+ <<set _SlaveI.devotion += 4>>
+ <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>>
+ is an obedient sex slave, and hopes _he2'll avoid punishment.
<<else>>
- <<switch areSisters(_SlaveI, $slaves[_j])>>
- <<case 1>>
- _SlaveI.slaveName knows that $his twin sister $slaves[_j].slaveName
- <<if $slaves[_j].devotion > 50>>
- loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
- <<set _SlaveI.devotion += 4>>
- <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>>
- is an obedient sex slave, and hopes _he2'll avoid punishment.
- <<else>>
- hates being a sex slave, and is @@.gold;afraid@@ for _him2.
- <<set _SlaveI.trust -= 1>>
- <</if>>
- <<case 2>>
- _SlaveI.slaveName knows that $his sister $slaves[_j].slaveName
- <<if $slaves[_j].devotion > 50>>
- loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
- <<set _SlaveI.devotion += 4>>
- <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>>
- is an obedient sex slave, and hopes _he2'll avoid punishment.
- <<else>>
- hates being a sex slave, and is @@.gold;afraid@@ for _him2.
- <<set _SlaveI.trust -= 1>>
- <</if>>
- <<case 3>>
- _SlaveI.slaveName knows that $his half-sister $slaves[_j].slaveName
- <<if $slaves[_j].devotion > 50>>
- loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
- <<set _SlaveI.devotion += 4>>
- <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>>
- is an obedient sex slave, and hopes _he2'll avoid punishment.
- <<else>>
- hates being a sex slave, and is @@.gold;afraid@@ for _him2.
- <<set _SlaveI.trust -= 1>>
- <</if>>
- <</switch>>
+ hates being a sex slave, and is @@.gold;afraid@@ for _him2.
+ <<set _SlaveI.trust -= 1>>
<</if>>
<</if>>
<</if>>
@@ -1596,15 +1519,15 @@
<<setLocalPronouns $slaves[_K] 2>>
_SlaveI.slaveName
<<if _SlaveI.trust < -20>>
- <<if _SlaveI.relation == "mother">>
+ <<if _SlaveI.relation == "mother" || _SlaveI.relation == "father">>
is @@.gold;agonizingly aware@@ that $his child $slaves[_K].slaveName is also your slave and might suffer if either of them angers you, and @@.hotpink;does $his best@@ to protect _him2.
<<set _SlaveI.trust -= 4, _SlaveI.devotion += 4>>
<<else>>
- is @@.gold;painfully conscious@@ that $his <<if _SlaveI.relation == "daughter">>mother<<else>>_SlaveI.relation<</if>> $slaves[_K].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
+ is @@.gold;painfully conscious@@ that $his <<print relativeTerm(_SlaveI, $slaves[_K])>> $slaves[_K].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
<<set _SlaveI.trust -= 2, _SlaveI.devotion += 2>>
<</if>>
<<else>>
- knows that $his <<if _SlaveI.relation == "mother">>daughter<<elseif _SlaveI.relation == "daughter">>mother<<else>>_SlaveI.relation<</if>> $slaves[_K].slaveName
+ knows that $his <<print relativeTerm(_SlaveI, $slaves[_K])>> $slaves[_K].slaveName
<<if $slaves[_K].devotion > 50>>
loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
<<set _SlaveI.devotion += 2>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 09d25c62049bf8417a891b0d5cab9fe5780bb57c..7193e0894d07753ea407f04562d2bbb579259d5c 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -1822,7 +1822,7 @@
<<else>>
<<if $slaves[_FLs].lips > 40>>
luscious lips.
- <<elseif $slaves[_FLs].oralSkill > 30>>
+ <<elseif $slaves[_FLs].skill.oral > 30>>
skilled tongue.
<<else>>
willing mouth.
@@ -2319,7 +2319,7 @@
<<else>>
<<if $slaves[_FLs].lips > 40>>
luscious lips.
- <<elseif $slaves[_FLs].oralSkill > 30>>
+ <<elseif $slaves[_FLs].skill.oral > 30>>
skilled tongue.
<<else>>
willing mouth.
@@ -5486,4 +5486,4 @@
<</switch>>
<</if>> /* closes mindbreak exemption */
-<</if>> /* closes fuckdoll exemption */
\ No newline at end of file
+<</if>> /* closes fuckdoll exemption */
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index 76f043b31fe66e5646d9f6f23db6315eb286bb78..585271086e37d52712c003e5ee61a240892d57b4 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -148,41 +148,41 @@
Since $he is wanting in basic obedience, $he suffers through courses on @@.hotpink;$his place@@ in the Free Cities world.
<<set $slaves[$i].devotion += 10>>
<<set _seed = 1>>
- <<elseif ($slaves[$i].oralSkill <= 10)>>
+ <<elseif ($slaves[$i].skill.oral <= 10)>>
Since $he is orally incompetent, $he is taught basic gag reflex suppression exercises and other simple oral things.
<<OralSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
+ <<elseif ($slaves[$i].skill.vaginal <= 10) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
Since $he is unskilled at using $his pussy, $he is taught Kegel exercises and other simple vaginal skills.
<<VaginalSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina >= 0)>>
+ <<elseif ($slaves[$i].skill.vaginal <= 10) && ($slaves[$i].vagina >= 0)>>
Since $he is unskilled at using $his pussy and not permitted to learn through practice, $he is taught Kegel exercises, vaginal basics and several new positions.
<<VaginalSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus > 0) && canDoAnal($slaves[$i])>>
+ <<elseif ($slaves[$i].skill.anal <= 10) && ($slaves[$i].anus > 0) && canDoAnal($slaves[$i])>>
Since $he is a novice at taking it up $his butt, $he is taught relaxation exercises and other simple anal basics.
<<AnalSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus >= 0)>>
+ <<elseif ($slaves[$i].skill.anal <= 10) && ($slaves[$i].anus >= 0)>>
Since $he is a novice at taking it up $his butt and not permitted to learn through practice, $he is taught relaxation exercises and other simple anal basics.
<<AnalSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].whoreSkill <= 10)>>
+ <<elseif ($slaves[$i].skill.whore <= 10)>>
Since $he has little idea what's involved in selling $his body, $he is taught basic safety practices and other simple prostitution skills.
<<WhoreSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].entertainSkill <= 10)>>
+ <<elseif ($slaves[$i].skill.entertainment <= 10)>>
Since $his entertainment value is limited to $his holes, $he is taught simple conversational skills and other courtesan's essentials.
<<EntertainSkillIncrease $slaves[$i]>>
<<elseif ($schoolroomUpgradeSkills == 1)>>
- <<if ($slaves[$i].oralSkill <= 30)>>
+ <<if ($slaves[$i].skill.oral <= 30)>>
Having completed the basic sex slave curriculum, $he studies more advanced ways to use $his lips and tongue to please cocks, cunts, and asses.
<<OralSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].whoreSkill <= 30)>>
+ <<elseif ($slaves[$i].skill.whore <= 30)>>
Having completed the basic sex slave curriculum, $he studies intermediate prostitution, including how to stay as safe as possible and maximize $his efficiency.
<<WhoreSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].entertainSkill <= 30)>>
+ <<elseif ($slaves[$i].skill.entertainment <= 30)>>
Having completed the basic sex slave curriculum, $he studies courtesanship, including social dynamics and flirtation more subtle than straightforward begging for sex.
<<EntertainSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].vaginalSkill <= 30) && ($slaves[$i].vagina >= 0)>>
+ <<elseif ($slaves[$i].skill.vaginal <= 30) && ($slaves[$i].vagina >= 0)>>
Having completed the basic sex slave curriculum, $he studies more advanced techniques and exotic positions to make use of $his <<if $slaves[$i].vagina == 0>>virgin pussy for use in $his first time<<else>>pussy<</if>>.
<<VaginalSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].analSkill <= 30)>>
+ <<elseif ($slaves[$i].skill.anal <= 30)>>
Having completed the basic sex slave curriculum, $he studies more advanced techniques and exotic positions to make use of $his <<if $slaves[$i].vagina == 0>>virgin ass for use in $his first time<<else>>ass<</if>>.
<<AnalSkillIncrease $slaves[$i]>>
<</if>>
@@ -244,11 +244,11 @@
<<if ($slaves[$i].intelligenceImplant >= 15) && ($slaves[$i].assignment == "take classes")>>
<<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>>
- <<if ($slaves[$i].oralSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].oralSkill > 10))>>
- <<if ($slaves[$i].whoreSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].whoreSkill > 10))>>
- <<if ($slaves[$i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].entertainSkill > 10))>>
- <<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>>
- <<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>>
+ <<if ($slaves[$i].skill.oral > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.oral > 10))>>
+ <<if ($slaves[$i].skill.whore > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.whore > 10))>>
+ <<if ($slaves[$i].skill.entertainment > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.entertainment > 10))>>
+ <<if ($slaves[$i].skill.anal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.anal > 10))>>
+ <<if ($slaves[$i].skill.vaginal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.vaginal > 10)) || ($slaves[$i].vagina < 0)>>
$He can learn little from further classes, so @@.yellow;$his assignment has defaulted to rest.@@
<<= removeJob($slaves[$i], "take classes")>>
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 888112f4dc6c7eadfbddc200d2821d36627ddcf4..9317e503d194521f43ffe3146ca886e8c47c2524 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -270,23 +270,23 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<<set $injury = 1>>
<<elseif ($slaves[$i].vagina < 0)>>
<<set $desc = SlaveTitle($slaves[$i])>>
- <<if (($slaves[$i].analSkill + $slaves[$i].oralSkill) >= 200)>>
+ <<if (($slaves[$i].skill.anal + $slaves[$i].skill.oral) >= 200)>>
$He's such an expert whore that $he copes with the stress of being a $desc prostitute.
- <<elseif random(1,100) > 40+(10*($slaves[$i].analSkill + $slaves[$i].oralSkill))>>
+ <<elseif random(1,100) > 40+(10*($slaves[$i].skill.anal + $slaves[$i].skill.oral))>>
The stress of being a $desc prostitute is @@.red;hard on $him.@@
<<set $slaves[$i].health -= 7>>
<<set $injury = 1>>
<</if>>
<<elseif ($slaves[$i].chastityVagina) && canDoAnal($slaves[$i])>>
- <<if (($slaves[$i].analSkill + $slaves[$i].oralSkill) >= 200)>>
+ <<if (($slaves[$i].skill.anal + $slaves[$i].skill.oral) >= 200)>>
$He's such an expert whore that $he copes with the stress of being limited to buttsex and oral.
- <<elseif random(1,100) > 40+(10*($slaves[$i].analSkill + $slaves[$i].oralSkill))>>
+ <<elseif random(1,100) > 40+(10*($slaves[$i].skill.anal + $slaves[$i].skill.oral))>>
The stress of being limited to buttsex and oral is @@.red;hard on $him.@@
<<set $slaves[$i].health -= 7>>
<<set $injury = 1>>
<</if>>
-<<elseif ($slaves[$i].analSkill + $slaves[$i].oralSkill + $slaves[$i].vaginalSkill) < 300>>
- <<if random(1,100) > 10+(($slaves[$i].analSkill + $slaves[$i].oralSkill + $slaves[$i].vaginalSkill)/10)>>
+<<elseif ($slaves[$i].skill.anal + $slaves[$i].skill.oral + $slaves[$i].skill.vaginal) < 300>>
+ <<if random(1,100) > 10+(($slaves[$i].skill.anal + $slaves[$i].skill.oral + $slaves[$i].skill.vaginal)/10)>>
<<set $injury = 1>>
<</if>>
<</if>>
@@ -339,7 +339,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<<set $FResult += 10>>
<</if>>
<<elseif ($slaves[$i].vagina < 3)>>
- <<if (random(1,100) > ((170-$beauty)+($slaves[$i].vagina*10)+($slaves[$i].vaginalSkill/3)))>>
+ <<if (random(1,100) > ((170-$beauty)+($slaves[$i].vagina*10)+($slaves[$i].skill.vaginal/3)))>>
@@.lime;$His pussy gets loosened by the intense use.@@
<<set $slaves[$i].vagina += 1>>
<</if>>
@@ -367,17 +367,17 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<</if>>
<<elseif ($slaves[$i].anus < 3)>>
<<if ($slaves[$i].vagina < 0)>>
- <<if ((random(1,100) > ((150-$beauty)+($slaves[$i].anus*10)+($slaves[$i].analSkill/6))))>>
+ <<if ((random(1,100) > ((150-$beauty)+($slaves[$i].anus*10)+($slaves[$i].skill.anal/6))))>>
@@.lime;$His asshole sees constant use in place of a pussy and loosens.@@
<<set $slaves[$i].anus += 1>>
<</if>>
<<elseif ($slaves[$i].chastityVagina)>>
- <<if ((random(1,100) > ((150-$beauty)+($slaves[$i].anus*10)+($slaves[$i].analSkill/6))))>>
+ <<if ((random(1,100) > ((150-$beauty)+($slaves[$i].anus*10)+($slaves[$i].skill.anal/6))))>>
@@.lime;$His asshole sees constant use in place of $his protected pussy and loosens.@@
<<set $slaves[$i].anus += 1>>
<</if>>
<<else>>
- <<if ((random(1,100) > ((160-$beauty)+($slaves[$i].anus*10)+($slaves[$i].analSkill/6))))>>
+ <<if ((random(1,100) > ((160-$beauty)+($slaves[$i].anus*10)+($slaves[$i].skill.anal/6))))>>
@@.lime;$His asshole loosens with constant use.@@
<<set $slaves[$i].anus += 1>>
<</if>>
@@ -385,34 +385,34 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<</if>>
<</if>>
-<<if !setup.whoreCareers.includes($slaves[$i].career) && $slaves[$i].skillW < $masteredXP>>
- <<set $slaves[$i].skillW += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
+<<if !setup.whoreCareers.includes($slaves[$i].career) && $slaves[$i].skill.whore < $masteredXP>>
+ <<set $slaves[$i].skill.whore += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
<</if>>
<<if setup.whoreCareers.includes($slaves[$i].career)>>
$He has sex work experience from $his life before $he was a slave, making $him more effective.
-<<elseif $slaves[$i].skillW >= $masteredXP>>
+<<elseif $slaves[$i].skill.whore >= $masteredXP>>
$He has experience as a prostitute from working for you, making $him more effective.
<</if>>
<<if ($slaves[$i].devotion > 20)>>
<<elseif !canWalk($slaves[$i])>>
Since $he can't walk, $he spends all of $his time in $his own room in the brothel. Customers come in, fuck $him, and leave.
- <<if ($slaves[$i].whoreSkill <= 10)>>
- <<elseif ($slaves[$i].whoreSkill <= 30)>>
+ <<if ($slaves[$i].skill.whore <= 10)>>
+ <<elseif ($slaves[$i].skill.whore <= 30)>>
As a skilled prostitute, $he gets a little more money out of customers.
- <<elseif ($slaves[$i].whoreSkill <= 60)>>
+ <<elseif ($slaves[$i].skill.whore <= 60)>>
As an expert prostitute, $he gets more money out of customers.
- <<elseif ($slaves[$i].whoreSkill >= 100)>>
+ <<elseif ($slaves[$i].skill.whore >= 100)>>
As a masterful prostitute, $he makes more money.
<</if>>
<</if>>
<<if ($slaves[$i].amp != 1)>>
- <<if ($slaves[$i].whoreSkill < 100)>>
- <<set $slaves[$i].whoreSkill += 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>>
+ <<if ($slaves[$i].skill.whore < 100)>>
+ <<set $slaves[$i].skill.whore += 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>>
$He @@.green;gains experience as a public slut,@@ and gets better at
- <<if ($slaves[$i].whoreSkill <= 30)>>
+ <<if ($slaves[$i].skill.whore <= 30)>>
basic street smarts.
- <<elseif ($slaves[$i].whoreSkill <= 60)>>
+ <<elseif ($slaves[$i].skill.whore <= 60)>>
steering clients to more lucrative sex acts.
<<else>>
squeezing johns for every penny.
@@ -433,7 +433,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<<set $slaves[$i].devotion += 4>>
<</if>>
<<else>>
- <<if ($slaves[$i].oralSkill + $slaves[$i].analSkill >= 200) && (($slaves[$i].vaginalSkill >= 100) || !canDoVaginal($slaves[$i]))>>
+ <<if ($slaves[$i].skill.oral + $slaves[$i].skill.anal >= 200) && (($slaves[$i].skill.vaginal >= 100) || !canDoVaginal($slaves[$i]))>>
$He's a @@.aquamarine;sexual master@@
<<if canDoVaginal($slaves[$i])>>
whose
@@ -467,7 +467,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<</if>>
<</if>>
<<if ($slaves[$i].amp != 1)>>
- <<if ($slaves[$i].whoreSkill < 100)>>
+ <<if ($slaves[$i].skill.whore < 100)>>
$He gains experience as a prostitute.
<<set $skillIncrease = 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>>
<<WhoreSkillIncrease $slaves[$i]>>
@@ -1047,13 +1047,13 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<<if ($slaves[$i].sexualFlaw == "none")>>
<<if $slaves[$i].devotion < 10>>
<<if random(1,100) > 70>>
-<<if ($slaves[$i].vaginalSkill <= 30) && canDoVaginal($slaves[$i])>>
+<<if ($slaves[$i].skill.vaginal <= 30) && canDoVaginal($slaves[$i])>>
After being fucked too hard too often, $he now @@.red;dislikes being penetrated.@@
<<set $slaves[$i].sexualFlaw = "hates penetration">>
-<<elseif ($slaves[$i].analSkill <= 30) && canDoAnal($slaves[$i])>>
+<<elseif ($slaves[$i].skill.anal <= 30) && canDoAnal($slaves[$i])>>
After so much anal pain, $he now @@.red;dislikes being buttfucked.@@
<<set $slaves[$i].sexualFlaw = "hates anal">>
-<<elseif ($slaves[$i].oralSkill <= 30)>>
+<<elseif ($slaves[$i].skill.oral <= 30)>>
After one too many facials, $he now @@.red;dislikes sucking cock.@@
<<set $slaves[$i].sexualFlaw = "hates oral">>
<</if>>
@@ -1062,8 +1062,8 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<</if>>
In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FResult))>>@@ for the use of $slaves[$i].slaveName's body this week.
-<<set _cashX = Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].whoreSkill)))>>
-<<set _incomeStats.income += Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].whoreSkill)))>>
+<<set _cashX = Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].skill.whore)))>>
+<<set _incomeStats.income += Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].skill.whore)))>>
<<if $slaves[$i].assignment == "work in the brothel">>
<<run cashX(_cashX, "whoreBrothel", $slaves[$i])>>
@@ -1133,16 +1133,16 @@ In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FR
/* SEX ACT COUNTS AND SEXUAL SATISFACTION */
-<<set _oralUse = $oralUseWeight+($slaves[$i].oralSkill/30)+($slaves[$i].lips/20)>>
+<<set _oralUse = $oralUseWeight+($slaves[$i].skill.oral/30)+($slaves[$i].lips/20)>>
<<set _analUse = 0>>
-<<if canDoAnal($slaves[$i])>><<set _analUse = $analUseWeight+($slaves[$i].analSkill/30)-$slaves[$i].anus>><</if>>
+<<if canDoAnal($slaves[$i])>><<set _analUse = $analUseWeight+($slaves[$i].skill.anal/30)-$slaves[$i].anus>><</if>>
<<set _vaginalUse = 0>>
-<<if canDoVaginal($slaves[$i])>><<set _vaginalUse = $vaginalUseWeight+($slaves[$i].vaginalSkill/30)-$slaves[$i].vagina>><</if>>
+<<if canDoVaginal($slaves[$i])>><<set _vaginalUse = $vaginalUseWeight+($slaves[$i].skill.vaginal/30)-$slaves[$i].vagina>><</if>>
<<set _mammaryUse = 0>>
<<if $slaves[$i].boobs > 10000>><<set _mammaryUse += 5+$mammaryUseWeight>><<elseif $slaves[$i].boobs > 2000>><<set _mammaryUse += $mammaryUseWeight+($slaves[$i].boobs/2000)>><</if>>
<<if $slaves[$i].nipples == "fuckable">><<set _mammaryUse = _mammaryUse*2>><</if>>
<<set _penetrativeUse = 0>>
-<<if canDoVaginal($slaves[$i]) && $slaves[$i].clit > 1>><<set _penetrativeUse += $penetrativeUseWeight+($slaves[$i].vaginalSkill/30)+$slaves[$i].clit>><</if>>
+<<if canDoVaginal($slaves[$i]) && $slaves[$i].clit > 1>><<set _penetrativeUse += $penetrativeUseWeight+($slaves[$i].skill.vaginal/30)+$slaves[$i].clit>><</if>>
<<if $slaves[$i].dick>>
<<if canPenetrate($slaves[$i])>>
<<set _penetrativeUse += $penetrativeUseWeight+$slaves[$i].dick+Math.min($slaves[$i].balls,10)/4>>
diff --git a/src/uncategorized/saWorkAGloryHole.tw b/src/uncategorized/saWorkAGloryHole.tw
index f236dbb22b92491d5ff30ffe81ac81355aa8015b..4579a84506742c28a926b0cfe2f9e14722471c3e 100644
--- a/src/uncategorized/saWorkAGloryHole.tw
+++ b/src/uncategorized/saWorkAGloryHole.tw
@@ -83,13 +83,13 @@ is <<if $slaves[$i].fuckdoll == 0>>restrained in a glory hole<<else>>set out for
$He serves $his role as a mindless set of holes to perfection.
<<else>>
<<set $skillIncrease = 5>>
- <<if ($slaves[$i].oralSkill <= 10)>>
+ <<if ($slaves[$i].skill.oral <= 10)>>
With $his throat being brutally used, $his gag reflex is suppressed and $his oral skills improve.
<<OralSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].vaginalSkill <= 10) && (canDoVaginal($slaves[$i]))>>
+ <<elseif ($slaves[$i].skill.vaginal <= 10) && (canDoVaginal($slaves[$i]))>>
With $his pussy being harshly used, $his vaginal skills improve.
<<VaginalSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].analSkill <= 10) && (canDoAnal($slaves[$i]))>>
+ <<elseif ($slaves[$i].skill.anal <= 10) && (canDoAnal($slaves[$i]))>>
With $his butt being mercilessly fucked, $his anal skills improve.
<<AnalSkillIncrease $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 84b316bf113b3b8843395c58901f96dbd22964cd..5cb722470de838864a2baeec7cca8ab9760a95f2 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -607,11 +607,6 @@ Treat nails:
<</if>>
/* SKIN */
-
-<<set $tannableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "extremely pale"]>>
-<<set $lightenableSkin = ["natural", "dark", "dark olive", "black", "brown", "dark brown", "tanned"]>>
-<<set $bleachableSkin = ["natural", "lightened", "pale", "fair", "light"]>>
-<<set $darkenableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "extremely pale", "light olive", "tanned", "brown", "dark brown"]>>
<<set $dyedSkin = ["dyed red", "dyed green", "dyed blue", "dyed pink", "dyed gray", "tiger striped", "camouflage patterned"]>>
<br><br>
@@ -619,31 +614,53 @@ $His skin is $activeSlave.skin.
<<if ($dyedSkin.indexOf($activeSlave.skin) != -1)>>
[[Remove coloring|Salon][$activeSlave.skin = $activeSlave.origSkin,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+<<elseif (($activeSlave.skin == "sun tanned") || ($activeSlave.skin == "spray tanned"))>>
+ [[Remove tanning|Salon][$activeSlave.skin = $activeSlave.origSkin,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
<<if ($dyedSkin.indexOf($activeSlave.skin) == -1)>>
<br>
- Change skin tone:
- <<set _needsSpacers = 0>>
- <<if ($bleachableSkin.indexOf($activeSlave.skin) != -1)>>
- <<if _needsSpacers == 1>> | <</if>>
- [[Bleach|Salon][$activeSlave.skin = "pale",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- <<set _needsSpacers = 1>>
- <</if>>
- <<if ($lightenableSkin.indexOf($activeSlave.skin) != -1)>>
- <<if _needsSpacers == 1>> | <</if>>
- [[Lighten|Salon][$activeSlave.skin = "lightened",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- <<set _needsSpacers = 1>>
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>
+ $His skin tanning must be removed before any advanced procedure to change $his skin color.
+ <<else>>
+ Change skin tone:
+ <<set _needsSpacers = 0>>
+ <<if (skinToneLevel($activeSlave.skin) > 1)>>
+ <<if _needsSpacers == 1>> | <</if>>
+ [[Bleach|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
+ <<if (skinToneLevel($activeSlave.skin) > 8)>>
+ <<if _needsSpacers == 1>> | <</if>>
+ [[Lighten|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
+ <<if (skinToneLevel($activeSlave.skin) < 18)>>
+ <<if _needsSpacers == 1>> | <</if>>
+ [[Darken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
+ <<if (skinToneLevel($activeSlave.skin) < 25)>>
+ <<if _needsSpacers == 1>> | <</if>>
+ [[Blacken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
<</if>>
- <<if ($tannableSkin.indexOf($activeSlave.skin) != -1)>>
- <<if _needsSpacers == 1>> | <</if>>
- [[Tan|Salon][$activeSlave.skin = "tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- <<set _needsSpacers = 1>>
+ <br>
+ <<set _needsSpacers = 0>>
+ <<if ($activeSlave.skin != "sun tanned")>>
+ <<if (skinToneLevel($activeSlave.skin) < 6)>>
+ $His skin is so light in color that any attempt at natural tanning is more likely to damage $his skin.
+ <<elseif (skinToneLevel($activeSlave.skin) > 20)>>
+ $His skin is so dark in color that any attempt at natural tanning is not likely to appear on $his skin.
+ <<else>>
+ [["Sun tan " + $his + " skin"|Salon][$activeSlave.skin = "sun tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
<</if>>
- <<if ($darkenableSkin.indexOf($activeSlave.skin) != -1)>>
+ <<if ($activeSlave.skin != "spray tanned")>>
<<if _needsSpacers == 1>> | <</if>>
- [[Darken|Salon][$activeSlave.skin = "dark",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- <<set _needsSpacers = 1>>
+ [["Spray tan " + $his + " skin"|Salon][$activeSlave.skin = "spray tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
<</if>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 4c970bb6958defcc293cd5bfa06bd162d148d7ee..39912e08d1cd98e873a902efef106d8321cd085a 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -53,11 +53,11 @@
<<if setup.schoolteacherCareers.includes($Schoolteacher.career)>>
$He has experience with students and learning from $his life before $he was a slave, making $him more effective.
<<set _idleBonus++>>
- <<elseif $Schoolteacher.skillTE >= $masteredXP>>
+ <<elseif $Schoolteacher.skill.teacher >= $masteredXP>>
$He has experience with students and learning from working for you, making $him more effective.
<<set _idleBonus++>>
<<else>>
- <<set $slaves[_FLs].skillTE += random(1,Math.ceil(($Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.teacher += random(1,Math.ceil(($Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Schoolteacher.visualAge > 35)>>
$His age earns $him the respect of $his students.
@@ -168,11 +168,11 @@
<<else>>
<<if ($slaves[$i].intelligenceImplant >= 30)>>
<<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>>
- <<if ($slaves[$i].oralSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].oralSkill > 10))>>
- <<if ($slaves[$i].whoreSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].whoreSkill > 10))>>
- <<if ($slaves[$i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].entertainSkill > 10))>>
- <<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>>
- <<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>>
+ <<if ($slaves[$i].skill.oral > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.oral > 10))>>
+ <<if ($slaves[$i].skill.whore > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.whore > 10))>>
+ <<if ($slaves[$i].skill.entertainment > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.entertainment > 10))>>
+ <<if ($slaves[$i].skill.anal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.anal > 10))>>
+ <<if ($slaves[$i].skill.vaginal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.vaginal > 10)) || ($slaves[$i].vagina < 0)>>
<br><br>''__@@.pink;$slaves[$i].slaveName@@__'' can learn little from further classes, so @@.yellow;_his2 assignment has defaulted to rest.@@
<<= removeJob($slaves[$i], "learn in the schoolroom")>>
<<set _restedSlaves++, _dI--, _DL-->>
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index e7a6ede6040706635d299ec35f6de1ba3dfabb3a..fc6332ad0f1fb969fd07a2eef03cd99cb9cc5a50 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -108,10 +108,10 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlave.analCount += 1, $analTotal += 1>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.weight = random(-50,50)>>
<<elseif $origin == "heavily pregnant">>
<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
@@ -126,10 +126,10 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlave.pregKnown = 1, $activeSlave.pregType = 1, $activeSlave.pregWeek = $activeSlave.preg>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.weight = random(-20,100)>>
<<set $activeSlave.career = setup.youngCareers.random()>>
<<elseif $origin == "housewife">>
@@ -148,10 +148,10 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlave.analCount += 1, $analTotal += 1>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.vaginalSkill = 35>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 35>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 35>>
<<set $activeSlave.career = either("a housewife", "a trophy wife")>>
<<set $activeSlave.weight = random(-50,100)>>
<<elseif $origin == "disobedient young">>
@@ -163,10 +163,10 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlave.analCount += 1, $analTotal += 1>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 15>>
<<set $activeSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration", "idealistic")>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>>
<<set $activeSlave.energy = 10>>
@@ -181,9 +181,9 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlave.analCount += 1, $analTotal += 1>>
<<set $activeSlave.dick = random(2,4)>>
<<set $activeSlave.balls = random(2,4)>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.sexualFlaw = either("hates oral", "hates anal", "hates penetration")>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>>
<<set $activeSlave.attrXY = 0>>
@@ -200,9 +200,9 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlave.balls = 5>>
<<set $activeSlave.scrotum = 5>>
<<set $activeSlave.dick = random(3,5)>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<set $activeSlave.weight = random(-50,100)>>
<<elseif $origin == "feminized">>
<<set $activeSlaveOneTimeMaxAge = 25>>
@@ -218,9 +218,9 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlave.analCount += 1, $analTotal += 1>>
<<set $activeSlave.balls = random(0,1)>>
<<set $activeSlave.dick = random(1,2)>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 35>>
- <<set $activeSlave.whoreSkill = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 35>>
+ <<set $activeSlave.skill.whore = 15>>
<<set $activeSlave.attrXY = 100>>
<<set $activeSlave.attrXX = 0>>
<<set $activeSlave.weight = random(-100,200)>>
@@ -408,4 +408,4 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<</for>>
</table>
<br><br>
-</span>
\ No newline at end of file
+</span>
diff --git a/src/uncategorized/seCoursingRace.tw b/src/uncategorized/seCoursingRace.tw
index 89457ed5cc73c9a4a3ec3730689db927500e1f0a..573f80518be217d925109e5e175ad4d1cf504c54 100644
--- a/src/uncategorized/seCoursingRace.tw
+++ b/src/uncategorized/seCoursingRace.tw
@@ -163,7 +163,7 @@ You place your hand on the leash's quick release and <<if canHear($Lurcher)>>whi
One of $his rival lurchers has the same idea, however, and tries to trip $him up.
<<if !canSee($Lurcher)>>
Unable to see it coming, $he goes down with a crash; $his course is over.
- <<elseif $Lurcher.combatSkill == 1>>
+ <<elseif $Lurcher.skill.combat == 1>>
$He parries the attempt with contemptuous ease and catches up to $his new target.
<<set _seed = 1>>
<<elseif $Lurcher.muscles > 30>>
@@ -188,7 +188,7 @@ You place your hand on the leash's quick release and <<if canHear($Lurcher)>>whi
$His quarry is unwilling to be tackled, probably out of fear for _his2 baby, and flings _himself2 down as soon as $Lurcher.slaveName gets near.<<if !canSee($Lurcher)>> _He2 screams as _he2 sees $Lurcher.slaveName preparing to dive on _him2, alerting the blind lurcher that $his prey has already surrendered.<</if>>
<<elseif !canSee($Lurcher) && random(1,3) == 1>>
$His prey takes advantage of $his lack of eyesight, baiting $Lurcher.slaveName to dive in the wrong direction. As $he rises to $his feet, the slave is too far gone to make another lunge. $Lurcher.slaveName's course is over.
- <<elseif $Lurcher.combatSkill == 1>>
+ <<elseif $Lurcher.skill.combat == 1>>
$His tackle is expert: $he wraps $his quarry up and pulls _him2 down, falling on top of the struggling body.
<<elseif $Lurcher.muscles > 30>>
$He's burly enough that $he tackles $his quarry by simple force, an approach no less effective for its inelegance.
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 3bb2b3d3f1b29a48fbc24b99880c36c2834d61ac..e5f233517eab1e5f55493da0355365e3b4fa835c 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -123,7 +123,7 @@
<</if>>
<<set $activeSlave.labia = $customSlave.labia>>
<<set $activeSlave.vaginaLube = $customSlave.vaginaLube>>
- <<set $activeSlave.vaginalSkill = $customSlave.skills>>
+ <<set $activeSlave.skill.vaginal = $customSlave.skills>>
<<if $customSlave.sex == 3>>
<<set $activeSlave.dick = $customSlave.dick>>
<<set $activeSlave.balls = $customSlave.balls>>
@@ -186,11 +186,11 @@
<</if>>
<<set $activeSlave.boobs = $customSlave.boobs>>
<<set $activeSlave.butt = $customSlave.butt>>
-<<set $activeSlave.analSkill = $customSlave.skills>>
-<<set $activeSlave.oralSkill = $customSlave.skills>>
-<<set $activeSlave.entertainSkill = $customSlave.whoreSkills>>
-<<set $activeSlave.whoreSkill = $customSlave.whoreSkills>>
-<<set $activeSlave.combatSkill = $customSlave.combatSkills>>
+<<set $activeSlave.skill.anal = $customSlave.skills>>
+<<set $activeSlave.skill.oral = $customSlave.skills>>
+<<set $activeSlave.skill.entertainment = $customSlave.skill.whores>>
+<<set $activeSlave.skill.whore = $customSlave.skill.whores>>
+<<set $activeSlave.skill.combat = $customSlave.skill.combats>>
<<set $activeSlave.eyes = $customSlave.eyes>>
<<set $activeSlave.hears = $customSlave.hears>>
<<set $activeSlave.smells = $customSlave.smells>>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index ef71a04792505f6aa29a2c9b3521e0dd8532d266..9a79351612b4d7cbb1f30b8ba298fd80796b4236 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -83,7 +83,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<if $cash > 1000>>
<<link "Enslave $him">>
<<replace "#result">>
- $He's beside $himself with joy when you accept $his plea and enslave $him. $He's given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt. $His <<= App.Desc.EyeColor>> eyes <<if canSee($activeSlave)>>watch you<<else>>are wide<</if>> with eager anticipation, radiating gladness that the prospect of separation from you has gone.
+ $He's beside $himself with joy when you accept $his plea and enslave $him. $He's given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt. $His <<= App.Desc.eyeColor>> eyes <<if canSee($activeSlave)>>watch you<<else>>are wide<</if>> with eager anticipation, radiating gladness that the prospect of separation from you has gone.
<<set $activeSlave.indenture = -1, $activeSlave.indentureRestrictions = 0>>
<<run cashX(-1000, "event", $activeSlave)>>
<<set $lowerClass -= 1>>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index ddf0b664c92121017fabb91e8f66020c364037a2..08c63f6c1a043b8c9c6e25add00fecb84611b580 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -111,7 +111,7 @@ You review the rules — the <<if $pitAnimal == 0>>combatants<<else>>slave<</if>
$he knows that it's kill or be killed, and puts aside $his hatred of you in an effort to live.
<</if>>
-<<if _fighterOne.combatSkill > 0>>
+<<if _fighterOne.skill.combat > 0>>
$His grip on $his sword is sure and easy.
<</if>>
@@ -263,7 +263,7 @@ You review the rules — the <<if $pitAnimal == 0>>combatants<<else>>slave<</if>
_he2 knows that it's kill or be killed, and puts aside _his2 hatred of you in an effort to live.
<</if>>
- <<if _fighterTwo.combatSkill > 0>>
+ <<if _fighterTwo.skill.combat > 0>>
_His2 grip on _his2 sword is sure and easy.
<</if>>
@@ -475,7 +475,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<run repX(-20, "pit", _winner)>>
<</if>>
<<elseif (_winnerDeadliness > _loserDeadliness+3)>>
- <<if (_winner.combatSkill > 0)>>
+ <<if (_winner.skill.combat > 0)>>
_winner.slaveName wants to win, and $he opens the fight with a furious attack. _loser.slaveName manages to get _his2 blade up, blocking a strike with a ringing clash and a few sparks, but by doing so leaves _his2 abdomen open and obscures _his2 vision enough that _he2 is unprepared for the following horizontal slash, which opens _his2 belly wide. The stricken _girl2 collapses, feebly trying to push _his2 viscera back into place. Whether out of mercy or a desire to get it over with, _winner.slaveName quickly removes the dying _girl2's head.
<<if $pitAudience == "paid">>
The audience is reasonably impressed by the gore, and your @@.yellowgreen;cut of the betting@@ is reasonable.
@@ -495,7 +495,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<run repX(200, "pit", _winner)>>
<</if>>
<</if>>
- <<elseif (_winner.combatSkill > 0) && (_loser.combatSkill > 0)>>
+ <<elseif (_winner.skill.combat > 0) && (_loser.skill.combat > 0)>>
Upon your word the two combatants approach each other warily, both knowing the other is reasonably competent. Before long they are trading thrust and parry, swing and block. _winner.slaveName is slowly pressed back, so $he decides to change the nature of the fight. After three tries $he manages to force _loser.slaveName to close, suffering a @@.red;nearly severed ear@@ as $he does. _loser.slaveName realizes _he2 only retains an advantage at long range but cannot back up fast enough to avoid close combat. _loser.slaveName is forced back fast enough that _he2 trips; _he2's barely fallen on _his2 back before _he2 grunts with shock and pain, dying with a look of surprise as _he2 stares at the sword growing out of _his2 chest.
<<set _winner.health -= 20>>
<<if $pitAudience == "paid">>
@@ -713,7 +713,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<run repX(-20, "pit", _loser)>>
<</if>>
<<elseif (_winnerDeadliness <= _loserDeadliness+3)>>
- <<if _loser.combatSkill > 0>>
+ <<if _loser.skill.combat > 0>>
_loser.slaveName is fairly confident in $his fighting abilities, and $he knows that this fight is fairly evenly matched.
<<else>>
_loser.slaveName doesn't know how to handle a sword, but $he feels fairly confident in $his chances all the same.
@@ -746,7 +746,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<run repX(100, "pit", _loser)>>
<</if>>
<<else>> /* if none of the above conditions are met */
- <<if (_loser.combatSkill > 0)>>
+ <<if (_loser.skill.combat > 0)>>
_loser.slaveName is reasonably confident in $his fighting abilities, but $he isn't sure how to go about attacking the _animal.species. $He decides to open with a series of wide horizontal slashes, but the beast manages to stay out of range of $his sword. Realizing this isn't working, $he lunges at the animal, leaving $his side exposed. The _animal.species sees this and <<switch _animal.type>><<case "canine" "feline">>leaves some @@.red;deep claw marks in $his side.@@ Bleeding<<case "hooved">>headbutts $him as hard as it can, sending $him flying into the side of $pitName. Battered<</switch>> and unable to stand, $activeSlave.slaveName can do little to stop the _animal.species from finishing $him off with a <<switch _animal.type>><<case "canine">>fierce bite of its fangs to $his throat.<<case "feline">>ferocious swipe of its claws to $his throat.<<case "hooved">>swift kick to the head.<</switch>>
<<if $pitAudience == "paid">>
The audience is reasonably impressed by the blood, and your @@.yellowgreen;cut of the betting@@ is reasonable.
@@ -810,9 +810,9 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<set $slaveFightingBG = 0, $killChoice = -1>>
<<if _winner != _animal>>
- <<if (_winner.combatSkill == 0)>>
+ <<if (_winner.skill.combat == 0)>>
With lethal experience in $pitName, _winner.slaveName has @@.green;learned basic combat skills.@@
- <<set _winner.combatSkill += 1>>
+ <<set _winner.skill.combat += 1>>
<</if>>
<<set _winner.pitKills += 1>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 77eb1d679803f63f6c439c8c1d0fd0d10eddf775..3c133e01c1930f62629a1c64bd51649f8abb5976 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -97,7 +97,7 @@
_fighterOne.slaveName is obviously terrified, and might flee if there were a way out of the pit.
<</if>>
- <<if _fighterOne.combatSkill > 0>>
+ <<if _fighterOne.skill.combat > 0>>
$His stance is obviously well-practiced.
<</if>>
@@ -233,7 +233,7 @@
_fighterTwo.slaveName is obviously terrified, and might flee if there were a way out of the pit.
<</if>>
- <<if _fighterTwo.combatSkill > 0>>
+ <<if _fighterTwo.skill.combat > 0>>
_His2 stance is obviously well-practiced.
<</if>>
@@ -435,7 +435,7 @@
<<run repX(-20, "pit", _winner)>>
<</if>>
<<elseif (_winnerDeadliness > _loserDeadliness+3)>>
- <<if (_winner.combatSkill > 0)>>
+ <<if (_winner.skill.combat > 0)>>
_winner.slaveName wants to win, and $he opens the fight with a furious attack. _loser.slaveName manages to get _his2 forearms up, blocking a few blows, but by doing so leaves _his2 abdomen open and obscures _his2 vision enough that _he2 is unprepared for the following kidney strike, which brings _him2 gasping to one knee. _winner.slaveName lets _him2 rise just a little before delivering a calculated hard right that sends _loser.slaveName to the mat.
<<if $pitAudience == "paid">>
The audience is not very impressed by this execution, and your @@.yellowgreen;cut of the betting@@ is unimpressive.
@@ -475,7 +475,7 @@
The audience is @@.green;impressed@@ by this absurd win.
<<run repX(50, "pit", _winner)>>
<</if>>
- <<elseif (_winner.combatSkill > 0) && (_loser.combatSkill > 0)>>
+ <<elseif (_winner.skill.combat > 0) && (_loser.skill.combat > 0)>>
Upon your word the two combatants approach each other warily, both knowing the other is reasonably competent. Before long they are trading expert blows. _winner.slaveName is getting the worst of it, so $he decides to change the nature of the fight. After three tries $he manages to bring _loser.slaveName to the ground, suffering a @@.red;broken nose@@ as $he does. _loser.slaveName tries to break the imperfect hold but only earns _himself2 an elbow to the face. _He2's furious and _winner.slaveName is obliged to wrench _his2 arm @@.red;to the point of damage@@ before _he2 allows _himself2 to go limp.
<<set _loser.health -= 10>>
<<set _winner.health -= 10>>
@@ -1018,10 +1018,10 @@
<</if>>
<</if>>
- <<if (_winner.combatSkill == 0)>>
+ <<if (_winner.skill.combat == 0)>>
<<if random(1,100) < (20+_winner.devotion)>>
With experience in $pitName, _winner.slaveName has @@.green;learned basic combat skills.@@
- <<set _winner.combatSkill += 1>>
+ <<set _winner.skill.combat += 1>>
<</if>>
<</if>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index c7f66a83d1a537b549e8856e0d3c4c5b2e54a88e..7a4f15f0986b05aaa510365d77e38931403268be 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -98,10 +98,10 @@ target
<<else>>
<<set $activeSlave.preg = -1>>
<</if>>
- <<set $activeSlave.vaginalSkill = 35>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 35>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 35>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(-50,130)>>
<<set $activeSlave.career = either("a housewife", "a trophy wife")>>
@@ -114,10 +114,10 @@ target
<<set $activeSlave.career = "a professor">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.intelligence = random(70,90)>>
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
@@ -144,11 +144,11 @@ target
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.intelligence = random(0,60)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
@@ -174,11 +174,11 @@ target
<<set $activeSlave.career = "a military officer">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.combat = 1>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.intelligence = random(20,60)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
@@ -193,10 +193,10 @@ target
<<set $activeSlave.career = "a military officer">>
<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
<<set $activeSlave.faceImplant += 20>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.hStyle = either("very short", "short")>>
<<set $activeSlave.boobs = 150>>
<<set $activeSlave.vagina = -1>>
@@ -222,11 +222,11 @@ target
<<set $activeSlave.career = "a soldier">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.combat = 1>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(0,20)>>
@@ -252,10 +252,10 @@ target
<<set $activeSlave.career = "a doctor">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.intelligence = random(60,90)>>
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
@@ -283,11 +283,11 @@ target
<<set $activeSlave.attrXX = random(10,50)>>
<<set $activeSlave.attrXY = random(10,50)>>
<<set $activeSlave.energy = random(5,20)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<set $activeSlave.behavioralFlaw = "devout">>
<<set $activeSlave.sexualFlaw = "repressed">>
<<case "journalist">>
@@ -300,11 +300,11 @@ target
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.behavioralFlaw = "liberated">>
<<set $activeSlave.sexualFlaw = "idealistic">>
<<set $activeSlave.weight = random(-40,40)>>
@@ -336,11 +336,11 @@ target
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.vaginalSkill = 35>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 35>>
- <<set $activeSlave.entertainSkill = 35>>
+ <<set $activeSlave.skill.vaginal = 35>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 35>>
+ <<set $activeSlave.skill.entertainment = 35>>
<<set $activeSlave.career = "a local news anchor">>
<<set $activeSlave.weight = random(-40,40)>>
<<case "classical dancer">>
@@ -353,11 +353,11 @@ target
<<set $activeSlave.face = random(-20,40)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 50>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 50>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
@@ -375,11 +375,11 @@ target
<<set $activeSlave.career = "a law enforcement officer">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.combat = 1>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.weight = random(-10,90)>>
<<set $activeSlave.muscles = random(10,35)>>
@@ -405,11 +405,11 @@ target
<<set $activeSlave.prestigeDesc = "She was the pride of a renowned orchestra.">>
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 50>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 50>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
@@ -440,10 +440,10 @@ target
<<set $activeSlave.prestigeDesc = "She was a widely known politician in her former life. Her face has graced many campaign posters.">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.intelligence = random(60,90)>>
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
@@ -468,10 +468,10 @@ target
<<set $activeSlave.anus = 0>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 0>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.weight = random(-100,60)>>
<<case "procuress">>
<<set $activeSlaveOneTimeMinAge = 20>>
@@ -482,10 +482,10 @@ target
<<set $activeSlave.career = "a procuress">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 25>>
- <<set $activeSlave.entertainSkill = 25>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 25>>
+ <<set $activeSlave.skill.entertainment = 25>>
<<set $activeSlave.intelligence = random(51,80)>>
<<set $activeSlave.weight = random(-10,120)>>
<<case "investor">>
@@ -499,10 +499,10 @@ target
<<set $activeSlave.prestigeDesc = "She is a reputable investor from a bygone age.">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.intelligence = random(51,80)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.weight = random(-50,60)>>
@@ -527,10 +527,10 @@ target
<<set $activeSlave.career = "a scientist">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 10>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 10>>
<<set $activeSlave.intelligence = random(70,90)>>
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
@@ -544,10 +544,10 @@ target
<<set $activeSlave.career = "a lawyer">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
- <<set $activeSlave.oralSkill = 35>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 20>>
+ <<set $activeSlave.skill.oral = 35>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 20>>
<<set $activeSlave.intelligence = random(20,50)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.weight = random(-50,140)>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 8e311b0d4789de03e17ea7bab3081f9bdb5a152f..34eaa4daa258cea23de5a0cf189e3f5c00b790de 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -16,9 +16,9 @@
<<set $activeSlave.anus = 0>>
<<if $activeSlave.vagina > 0>>
<<set $activeSlave.vagina = random(1,3)>>
- <<set $activeSlave.vaginalSkill = random(15,40)>>
+ <<set $activeSlave.skill.vaginal = random(15,40)>>
<</if>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<if $recruiterEugenics == 1>>
<<if $IntelligenceEugenicsSMR == 1>>
<<set $activeSlave.intelligence = Intelligence.random({limitIntelligence: [40,100]})>>
@@ -46,9 +46,9 @@
<<set $activeSlave.anus = random(1,3)>>
<<if $activeSlave.balls > 0>>
<<set $activeSlave.vagina = random(1,3)>>
- <<set $activeSlave.vaginalSkill = random(15,40)>>
+ <<set $activeSlave.skill.vaginal = random(15,40)>>
<</if>>
-<<set $activeSlave.analSkill = 0>>
+<<set $activeSlave.skill.anal = 0>>
<<if $recruiterEugenics == 1>>
<<if $IntelligenceEugenicsSMR == 1>>
<<set $activeSlave.intelligence = Intelligence.random({limitIntelligence: [40,100]})>>
@@ -103,8 +103,8 @@
<<if $activeSlave.balls == 0>>
<<set $activeSlave.balls = random(1,3)>>
<</if>>
-<<set $activeSlave.oralSkill = random(15,40)>>
-<<set $activeSlave.analSkill = random(15,40)>>
+<<set $activeSlave.skill.oral = random(15,40)>>
+<<set $activeSlave.skill.anal = random(15,40)>>
<<set $activeSlave.faceImplant = 20*random(0,1)>>
<<set $activeSlave.face = Math.clamp($activeSlave.face+($activeSlave.faceImplant),-100,100)>>
<<set $activeSlave.lipsPiercing = random(0,1)>>
@@ -177,11 +177,11 @@
<<set $activeSlave.anus = random(1,3)>>
<<if $activeSlave.balls > 0>>
<<set $activeSlave.vagina = random(1,3)>>
- <<set $activeSlave.vaginalSkill = random(15,40)>>
+ <<set $activeSlave.skill.vaginal = random(15,40)>>
<</if>>
-<<set $activeSlave.oralSkill = random(15,40)>>
-<<set $activeSlave.analSkill = random(15,40)>>
-<<set $activeSlave.whoreSkill = random(15,40)>>
+<<set $activeSlave.skill.oral = random(15,40)>>
+<<set $activeSlave.skill.anal = random(15,40)>>
+<<set $activeSlave.skill.whore = random(15,40)>>
<<set $activeSlave.boobsImplant = random(0,3)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
<<set $activeSlave.buttImplant = random(0,2)>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index c11e227cdd593a9934242cbf1e50a69fd150f385..2f690eedde5b18df77136bd3a8a790ed445fcde4 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -73,7 +73,7 @@ $He is retiring into citizenship, with a substantial annuity that will provide $
$He's certainly going to have some adjustments to make.
<<if $activeSlave.energy > 90>>
Notably, dealing with $his formidable sex drive is now $his business. You suspect the arcology's clubs are about to receive a fanatical new regular, and the arcology's whores may not know what hit them when $he realizes that $he's now quite capable of buying whatever $he wants on a semi-regular basis.
- <<if $activeSlave.analSkill+$activeSlave.oralSkill >= 120>>
+ <<if $activeSlave.skill.anal+$activeSlave.skill.oral >= 120>>
$He's so sexually skilled, though, that $he probably won't have much trouble. $He'll probably have more than a few eager lovers within days.
<</if>>
<<if $activeSlave.face > 40>>
@@ -107,7 +107,7 @@ $He's certainly going to have some adjustments to make.
<<set _pornFame = _pornFame.replace("She is world famous for her career in slave pornography. Millions are intimately familiar with", "enjoy")>>
<<set _pornFame = _pornFame.replace(".", ",")>>
In addition to $his annuity, you've laid the groundwork for $him to become wealthy by the way you publicized pornography of $him. Many thousands of people across the world are willing to pay to _pornFame and they enjoy it in part because $he doesn't mind it, either. $He's in a position to make great money for doing on camera what $he would probably do anyway.
-<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50) && ($activeSlave.muscles > 5) && ($activeSlave.combatSkill >= 1) && ($activeSlave.amp != 1) && ($activeSlave.face > 10)>>
+<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50) && ($activeSlave.muscles > 5) && ($activeSlave.skill.combat >= 1) && ($activeSlave.amp != 1) && ($activeSlave.face > 10)>>
<br><br>
$He's pretty and deadly. If $he feels $he prefers wealth and danger to living on $his annuity, $he'll have no trouble finding work. In fact, $he'll likely have trouble sifting through all the mercenary organizations, businesses in need of attractive and competent guards for public spaces, and citizens looking for effective bodyguards willing to hire $him.
<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 50) && ($activeSlave.intelligenceImplant >= 15)>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index ae50d1cf02a6c9a14ebcfbc92a3f92e2d9088f38..d9f123ea808af2c957f2760ec3b65caabf960c4f 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -267,7 +267,7 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
$His background should make $him a good servant.
<</if>>
<</if>>
-<<if ($week-$activeSlave.weekAcquired >= 20) && ($activeSlave.entertainSkill >= 100)>>
+<<if ($week-$activeSlave.weekAcquired >= 20) && ($activeSlave.skill.entertainment >= 100)>>
<<if setup.entertainmentCareers.includes($activeSlave.career)>>
<<else>>
$He's gotten enough experience as a slave entertainer that $he has the added value of a $girl with a history in entertainment from before $he was a slave.
@@ -281,55 +281,55 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<</if>>
<<set _careers = []>>
-<<if ($activeSlave.skillHG >= $masteredXP)>>
+<<if ($activeSlave.skill.headGirl >= $masteredXP)>>
<<set _careers.push("Head Girl")>>
<</if>>
-<<if ($activeSlave.skillRC >= $masteredXP)>>
+<<if ($activeSlave.skill.recruiter >= $masteredXP)>>
<<set _careers.push("Recruiter")>>
<</if>>
-<<if ($activeSlave.skillBG >= $masteredXP)>>
+<<if ($activeSlave.skill.bodyguard >= $masteredXP)>>
<<set _careers.push("Bodyguard")>>
<</if>>
-<<if ($activeSlave.skillMD >= $masteredXP)>>
+<<if ($activeSlave.skill.madam >= $masteredXP)>>
<<set _careers.push("Madam")>>
<</if>>
-<<if ($activeSlave.skillDJ >= $masteredXP)>>
+<<if ($activeSlave.skill.DJ >= $masteredXP)>>
<<set _careers.push("DJ")>>
<</if>>
-<<if ($activeSlave.skillNU >= $masteredXP)>>
+<<if ($activeSlave.skill.nurse >= $masteredXP)>>
<<set _careers.push("Nurse")>>
<</if>>
-<<if ($activeSlave.skillTE >= $masteredXP)>>
+<<if ($activeSlave.skill.teacher >= $masteredXP)>>
<<set _careers.push("Schoolteacher")>>
<</if>>
-<<if ($activeSlave.skillAT >= $masteredXP)>>
+<<if ($activeSlave.skill.attendant >= $masteredXP)>>
<<set _careers.push("Attendant")>>
<</if>>
-<<if ($activeSlave.skillMT >= $masteredXP)>>
+<<if ($activeSlave.skill.matron >= $masteredXP)>>
<<set _careers.push("Matron")>>
<</if>>
-<<if ($activeSlave.skillST >= $masteredXP)>>
+<<if ($activeSlave.skill.stewardess >= $masteredXP)>>
<<set _careers.push("Stewardess")>>
<</if>>
-<<if ($activeSlave.skillMM >= $masteredXP)>>
+<<if ($activeSlave.skill.milkmaid >= $masteredXP)>>
<<set _careers.push("Milkmaid")>>
<</if>>
-<<if ($activeSlave.skillFA >= $masteredXP)>>
+<<if ($activeSlave.skill.farmer >= $masteredXP)>>
<<set _careers.push("Farmer")>>
<</if>>
-<<if ($activeSlave.skillWA >= $masteredXP)>>
+<<if ($activeSlave.skill.wardeness >= $masteredXP)>>
<<set _careers.push("Wardeness")>>
<</if>>
-<<if ($activeSlave.skillS >= $masteredXP)>>
+<<if ($activeSlave.skill.servant >= $masteredXP)>>
<<set _careers.push("Servant")>>
<</if>>
-<<if ($activeSlave.skillE >= $masteredXP)>>
+<<if ($activeSlave.skill.entertainer >= $masteredXP)>>
<<set _careers.push("Entertainer")>>
<</if>>
-<<if ($activeSlave.skillW >= $masteredXP)>>
+<<if ($activeSlave.skill.whore >= $masteredXP)>>
<<set _careers.push("Whore")>>
<</if>>
-<<if ($activeSlave.skillMT >= $masteredXP)>>
+<<if ($activeSlave.skill.matron >= $masteredXP)>>
<<set _careers.push("Matron")>>
<</if>>
<<if _careers.length > 0>>
@@ -653,7 +653,7 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<<if $activeSlave.butt >= 5>>
<<if $activeSlave.anus >= 2>>
<<if $activeSlave.hips >= 1>>
- <<if $activeSlave.analSkill > 60>>
+ <<if $activeSlave.skill.anal > 60>>
Slaves with big butts and skilled anuses appraise quite well, thanks to your leadership on gender.
<</if>>
<</if>>
@@ -771,13 +771,13 @@ __Bids Received__
<<elseif ($activeSlave.face > 10) && (random(1,100) > 80)>>
<br>''<<print cashFormat(_Price)>>'' from a citizen who can't keep his eyes off $his pretty face.
<<set _NewOwner = 1>>
-<<elseif ($activeSlave.analSkill >= 100) && (random(1,100) > 80)>>
+<<elseif ($activeSlave.skill.anal >= 100) && (random(1,100) > 80)>>
<br>''<<print cashFormat(_Price)>>'' from a citizen interested in acquiring a skilled butthole bitch.
<<set _NewOwner = 1>>
-<<elseif ($activeSlave.vaginalSkill >= 100) && (random(1,100) > 80)>>
+<<elseif ($activeSlave.skill.vaginal >= 100) && (random(1,100) > 80)>>
<br>''<<print cashFormat(_Price)>>'' from a citizen interested in acquiring a slut with real vaginal skill.
<<set _NewOwner = 1>>
-<<elseif ($activeSlave.oralSkill >= 100) && (random(1,100) > 80)>>
+<<elseif ($activeSlave.skill.oral >= 100) && (random(1,100) > 80)>>
<br>''<<print cashFormat(_Price)>>'' from a citizen interested in acquiring a skilled cocksucker.
<<set _NewOwner = 1>>
<<elseif ($activeSlave.health > 80) && (random(1,100) > 80)>>
@@ -924,7 +924,7 @@ __Bids Received__
<</if>>
<<if $activeSlave.balls > 0>>
- <<if $activeSlave.analSkill > 10>>
+ <<if $activeSlave.skill.anal > 10>>
<<if $activeSlave.devotion > 20>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.05)/500))>>'' from a citizen who enjoys buttfucking slaves with the necessary equipment, willingness, and anal skill to reward his efforts with messy, hands-free orgasms of their own.
@@ -938,7 +938,7 @@ __Bids Received__
<</if>>
<</if>>
-<<if $activeSlave.oralSkill > 30>>
+<<if $activeSlave.skill.oral > 30>>
<<if $activeSlave.devotion > 20>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.05)/500))>>'' from an unusually well-endowed citizen who strongly prefers oral sex with willing partners who can deepthroat him successfully.
@@ -995,7 +995,7 @@ __Bids Received__
<</if>>
<<if $activeSlave.devotion > 50>>
- <<if $activeSlave.oralSkill >= 100>>
+ <<if $activeSlave.skill.oral >= 100>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.05)/500))>>'' from a citizen whose job keeps her deskbound; bored, she's looking for a devoted oral slave to occupy the space under the desk and be her constant pussylicking appliance.
<<link "Accept bid" "Slave Sold">>
@@ -1018,8 +1018,8 @@ __Bids Received__
<</if>>
<</if>>
-<<if $activeSlave.oralSkill >= 100>>
- <<if $activeSlave.analSkill >= 100>>
+<<if $activeSlave.skill.oral >= 100>>
+ <<if $activeSlave.skill.anal >= 100>>
<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 15>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.1)/500))>>'' from a small, local slave trainer interested in using $him to help train new slaves in the sexual arts.
@@ -1033,8 +1033,8 @@ __Bids Received__
<</if>>
<</if>>
-<<if $activeSlave.oralSkill >= 100>>
- <<if $activeSlave.analSkill >= 100>>
+<<if $activeSlave.skill.oral >= 100>>
+ <<if $activeSlave.skill.anal >= 100>>
<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 15>>
<<if $activeSlave.intelligenceImplant >= 15>>
<<if $activeSlave.physicalAge > 35>>
@@ -1072,7 +1072,7 @@ __Bids Received__
<<if $activeSlave.muscles > 5>>
<<if $activeSlave.weight < -10>>
<<if $activeSlave.teeth == "pointy">>
- <<if $activeSlave.combatSkill > 0>>
+ <<if $activeSlave.skill.combat > 0>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen who's pursuing some sort of mercenary project that requires worryingly large numbers of thin <<= $girl>>s with sharp teeth.
<<link "Accept bid" "Slave Sold">>
@@ -1088,7 +1088,7 @@ __Bids Received__
<<if $activeSlave.vagina == 0>>
<<if $activeSlave.anus > 1>>
- <<if $activeSlave.analSkill >= 100>>
+ <<if $activeSlave.skill.anal >= 100>>
<<if $activeSlave.physicalAge < 25>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen who appreciates <<= $girl>>s who are both vaginal virgins and anal veterans.
@@ -1105,7 +1105,7 @@ __Bids Received__
<<if $activeSlave.vagina == 0>>
<<if ($activeSlave.fetish == "submissive") || ($activeSlave.fetish == "pregnancy")>>
- <<if $activeSlave.entertainSkill > 30>>
+ <<if $activeSlave.skill.entertainment > 30>>
<<if $activeSlave.physicalAge < 30>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen with moist palms who insistently refers to $him as "his waifu," whatever that means.
@@ -1121,7 +1121,7 @@ __Bids Received__
<</if>>
<<if $activeSlave.dick > 0>>
- <<if $activeSlave.oralSkill >= 100>>
+ <<if $activeSlave.skill.oral >= 100>>
<<if $activeSlave.height < 160>>
<<if $activeSlave.butt > 3>>
<<if random(1,100) > 60>>
@@ -1240,7 +1240,7 @@ __Bids Received__
<<if $activeSlave.fetish == "cumslut">>
<<if $activeSlave.lips > 30>>
<<if $activeSlave.amp == 0>>
- <<if $activeSlave.oralSkill > 50>>
+ <<if $activeSlave.skill.oral > 50>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen who's looking for a fresh, skilled pair of lips eager to wrap around a thick cock.
<<link "Accept bid" "Slave Sold">>
@@ -1255,11 +1255,11 @@ __Bids Received__
<</if>>
<</if>>
-<<if $activeSlave.vaginalSkill <= 10>>
- <<if $activeSlave.analSkill <= 10>>
- <<if $activeSlave.oralSkill <= 10>>
- <<if $activeSlave.whoreSkill <= 10>>
- <<if $activeSlave.entertainSkill <= 10>>
+<<if $activeSlave.skill.vaginal <= 10>>
+ <<if $activeSlave.skill.anal <= 10>>
+ <<if $activeSlave.skill.oral <= 10>>
+ <<if $activeSlave.skill.whore <= 10>>
+ <<if $activeSlave.skill.entertainment <= 10>>
<<if random(1,100) > 80>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.15)/500))>>'' from a prominent citizen who's a notoriously inexperienced lover; it's painfully obvious that he prefers inexperienced slaves as they make him feel less insecure.
<<link "Accept bid" "Slave Sold">>
@@ -1457,7 +1457,7 @@ __Bids Received__
<</if>>
<</if>>
-<<if $activeSlave.combatSkill >= 1>>
+<<if $activeSlave.skill.combat >= 1>>
<<if $activeSlave.health > 40>>
<<if $activeSlave.muscles > 25>>
<<if random(1,100) > 70>>
@@ -1472,7 +1472,7 @@ __Bids Received__
<</if>>
<</if>>
-<<if $activeSlave.combatSkill > 0>>
+<<if $activeSlave.skill.combat > 0>>
<<if $activeSlave.health > 40>>
<<if $activeSlave.muscles > 5>>
<<if random(1,100) > 70>>
@@ -1850,7 +1850,7 @@ __Bids Received__
<<if $peacekeepers>>
<<if $peacekeepers.strength >= 50>>
<<if $peacekeepers.attitude < 100>>
- <<if $activeSlave.oralSkill + $activeSlave.analSkill + $activeSlave.vaginalSkill > 100>>
+ <<if $activeSlave.skill.oral + $activeSlave.skill.anal + $activeSlave.skill.vaginal > 100>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*0.5)/500))>>'' from the officer in charge of 'recreational activities' for General $peacekeepers.generalName's forces. This is far less than the slave is worth, but the bid comes with the implicit offer of more influence over the peacekeepers.
<<link "Accept bid" "Slave Sold">>
<<set _Price = 500*Math.trunc(($slaveCost*0.5)/500), $buyer = "peacekeepers">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 3c0a67a2edcef181158e3a154825af4e5e57105e..46810959642dd03a71db04097c511c3939d67591 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -89,11 +89,11 @@
<<if setup.stewardessCareers.includes($Stewardess.career)>>
<<set $stewardessBonus += 25>>
$He has applicable experience with daily sums and organizational trifles from $his life before $he was a slave.
- <<elseif $Stewardess.skillST >= $masteredXP>>
+ <<elseif $Stewardess.skill.stewardess >= $masteredXP>>
<<set $stewardessBonus += 25>>
$He has applicable experience with daily sums and organizational trifles from working for you.
<<else>>
- <<set $slaves[_FLs].skillST += random(1,Math.ceil(($Stewardess.intelligence+$Stewardess.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.stewardess += random(1,Math.ceil(($Stewardess.intelligence+$Stewardess.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Stewardess.actualAge > 35)>>
<<set $stewardessBonus += 25>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 874049b7645a8bfeb386fec2a869776f56ad36cd..ceae715c6cc32b20f4e8bbcc2af6b1cee7ecb074 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -6,25 +6,25 @@
<<for $i = 0; $i < _SL; $i++>>
-<<if ndef $slaves[$i].whoreSkill>>
+<<if ndef $slaves[$i].skill.whore>>
@@.yellow;Reset bad whore skill for $slaves[$i].slaveName.@@ Report this as a bug if it reoccurs.<br>
- <<set $slaves[$i].whoreSkill = 0>>
+ <<set $slaves[$i].skill.whore = 0>>
<</if>>
-<<if ndef $slaves[$i].entertainSkill>>
+<<if ndef $slaves[$i].skill.entertainment>>
@@.yellow;Reset bad entertain skill for $slaves[$i].slaveName.@@ Report this as a bug if it reoccurs.<br>
- <<set $slaves[$i].entertainSkill = 0>>
+ <<set $slaves[$i].skill.entertainment = 0>>
<</if>>
-<<if ndef $slaves[$i].vaginalSkill>>
+<<if ndef $slaves[$i].skill.vaginal>>
@@.yellow;Reset bad vaginal skill for $slaves[$i].slaveName.@@ Report this as a bug if it reoccurs.<br>
- <<set $slaves[$i].vaginalSkill = 0>>
+ <<set $slaves[$i].skill.vaginal = 0>>
<</if>>
-<<if ndef $slaves[$i].analSkill>>
+<<if ndef $slaves[$i].skill.anal>>
@@.yellow;Reset bad anal skill for $slaves[$i].slaveName.@@ Report this as a bug if it reoccurs.<br>
- <<set $slaves[$i].analSkill = 0>>
+ <<set $slaves[$i].skill.anal = 0>>
<</if>>
-<<if ndef $slaves[$i].oralSkill>>
+<<if ndef $slaves[$i].skill.oral>>
@@.yellow;Reset bad skill for $slaves[$i].slaveName.@@ Report this as a bug if it reoccurs.<br>
- <<set $slaves[$i].oralSkill = 0>>
+ <<set $slaves[$i].skill.oral = 0>>
<</if>>
<<if ($seeDicks > 0) && (canPenetrate($slaves[$i])) && ($slaves[$i].releaseRules != "restrictive") && ($slaves[$i].releaseRules != "masturbation") && ($slaves[$i].releaseRules != "chastity")>>
@@ -526,15 +526,15 @@
<</if>>
<<if ($headGirlTrainsSkills)>>
- <<if (_Slave.oralSkill < $HeadGirl.oralSkill)>>
+ <<if (_Slave.skill.oral < $HeadGirl.skill.oral)>>
<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "oral skill"})>>
- <<elseif (_Slave.vaginalSkill < $HeadGirl.vaginalSkill) && (_Slave.vagina > 0) && (canDoVaginal(_Slave))>>
+ <<elseif (_Slave.skill.vaginal < $HeadGirl.skill.vaginal) && (_Slave.vagina > 0) && (canDoVaginal(_Slave))>>
<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "fuck skill"})>>
- <<elseif (_Slave.analSkill < $HeadGirl.analSkill) && (_Slave.anus > 0) && (canDoAnal(_Slave))>>
+ <<elseif (_Slave.skill.anal < $HeadGirl.skill.anal) && (_Slave.anus > 0) && (canDoAnal(_Slave))>>
<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "anal skill"})>>
- <<elseif (_Slave.whoreSkill < $HeadGirl.whoreSkill)>>
+ <<elseif (_Slave.skill.whore < $HeadGirl.skill.whore)>>
<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "whore skill"})>>
- <<elseif (_Slave.entertainSkill < $HeadGirl.entertainSkill) && (_Slave.amp != 1)>>
+ <<elseif (_Slave.skill.entertainment < $HeadGirl.skill.entertainment) && (_Slave.amp != 1)>>
<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "entertain skill"})>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 75e265ba3d97c5b25f633b5e04f8108a21b8a760..b6180891aed90cdbaefc62e856a5fddee2e032d0 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -601,7 +601,7 @@
<</if>>
<<if $schoolroom != 0>>
- <<if $schoolroom > $schoolroomSlaves && ($activeSlave.fetish != "mindbroken" && ($activeSlave.devotion >= -20 || ($activeSlave.devotion >= -50 && $activeSlave.trust < -20) || $activeSlave.trust < -50) && (($activeSlave.intelligenceImplant < 30) || ($activeSlave.voice != 0 && $activeSlave.accent+$schoolroomUpgradeLanguage > 2) || ($activeSlave.oralSkill <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.whoreSkill <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.entertainSkill <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.analSkill < 10+$schoolroomUpgradeSkills*20) || ($activeSlave.vagina >= 0 && $activeSlave.vaginalSkill < 10+$schoolroomUpgradeSkills*20)))>>
+ <<if $schoolroom > $schoolroomSlaves && ($activeSlave.fetish != "mindbroken" && ($activeSlave.devotion >= -20 || ($activeSlave.devotion >= -50 && $activeSlave.trust < -20) || $activeSlave.trust < -50) && (($activeSlave.intelligenceImplant < 30) || ($activeSlave.voice != 0 && $activeSlave.accent+$schoolroomUpgradeLanguage > 2) || ($activeSlave.skill.oral <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.whore <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.entertainment <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.anal < 10+$schoolroomUpgradeSkills*20) || ($activeSlave.vagina >= 0 && $activeSlave.skill.vaginal < 10+$schoolroomUpgradeSkills*20)))>>
[[Schoolroom|Assign][$assignTo = "Schoolroom", $i = -1]] /* $i = -1 tells Assign to use $activeSlave as-is */
<<else>>Schoolroom<</if>>
<<if _numFacilities-- > 1>>|<</if>>
@@ -980,7 +980,7 @@
| <<link "Shock punishment">><<set $activeSlave.collar = "shock punishment">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
| <<link "Dildo gag">><<set $activeSlave.collar = "dildo gag">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
<<if isItemAccessible("massive dildo gag")>>
- <<if $activeSlave.oralSkill > 50>>
+ <<if $activeSlave.skill.oral > 50>>
| <<link "Massive dildo gag">><<set $activeSlave.collar = "massive dildo gag">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
<<else>>
| Massive dildo gag
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index 393423374909a764ae96568986df5cd7b73b992f..28c92ab3a30c8f1ae694e2d987ed41b77dc2fc57 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -47,11 +47,11 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.trust = random(-25,-45)>>
<<set $shelterSlave.health = random(-30,-10)>>
<<set $shelterSlave.anus = 3>>
- <<set $shelterSlave.oralSkill = 0>>
- <<set $shelterSlave.analSkill = 0>>
- <<set $shelterSlave.whoreSkill = 0>>
- <<set $shelterSlave.entertainSkill = 0>>
- <<set $shelterSlave.combatSkill = 0>>
+ <<set $shelterSlave.skill.oral = 0>>
+ <<set $shelterSlave.skill.anal = 0>>
+ <<set $shelterSlave.skill.whore = 0>>
+ <<set $shelterSlave.skill.entertainment = 0>>
+ <<set $shelterSlave.skill.combat = 0>>
<<set $shelterSlave.intelligence = -70>>
<<set $shelterSlave.intelligenceImplant = 0>>
<<set $shelterSlave.behavioralFlaw = "none">>
@@ -116,11 +116,11 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.weight = -50>>
<<set $shelterSlave.vagina = 9>>
<<set $shelterSlave.bellySag = 20>>
- <<set $shelterSlave.oralSkill = 0>>
- <<set $shelterSlave.analSkill = 0>>
- <<set $shelterSlave.whoreSkill = 0>>
- <<set $shelterSlave.entertainSkill = 0>>
- <<set $shelterSlave.combatSkill = 0>>
+ <<set $shelterSlave.skill.oral = 0>>
+ <<set $shelterSlave.skill.anal = 0>>
+ <<set $shelterSlave.skill.whore = 0>>
+ <<set $shelterSlave.skill.entertainment = 0>>
+ <<set $shelterSlave.skill.combat = 0>>
<<set $shelterSlave.intelligence = -70>>
<<set $shelterSlave.intelligenceImplant = 0>>
<<set $shelterSlave.behavioralFlaw = "none">>
@@ -201,7 +201,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.legsTat = either("degradation", "rude words", 0)>>
<<set $shelterSlave.backTat = either("degradation", "rude words", 0)>>
<<set $shelterSlave.stampTat = either("degradation", "rude words", 0)>>
- <<set $shelterSlave.analSkill = random(10,25)>>
+ <<set $shelterSlave.skill.anal = random(10,25)>>
<<set $shelterSlave.anus = random(1,4)>>
<<if isFertile($shelterSlave) && $seePreg != 0>>
<<set $shelterSlave.preg = either(-3, -2, -2, -2, 0, 0, 2, 3, 4, 5)>>
@@ -213,7 +213,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<</if>>
<<if $shelterSlave.vagina > -1>>
<<set $shelterSlave.vagina = random(1,4)>>
- <<set $shelterSlave.vaginalSkill = random(10,25)>>
+ <<set $shelterSlave.skill.vaginal = random(10,25)>>
<<set $shelterSlave.vaginalTat = either("degradation", "rude words", 0)>>
<</if>>
<<if $shelterSlave.dick > 1>>
@@ -234,11 +234,11 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.dick = random(1,2)>>
<<set $shelterSlave.balls = 0>>
<<set $shelterSlave.anus = 4>>
- <<set $shelterSlave.oralSkill = 0>>
- <<set $shelterSlave.analSkill = 15>>
- <<set $shelterSlave.whoreSkill = 0>>
- <<set $shelterSlave.entertainSkill = 0>>
- <<set $shelterSlave.combatSkill = 0>>
+ <<set $shelterSlave.skill.oral = 0>>
+ <<set $shelterSlave.skill.anal = 15>>
+ <<set $shelterSlave.skill.whore = 0>>
+ <<set $shelterSlave.skill.entertainment = 0>>
+ <<set $shelterSlave.skill.combat = 0>>
<<set $shelterSlave.attrXY = random(40,60)>>
<<set $shelterSlave.behavioralFlaw = either("anorexic", "gluttonous", "hates men", "odd")>>
<<set $shelterSlave.sexualFlaw = either("apathetic", "hates anal")>>
@@ -257,11 +257,11 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.dick = random(4,5)>>
<<set $shelterSlave.balls = random(4,5)>>
<<set $shelterSlave.anus = 0>>
- <<set $shelterSlave.oralSkill = 0>>
- <<set $shelterSlave.analSkill = 0>>
- <<set $shelterSlave.whoreSkill = 0>>
- <<set $shelterSlave.entertainSkill = 0>>
- <<set $shelterSlave.combatSkill = 0>>
+ <<set $shelterSlave.skill.oral = 0>>
+ <<set $shelterSlave.skill.anal = 0>>
+ <<set $shelterSlave.skill.whore = 0>>
+ <<set $shelterSlave.skill.entertainment = 0>>
+ <<set $shelterSlave.skill.combat = 0>>
<<set $shelterSlave.energy = random(5,10)>>
<<set $shelterSlave.attrXX = 0>>
<<set $shelterSlave.behavioralFlaw = either("hates women", "odd")>>
@@ -279,12 +279,12 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.health = random(-50,-30)>>
<<set $shelterSlave.vagina = 4>>
<<set $shelterSlave.anus = 4>>
- <<set $shelterSlave.oralSkill = 15>>
- <<set $shelterSlave.analSkill = 15>>
- <<set $shelterSlave.vaginalSkill = 15>>
- <<set $shelterSlave.whoreSkill = 0>>
- <<set $shelterSlave.entertainSkill = 0>>
- <<set $shelterSlave.combatSkill = 0>>
+ <<set $shelterSlave.skill.oral = 15>>
+ <<set $shelterSlave.skill.anal = 15>>
+ <<set $shelterSlave.skill.vaginal = 15>>
+ <<set $shelterSlave.skill.whore = 0>>
+ <<set $shelterSlave.skill.entertainment = 0>>
+ <<set $shelterSlave.skill.combat = 0>>
<<set $shelterSlave.behavioralFlaw = either("anorexic", "gluttonous", "odd")>>
<<set $shelterSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration")>>
<<case "breeder">>
@@ -308,12 +308,12 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlave.pregAdaptation = 60>>
<<set $shelterSlave.bellySag = 10, $shelterSlave.bellySagPreg = 10>>
<<set $shelterSlave.vagina = 3>>
- <<set $shelterSlave.oralSkill = 0>>
- <<set $shelterSlave.analSkill = 0>>
- <<set $shelterSlave.vaginalSkill = 0>>
- <<set $shelterSlave.whoreSkill = 0>>
- <<set $shelterSlave.entertainSkill = 0>>
- <<set $shelterSlave.combatSkill = 0>>
+ <<set $shelterSlave.skill.oral = 0>>
+ <<set $shelterSlave.skill.anal = 0>>
+ <<set $shelterSlave.skill.vaginal = 0>>
+ <<set $shelterSlave.skill.whore = 0>>
+ <<set $shelterSlave.skill.entertainment = 0>>
+ <<set $shelterSlave.skill.combat = 0>>
<<set $shelterSlave.behavioralFlaw = either("gluttonous", "hates men", "odd")>>
<<set $shelterSlave.sexualFlaw = either("apathetic", "hates penetration", "repressed")>>
<<case "used whore">>
@@ -332,12 +332,12 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.preg = -2>>
<<set $shelterSlave.vagina = 4>>
<<set $shelterSlave.anus = 4>>
- <<set $shelterSlave.oralSkill = 35>>
- <<set $shelterSlave.analSkill = 35>>
- <<set $shelterSlave.vaginalSkill = 35>>
- <<set $shelterSlave.whoreSkill = 35>>
- <<set $shelterSlave.entertainSkill = 15>>
- <<set $shelterSlave.combatSkill = 0>>
+ <<set $shelterSlave.skill.oral = 35>>
+ <<set $shelterSlave.skill.anal = 35>>
+ <<set $shelterSlave.skill.vaginal = 35>>
+ <<set $shelterSlave.skill.whore = 35>>
+ <<set $shelterSlave.skill.entertainment = 15>>
+ <<set $shelterSlave.skill.combat = 0>>
<<set $shelterSlave.behavioralFlaw = either("anorexic", "gluttonous", "hates men", "odd")>>
<<set $shelterSlave.sexualFlaw = either("apathetic", "hates anal", "hates oral", "hates penetration")>>
<<case "reaction">>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index bc1ecb2f7cefb5f611667c05a2f02ce49afaae66..3c431f759851a11f82d62b45811f8d9f278908a4 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -697,7 +697,7 @@
<<case "roman revivalist arcology">>
$activeSlave.slaveName is shipped to a new arcology, and culturally, across the centuries. $His skill at arms is well enough known that $his impending role as a gladiatrix is easily deduced.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if ($slaves[_ss].combatSkill > 0)>>
+ <<if ($slaves[_ss].skill.combat > 0)>>
<<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set _slaveImpact = 1>>
@@ -710,7 +710,7 @@
<<case "aztec revivalist arcology">>
$activeSlave.slaveName is transported after losing a military engagement. Though $his will remains strong, $he's @@.gold;filled with fear@@ when $he sees the rivers of blood that flow through the city.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if ($slaves[_ss].combatSkill > 0)>>
+ <<if ($slaves[_ss].skill.combat > 0)>>
<<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set _slaveImpact = 1>>
diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw
index db0f71f63d8b9bf33ec90f63be63e0dcead69d06..f9bf0fec63b097fe63f99a1435fb48d31bed23ca 100644
--- a/src/uncategorized/slaveStats.tw
+++ b/src/uncategorized/slaveStats.tw
@@ -182,6 +182,8 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden
<br>pregAdaptation: $activeSlave.pregAdaptation
<br>ovaImplant: $activeSlave.ovaImplant
<br>wombImplant: $activeSlave.wombImplant
+<br>fertKnown: $activeSlave.fertKnown
+<br>fertPeak: $activeSlave.fertPeak
<br>broodmother: $activeSlave.broodmother
<br>broodmotherFetuses: $activeSlave.broodmotherFetuses
<br>broodmotherOnHold: $activeSlave.broodmotherOnHold
@@ -220,12 +222,12 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden
<br>legsTat: $activeSlave.legsTat
<br>backTat: $activeSlave.backTat
<br>stampTat: $activeSlave.stampTat
-<br>vaginalSkill: $activeSlave.vaginalSkill
-<br>oralSkill: $activeSlave.oralSkill
-<br>analSkill: $activeSlave.analSkill
-<br>whoreSkill: $activeSlave.whoreSkill
-<br>entertainSkill: $activeSlave.entertainSkill
-<br>combatSkill: $activeSlave.combatSkill
+<br>skill.vaginal: $activeSlave.skill.vaginal
+<br>skill.oral: $activeSlave.skill.oral
+<br>skill.anal: $activeSlave.skill.anal
+<br>akill.whore: $activeSlave.skill.whore
+<br>skill.entertainment: $activeSlave.skill.entertainment
+<br>skill.combat: $activeSlave.skill.combat
<br>livingRules: $activeSlave.livingRules
<br>speechRules: $activeSlave.speechRules
<br>releaseRules: $activeSlave.releaseRules
@@ -347,22 +349,22 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden
<br>vasectomy: $activeSlave.vasectomy
<br>haircuts: $activeSlave.haircuts
<br>newGamePlus: $activeSlave.newGamePlus
-<br>skillHG: $activeSlave.skillHG
-<br>skillRC: $activeSlave.skillRC
-<br>skillBG: $activeSlave.skillBG
-<br>skillMD: $activeSlave.skillMD
-<br>skillDJ: $activeSlave.skillDJ
-<br>skillNU: $activeSlave.skillNU
-<br>skillTE: $activeSlave.skillTE
-<br>skillAT: $activeSlave.skillAT
-<br>skillMT: $activeSlave.skillMT
-<br>skillST: $activeSlave.skillST
-<br>skillMM: $activeSlave.skillMM
-<br>skillFA: $activeSlave.skillFA
-<br>skillWA: $activeSlave.skillWA
-<br>skillS: $activeSlave.skillS
-<br>skillE: $activeSlave.skillE
-<br>skillW: $activeSlave.skillW
+<br>skill.headGirl: $activeSlave.skill.headGirl
+<br>skill.recruiter: $activeSlave.skill.recruiter
+<br>skill.bodyguard: $activeSlave.skill.bodyguard
+<br>skill.madam: $activeSlave.skill.madam
+<br>skill.DJ: $activeSlave.skill.DJ
+<br>skill.nurse: $activeSlave.skill.nurse
+<br>skill.teacher: $activeSlave.skill.teacher
+<br>skill.attendant: $activeSlave.skill.attendant
+<br>skill.matron: $activeSlave.skill.matron
+<br>skill.stewardess: $activeSlave.skill.stewardess
+<br>skill.milkmaid: $activeSlave.skill.milkmaid
+<br>skill.farmer: $activeSlave.skill.farmer
+<br>skill.wardeness: $activeSlave.skill.wardeness
+<br>skill.servant: $activeSlave.skill.servant
+<br>skill.entertainer: $activeSlave.skill.entertainer
+<br>skill.whore: $activeSlave.skill.whore
<br>tankBaby: $activeSlave.tankBaby
<br>clone: $activeSlave.clone
<br>''Gene Mods''
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 99afc421274f960b4cac927a68bda290f47c6de4..810440c1109a796f1b2e0d2f132ddba235208e3f 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -50,11 +50,11 @@
<<if setup.attendantCareers.includes($Attendant.career)>>
$He has experience with counseling from $his life before $he was a slave, making $him better at building rapport with troubled slaves, and giving $him a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
- <<elseif $Attendant.skillAT >= $masteredXP>>
+ <<elseif $Attendant.skill.attendant >= $masteredXP>>
$He has experience with counseling from working for you, making $him better at building rapport with troubled slaves, and giving $him a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
<<else>>
- <<set $slaves[_FLs].skillAT += random(1,Math.ceil(($Attendant.intelligence+$Attendant.intelligenceImplant)/15) + 8)>>
+ <<set $slaves[_FLs].skill.attendant += random(1,Math.ceil(($Attendant.intelligence+$Attendant.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Attendant.eyes == -2)>>
$His blindness allows $him to deeply connect with $his girls.
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 5c10b2c0be199a0245f0fa9876af20c2ec26f065..443ca315e3923270ba55ab0e49160202e09bca97 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -355,7 +355,7 @@ As the remote surgery's long recovery cycle completes,
<<set $activeSlave.eyes = 1>>
<<case "newEyes">>
- The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as $he is allowed to open $his eyes and look around, $he notices nothing has changed; though the next time $he looks in the mirror, $he'll see a pair of familiar <<= App.Desc.EyeColor>> eyes peering back at $him.
+ The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as $he is allowed to open $his eyes and look around, $he notices nothing has changed; though the next time $he looks in the mirror, $he'll see a pair of familiar <<= App.Desc.eyeColor>> eyes peering back at $him.
<<case "undeafen">>
The inner ear surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as the bandages around $his ears are removed, $his head tilts towards any source of sound with manic speed as $he processes $his new hearing. Hearing the world as it is is a gift that those who do not need it cannot properly understand.
@@ -1181,27 +1181,27 @@ As the remote surgery's long recovery cycle completes,
<<elseif ($activeSlave.devotion > 20) && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
$He licks $his new lips experimentally but doesn't lose much time before turning to you with $his mouth open and ready. $He's still sore, so $he's careful, but $he runs $his wet tongue over $his lips, already panting at the thought of sucking dick. If $he had much in the way of oral skills, @@.red;they've likely suffered.@@ @@.hotpink;$He's happy with your changes to $his lips,@@ 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, $activeSlave.devotion += 4>>
- <<if $activeSlave.oralSkill > 10>>
- <<set $activeSlave.oralSkill -= 10>>
+ <<if $activeSlave.skill.oral > 10>>
+ <<set $activeSlave.skill.oral -= 10>>
<</if>>
<<elseif ($activeSlave.devotion > 50)>>
$He puckers $his new lips experimentally and turns to you with a smile to show them off. $He's still sore, so $he's careful as $he blows you an awkward kiss. If $he had much in the way of oral skills, @@.red;they've likely suffered.@@ @@.hotpink;$He's happy with your changes to $his lips.@@ As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.devotion += 4>>
- <<if $activeSlave.oralSkill > 10>>
- <<set $activeSlave.oralSkill -= 10>>
+ <<if $activeSlave.skill.oral > 10>>
+ <<set $activeSlave.skill.oral -= 10>>
<</if>>
<<elseif ($activeSlave.devotion >= -20)>>
$He <<if canSee($activeSlave)>>eyes<<else>>puckers<</if>> $his new lips skeptically. $He's still sore, so $he doesn't touch them. $He's come to terms with the fact that $he's a slave, so $he expected something like this when $he was sent to the surgery. $He isn't much affected mentally, @@.red;but if $he had much in the way of oral skills, they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body.
<<set $activeSlave.trust -= 5>>
- <<if $activeSlave.oralSkill > 10>>
- <<set $activeSlave.oralSkill -= 10>>
+ <<if $activeSlave.skill.oral > 10>>
+ <<set $activeSlave.skill.oral -= 10>>
<</if>>
<<else>>
$He <<if canSee($activeSlave)>>eyes<<else>>puckers<</if>> $his new lips with resentment. $He's still sore, so $he doesn't touch them, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>. $He still thinks of $himself as a person, so $he isn't used to the idea of being surgically altered to suit your every whim. If $he had much in the way of oral skills, @@.red;they've likely suffered.@@ For now, @@.mediumorchid;$he seems to view these fake lips as a cruel imposition.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;terribly afraid@@ of your total power over $his body.
<<set $activeSlave.trust -= 10>>
<<set $activeSlave.devotion -= 5>>
- <<if $activeSlave.oralSkill > 10>>
- <<set $activeSlave.oralSkill -= 10>>
+ <<if $activeSlave.skill.oral > 10>>
+ <<set $activeSlave.skill.oral -= 10>>
<</if>>
<</if>>
@@ -1985,7 +1985,7 @@ As the remote surgery's long recovery cycle completes,
<<if $activeSlave.devotion <= 20>>
$He's @@.mediumaquamarine;more willing to trust you@@ after this. If $he doubts that you have some sort of long term plan for $him, all $he has to do is <<if canSee($activeSlave)>>look down and examine<<else>>feel<</if>> $his elegant, natural prosthetics, which are often mistaken for the genuine article. Even $he makes the mistake at times as $he gets used to them.
<<set $activeSlave.trust += 5>>
- <<elseif $activeSlave.entertainSkill >= 100>>
+ <<elseif $activeSlave.skill.entertainment >= 100>>
Since $he's a masterful entertainer, $he knows multiple styles of dance, though $his straightforward modern prosthetics never allowed $him to be anything more than a mechanically competent dancer. $He finds that $he has far better balance now, in addition to looking more natural. Before long, $he goes //en pointe// and holds the position, before collapsing in a heap. It soon becomes apparent that this wasn't due to clumsiness: $he's sobbing so hard $he can barely breathe. $He @@.hotpink;thanks you profusely@@ the next time $he sees you, eyes still puffy with tears of joy.
<<set $activeSlave.devotion += 5>>
<<else>>
@@ -2000,7 +2000,7 @@ As the remote surgery's long recovery cycle completes,
<<if $activeSlave.devotion <= 20>>
$He's @@.gold;frightened,@@ once $he discovers what $he can do, and what $he is. $His integral weapons are locked out by the arcology systems, for now, but $he quickly realizes what they are. $He is not, to say the least, thrilled by the revelation that $he is now a living weapon, and is kept awake by thoughts of what you might be planning for $him.
<<set $activeSlave.trust -= 5>>
- <<elseif ($activeSlave.combatSkill == 1) && ($activeSlave.devotion > 75)>>
+ <<elseif ($activeSlave.skill.combat == 1) && ($activeSlave.devotion > 75)>>
$He leaves the surgery with a purpose, $his footsteps a bit heavier than before. $He heads down to the armory's range, still naked, and when $he gets there, $he places $his dominant hand over $his thigh on that side. It folds open, revealing a handgun, which $he draws and empties into a <<if canSee($activeSlave)>>target<<else>>beeping target<</if>>; as $he fires the last rounds, $he uses $his off hand to reach down to that thigh, which folds open and reveals spare magazines. $He @@.hotpink;thanks you profusely@@ the next time $he sees you. $He knows that $his prosthetics are a wash, at best, in terms of actual combat effectiveness; they'll never match the reliability and dexterity of the genuine article. But $he thinks they are //cool.//
<<set $activeSlave.devotion += 5>>
<<else>>
@@ -2015,7 +2015,7 @@ As the remote surgery's long recovery cycle completes,
<<if $activeSlave.devotion <= 20>>
$He's @@.gold;frightened,@@ once $he discovers what $he can do, and what $he is. $His cybernetic limbs are restricted by the arcology systems, for now, but $he quickly realizes what they are. $He is not, to say the least, thrilled by the revelation that $he is now a living weapon, and is kept awake by thoughts of what you might be planning for $him.
<<set $activeSlave.trust -= 5>>
- <<elseif ($activeSlave.combatSkill == 1) && ($activeSlave.devotion > 75)>>
+ <<elseif ($activeSlave.skill.combat == 1) && ($activeSlave.devotion > 75)>>
$He leaves the surgery with a purpose, $his footsteps a bit heavier than before. $He heads down to the armory's range, still naked, and when $he gets there, $he places $his dominant hand over $his thigh on that side. It folds open, revealing a handgun, which $he draws and empties into a <<if canSee($activeSlave)>>target<<else>>beeping target<</if>>; as $he fires the last rounds, $he uses $his off hand to reach down to that thigh, which folds open and reveals spare magazines. $He @@.hotpink;thanks you profusely@@ the next time $he sees you. $He knows that $his prosthetics will enhance $his combat effectiveness and $he thinks they are //cool.//
<<set $activeSlave.devotion += 5>>
<<else>>
@@ -2265,26 +2265,26 @@ As the remote surgery's long recovery cycle completes,
<<elseif ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
$He leaves the surgery with a terribly sore rear end. $He is @@.hotpink;filled with joy@@ at the prospect of having a tight butt all over again, so much so that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. If $he had much in the way of anal skills, @@.red;they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.trust += 4, $activeSlave.devotion += 10>>
- <<if $activeSlave.analSkill > 10>>
- <<set $activeSlave.analSkill -= 10>>
+ <<if $activeSlave.skill.anal > 10>>
+ <<set $activeSlave.skill.anal -= 10>>
<</if>>
<<elseif ($activeSlave.devotion > 50)>>
$He leaves the surgery with a terribly sore rear end. $He's a bit anxious at the prospect of the pain having to get back to a loose asshole the hard way, but $he's @@.hotpink;happy@@ that you think $him worth the effort of surgical improvement. If $he had much in the way of anal skills, @@.red;they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.devotion += 4>>
- <<if $activeSlave.analSkill > 10>>
- <<set $activeSlave.analSkill -= 10>>
+ <<if $activeSlave.skill.anal > 10>>
+ <<set $activeSlave.skill.anal -= 10>>
<</if>>
<<elseif ($activeSlave.devotion >= -20)>>
$He leaves the surgery with a terribly sore rear end. $He knows $he'll have to endure the pain of being fucked in a tight asshole again soon enough, but trepidation is nothing new for $him. If $he had much in the way of anal skills, @@.red;they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body.
<<set $activeSlave.trust -= 5>>
- <<if $activeSlave.analSkill > 10>>
- <<set $activeSlave.analSkill -= 10>>
+ <<if $activeSlave.skill.anal > 10>>
+ <<set $activeSlave.skill.anal -= 10>>
<</if>>
<<else>>
$He leaves the surgery with a terribly sore rear end. $He's @@.mediumorchid;horrified@@ at surgical alteration of $his rear end, and knows that this means that $he'll have to take the pain of sodomy in a tight ass all over again. If $he had much in the way of anal skills, @@.red;they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;terribly afraid@@ of your total power over $his most intimate parts.
<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 5>>
- <<if $activeSlave.analSkill > 10>>
- <<set $activeSlave.analSkill -= 10>>
+ <<if $activeSlave.skill.anal > 10>>
+ <<set $activeSlave.skill.anal -= 10>>
<</if>>
<</if>>
@@ -2355,26 +2355,26 @@ As the remote surgery's long recovery cycle completes,
<<elseif ($activeSlave.energy > 95)>>
$He leaves the surgery with a terribly sore pussy. $He is @@.hotpink;filled with joy@@ at the prospect of having a tight cunt again, so much so that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. If $he had much in the way of vanilla sex skills, @@.red;they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.trust += 4, $activeSlave.devotion += 10>>
- <<if $activeSlave.vaginalSkill > 10>>
- <<set $activeSlave.vaginalSkill -= 10>>
+ <<if $activeSlave.skill.vaginal > 10>>
+ <<set $activeSlave.skill.vaginal -= 10>>
<</if>>
<<elseif ($activeSlave.devotion > 50)>>
$He leaves the surgery with a terribly sore pussy. $He's @@.hotpink;happy@@ that you think $him worth the effort of surgical improvement, and a little excited to feel like $he's a girl again. If $he had much in the way of vanilla sex skills, @@.red;they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.devotion += 4>>
- <<if $activeSlave.vaginalSkill > 10>>
- <<set $activeSlave.vaginalSkill -= 10>>
+ <<if $activeSlave.skill.vaginal > 10>>
+ <<set $activeSlave.skill.vaginal -= 10>>
<</if>>
<<elseif ($activeSlave.devotion >= -20)>>
$He leaves the surgery with a terribly sore pussy. $He's somewhat revolted by the surgery, but as far as $he's concerned, the short recovery period will mean a time during which $he can be sure no one will use $his pussy. If $he had much in the way of vanilla sex skills, @@.red;they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body.
<<set $activeSlave.trust -= 5>>
- <<if $activeSlave.vaginalSkill > 10>>
- <<set $activeSlave.vaginalSkill -= 10>>
+ <<if $activeSlave.skill.vaginal > 10>>
+ <<set $activeSlave.skill.vaginal -= 10>>
<</if>>
<<else>>
$He leaves the surgery with a terribly sore pussy. $He's @@.mediumorchid;horrified@@ at surgical alteration of $his womanhood; this is probably more of an invasion than $he could readily imagine before today. If $he had much in the way of vanilla sex skills, @@.red;they've likely suffered.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;terribly afraid@@ of your total power over $his most intimate parts.
<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 5>>
- <<if $activeSlave.vaginalSkill > 10>>
- <<set $activeSlave.vaginalSkill -= 10>>
+ <<if $activeSlave.skill.vaginal > 10>>
+ <<set $activeSlave.skill.vaginal -= 10>>
<</if>>
<</if>>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 0537e3beee656d6ee4904172675cfc1e74c0fa3c..5ef36b31c635ef62413df91f542aa74528950e77 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -313,7 +313,7 @@ Collar: ''$activeSlave.collar.''
<<optionif>>
<<option "shock punishment" "Shock punishment">>
<<option "dildo gag" "Dildo gag">>
- <<optionif `isItemAccessible("massive dildo gag") && $activeSlave.oralSkill > 50`>>
+ <<optionif `isItemAccessible("massive dildo gag") && $activeSlave.skill.oral > 50`>>
<<option "massive dildo gag" "Massive dildo gag">>
<<optionif>>
<<option "ball gag" "Ball gag">>
@@ -389,7 +389,7 @@ Collar: ''$activeSlave.collar.''
Torso accessory: ''$activeSlave.bellyAccessory.''
<br>
-//<<waistDescription>><<pregnancyDescription>><<clothingCorsetDescription>><<CorsetPiercingDescription>>//
+//<<= App.Desc.waist($activeSlave)>><<pregnancyDescription>><<clothingCorsetDescription>><<CorsetPiercingDescription>>//
<<options $activeSlave.bellyAccessory>>
<<option "none" "None">>
<<option "a corset" "Tight corset">>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index bb34bda797a64c05b44a754d1f022939d16b1452..3d8083498c91874328e2b29de13b59ee422097ff 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -33,7 +33,7 @@
sodomy.
<<elseif $activeSlave.dick > 0>>
stiff pricks.
-<<elseif $activeSlave.oralSkill >= 100>>
+<<elseif $activeSlave.skill.oral >= 100>>
oral sex.
<<elseif $activeSlave.boobs > 1000>>
boobs.
@@ -121,6 +121,13 @@
fertile.
<</if>>
<</if>>
+ <<if $activeSlave.geneticQuirks.superfetation == 2>>
+ <<if isFertile($activeSlave)>>
+ $He posses a rare genetic flaw that causes pregnancy to not block ovulation. $He is fully capable of getting pregnant while already pregnant.
+ <<else>>
+ $He posses a rare genetic flaw that causes pregnancy to not block ovulation; not that it matters when $he can't get pregnant.
+ <</if>>
+ <</if>>
<<if $activeSlave.geneticQuirks.wellHung == 2>>
<<if $activeSlave.physicalAge <= 16 && $activeSlave.hormoneBalance < 100 && $activeSlave.dick > 0>>
$He is likely to experience an inordinate amount of penile growth during $his physical development.
@@ -134,19 +141,6 @@
<</widget>>
-<<widget "brandDescription">>
-
-<<if ($activeSlave.brand != 0)>>
- <<set $bellyAccessory = $activeSlave.bellyAccessory>>
- <<if setup.fakeBellies.includes($bellyAccessory) && ($activeSlave.brandLocation == "belly")>>
- $His fake belly has $activeSlave.brand branded on it.
- <<else>>
- $He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation.
- <</if>>
-<</if>>
-
-<</widget>>
-
/* deprecated, use originPronounReplace() instead. For now this serves as a convenient list of default origins. */
<<widget "originDescription">>
<<switch $args[0].origin>>
@@ -408,4 +402,4 @@
<<default>>
<<print $args[0].origin>>
<</switch>>
-<</widget>>
\ No newline at end of file
+<</widget>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 523f441cc9cb3976f1df406bf28df26ffb29684d..775ac7bbfa24b19e12a062aed7b63efcdb91380d 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1269,7 +1269,7 @@ $His
<<if $showBodyMods == 1>>
<<if $activeSlave.fuckdoll == 0>>
<<if ($activeSlave.brand != 0) && ["breasts", "left breast", "right breast"].includes($activeSlave.brandLocation)>>
- <<brandDescription>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</if>>
<</if>>
@@ -2572,11 +2572,11 @@ $He's got a
<<widget "AnusDescription">>
-<<if ($activeSlave.skin == "tanned") || ($activeSlave.skin == "fair") || ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>>
+<<if (skinToneLevel($activeSlave.skin) < 13)>>
<<set $skinDesc = "pink">>
<<elseif ($activeSlave.anusTat == "bleached")>>
<<set $skinDesc = $activeSlave.skin>>
-<<elseif ($activeSlave.skin == "brown") || ($activeSlave.race == "black")>>
+<<elseif (skinToneLevel($activeSlave.skin) > 19)>>
<<set $skinDesc = "dark">>
<<else>>
<<set $skinDesc = "darker">>
@@ -2662,13 +2662,13 @@ $He's got a
<</if>>
<</if>>
<<else>>
- <<if $activeSlave.analSkill >= 100>>
+ <<if $activeSlave.skill.anal >= 100>>
$He is a @@.aquamarine;masterful anal slut@@.
- <<elseif $activeSlave.analSkill > 60>>
+ <<elseif $activeSlave.skill.anal > 60>>
$He is an @@.aquamarine;expert anal slut@@.
- <<elseif $activeSlave.analSkill > 30>>
+ <<elseif $activeSlave.skill.anal > 30>>
$He is a @@.aquamarine;skilled anal slut@@.
- <<elseif $activeSlave.analSkill > 10>>
+ <<elseif $activeSlave.skill.anal > 10>>
$He has @@.aquamarine;basic knowledge about anal@@.
<<else>>
$He is unskilled at taking anal.
@@ -5003,7 +5003,7 @@ $He's got a
<<if $showBodyMods == 1>>
<<if ($activeSlave.brand != 0)>>
<<if ($activeSlave.brandLocation == "pubic mound")>>
- <<brandDescription>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</if>>
<</if>>
@@ -5256,10 +5256,10 @@ $He's got a
<<else>>
<<if $activeSlave.vagina == -1>>
<<if $seeDicks >= 100>><<elseif $activeSlave.anus == 0>><<else>>Since $he lacks a vagina, $he takes it up <<if $seeRace == 1>>$his $activeSlave.race<<else>>the<</if>> ass instead.<</if>>
- <<elseif $activeSlave.vaginalSkill >= 100>>$He is a @@.aquamarine;vanilla sex master@@.
- <<elseif $activeSlave.vaginalSkill > 60>>$He is a @@.aquamarine;vanilla sex expert@@.
- <<elseif $activeSlave.vaginalSkill > 30>>$He is @@.aquamarine;skilled at vanilla sex@@.
- <<elseif $activeSlave.vaginalSkill > 10>>$He has @@.aquamarine;basic knowledge about vanilla sex@@.
+ <<elseif $activeSlave.skill.vaginal >= 100>>$He is a @@.aquamarine;vanilla sex master@@.
+ <<elseif $activeSlave.skill.vaginal > 60>>$He is a @@.aquamarine;vanilla sex expert@@.
+ <<elseif $activeSlave.skill.vaginal > 30>>$He is @@.aquamarine;skilled at vanilla sex@@.
+ <<elseif $activeSlave.skill.vaginal > 10>>$He has @@.aquamarine;basic knowledge about vanilla sex@@.
<<else>>$He is unskilled at vaginal sex.
<</if>>
<</if>>
@@ -5674,10 +5674,10 @@ $He has
<</if>>
<<else>>
$He is
- <<if $activeSlave.oralSkill >= 100>>an @@.aquamarine;oral sex master.@@
- <<elseif $activeSlave.oralSkill > 60>>an @@.aquamarine;expert at oral.@@
- <<elseif $activeSlave.oralSkill > 30>>@@.aquamarine;orally skilled.@@
- <<elseif $activeSlave.oralSkill > 10>>@@.aquamarine;capable of basic oral sex.@@
+ <<if $activeSlave.skill.oral >= 100>>an @@.aquamarine;oral sex master.@@
+ <<elseif $activeSlave.skill.oral > 60>>an @@.aquamarine;expert at oral.@@
+ <<elseif $activeSlave.skill.oral > 30>>@@.aquamarine;orally skilled.@@
+ <<elseif $activeSlave.skill.oral > 10>>@@.aquamarine;capable of basic oral sex.@@
<<else>>unskilled at oral sex.
<</if>>
<</if>>
@@ -17326,292 +17326,6 @@ $He has
<</widget>>
-<<widget "waistDescription">>
-
-<<if $activeSlave.belly >= 1500>>
- <<set _belly = bellyAdjective($activeSlave)>>
-<</if>>
-
-$He has
-
-<<if $activeSlave.waist > 95>>
- a badly @@.red;masculine waist@@ that ruins $his figure<<if $activeSlave.weight > 30>> and greatly exaggerates how fat $he is<<elseif $activeSlave.weight < -30>> despite how thin $he is<</if>>.
- <<if $activeSlave.belly >= 1500>>
- <<if $activeSlave.belly >= 750000>>
- $His _belly belly grotesquely bulges around $his thick waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is horribly distended by $his bursting womb in a last ditch effort to find more room for $his children, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 300000>>
- $His _belly belly is hidden by $his thick waist.
- <<elseif $activeSlave.belly < 450000>>
- $His _belly belly can be seen around $his thick waist.
- <<elseif $activeSlave.belly < 600000>>
- $His _belly belly can clearly be seen around $his thick waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is swollen wider than usual by $his crowded womb in its search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 750000>>
- $His _belly belly lewdly bulges around $his thick waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is greatly distended by $his overfilled womb in its desperate search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<<elseif $activeSlave.waist > 40>>
- a broad, @@.red;ugly waist@@ that makes $him look mannish<<if $activeSlave.weight > 30>> and exaggerates how fat $he is<<elseif $activeSlave.weight < -30>> despite how thin $he is<</if>>.
- <<if $activeSlave.belly >= 1500>>
- <<if $activeSlave.belly >= 750000>>
- $His _belly belly grotesquely bulges around $his chunky waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is horribly distended by $his bursting womb in a last ditch effort to find more room for $his children, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 150000>>
- $His _belly belly is hidden by $his chunky waist.
- <<elseif $activeSlave.belly < 450000>>
- $His _belly belly can be seen around $his chunky waist.
- <<elseif $activeSlave.belly < 600000>>
- $His _belly belly can clearly be seen around $his chunky waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is swollen wider than usual by $his crowded womb in its search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 750000>>
- $His _belly belly lewdly bulges around $his chunky waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is greatly distended by $his overfilled womb in its desperate search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<<elseif $activeSlave.waist > 10>>
- an @@.red;unattractive waist@@ that conceals $his <<if $activeSlave.visualAge > 25>>girlish<<else>>womanly<</if>> figure<<if $activeSlave.weight > 30>> and accentuates how fat $he is<<elseif $activeSlave.weight < -30>> despite how thin $he is<</if>>.
- <<if $activeSlave.belly >= 1500>>
- <<if $activeSlave.belly >= 750000>>
- $His _belly belly grotesquely bulges around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is horribly distended by $his bursting womb in a last ditch effort to find more room for $his children, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 10000>>
- From behind, $his figure hides $his _belly belly.
- <<elseif $activeSlave.belly < 200000>>
- From behind, $his figure barely hides $his _belly belly.
- <<elseif $activeSlave.belly < 300000>>
- $His _belly belly can be seen around $his waist.
- <<elseif $activeSlave.belly < 450000>>
- $His _belly belly can clearly be seen around $his waist.
- <<elseif $activeSlave.belly < 600000>>
- $His _belly belly can clearly be seen around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is swollen wider than usual by $his crowded womb in its search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 750000>>
- $His _belly belly lewdly bulges around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is greatly distended by $his overfilled womb in its desperate search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<<elseif $activeSlave.waist >= -10>>
- an average waist for a <<if $activeSlave.visualAge > 25>>$girl<<else>>$woman<</if>><<if $activeSlave.weight > 30>>, though it looks broader since $he's fat<<elseif $activeSlave.weight < -30>>, though it looks narrower since $he's thin<</if>>.
- <<if $activeSlave.belly >= 1500>>
- <<if $activeSlave.belly >= 750000>>
- $His _belly belly grotesquely bulges around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is horribly distended by $his bursting womb in a last ditch effort to find more room for $his children, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 10000>>
- From behind, $his figure hides $his _belly belly.
- <<elseif $activeSlave.belly < 200000>>
- From behind, $his figure barely hides $his _belly belly.
- <<elseif $activeSlave.belly < 300000>>
- $His _belly belly can be seen around $his waist.
- <<elseif $activeSlave.belly < 450000>>
- $His _belly belly can clearly be seen around $his waist.
- <<elseif $activeSlave.belly < 600000>>
- $His _belly belly can clearly be seen around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is swollen wider than usual by $his crowded womb in its search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 750000>>
- $His _belly belly lewdly bulges around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is greatly distended by $his overfilled womb in its desperate search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<<elseif $activeSlave.waist >= -40>>
- a nice @@.pink;feminine waist@@ that gives $him a <<if $activeSlave.visualAge > 25>>girlish<<else>>womanly<</if>> figure<<if $activeSlave.weight > 30>> despite $his extra weight<<elseif $activeSlave.weight < -30>> and accentuates how thin $he is<</if>>.
- <<if $activeSlave.belly >= 1500>>
- <<if $activeSlave.belly >= 750000>>
- $His _belly belly grotesquely bulges around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is horribly distended by $his bursting womb in a last ditch effort to find more room for $his children, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 10000>>
- From behind, $his figure hides $his _belly belly.
- <<elseif $activeSlave.belly < 100000>>
- From behind, $his figure barely hides $his _belly belly.
- <<elseif $activeSlave.belly < 300000>>
- $His _belly belly can be seen around $his waist.
- <<elseif $activeSlave.belly < 450000>>
- $His _belly belly can clearly be seen around $his waist.
- <<elseif $activeSlave.belly < 600000>>
- $His _belly belly can clearly be seen around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is swollen wider than usual by $his crowded womb in its search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 750000>>
- $His _belly belly lewdly bulges around $his waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is greatly distended by $his overfilled womb in its desperate search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<<elseif $activeSlave.waist >= -95>>
- a hot @@.pink;wasp waist@@ that gives $him an hourglass figure<<if $activeSlave.weight > 30>> despite $his extra weight<<elseif $activeSlave.weight < -30>> further accentuated by how thin $he is<</if>>.
- <<if $activeSlave.belly >= 1500>>
- <<if $activeSlave.belly >= 750000>>
- $His _belly belly grotesquely bulges around $his narrow waist and continues <<if $activeSlave.belly >= 1000000>>quite the distance<<else>>over half a <<if $showInches == 2>>yard<<else>>meter<</if>><</if>> farther to either side.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is horribly distended by $his bursting womb in a last ditch effort to find more room for $his children, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 5000>>
- From behind, $his narrow figure hides $his _belly belly.
- <<elseif $activeSlave.belly < 80000>>
- From behind, $his narrow figure barely hides $his _belly belly.
- <<elseif $activeSlave.belly < 100000>>
- $His _belly belly can be seen around $his narrow waist.
- <<elseif $activeSlave.belly < 450000>>
- $His _belly belly lewdly extends past $his narrow waist.
- <<elseif $activeSlave.belly < 600000>>
- $His _belly belly lewdly distends far to either side of $his narrow waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is swollen wider than usual by $his crowded womb in its search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 750000>>
- $His _belly belly lewdly bulges to either side of $his narrow waist and continues for nearly half a <<if $showInches == 2>>yard<<else>>meter<</if>> in both directions.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is greatly distended by $his overfilled womb in its desperate search for more room, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<<else>>
- an @@.pink;absurdly narrow waist@@ that gives $him a cartoonishly hourglass figure<<if $activeSlave.weight > 30>> made even more ludicrous by $his extra weight<<elseif $activeSlave.weight < -30>> made even more ludicrous by how thin $he is<</if>>.
- <<if $activeSlave.belly >= 1500>>
- <<if $activeSlave.belly >= 750000>>
- $His _belly belly grotesquely bulges around $his narrow waist and continues <<if $activeSlave.belly >= 1000000>>quite the distance<<else>>over half a <<if $showInches == 2>>yard<<else>>meter<</if>><</if>> farther to either side.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is horribly distended by $his bursting womb in a last ditch effort to find more room for $his children, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 2000>>
- From behind, $his narrow figure hides $his _belly belly.
- <<elseif $activeSlave.belly < 5000>>
- From behind, $his narrow figure barely hides $his _belly belly.
- <<elseif $activeSlave.belly < 8000>>
- $His _belly belly can be seen around $his narrow waist.
- <<elseif $activeSlave.belly < 15000>>
- $His _belly belly lewdly extends past $his narrow waist.
- <<elseif $activeSlave.belly < 45000>>
- $His _belly belly lewdly distends far to either side of $his narrow waist.
- <<elseif $activeSlave.belly < 600000>>
- $His _belly belly lewdly distends far to either side of $his narrow waist.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is swollen wider than usual by $his crowded womb in its search for more room, leaving $his original waistline only visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <<elseif $activeSlave.belly < 750000>>
- $His _belly belly lewdly bulges to either side of $his narrow waist and continues for nearly half a <<if $showInches == 2>>yard<<else>>meter<</if>> in both directions.
- <<if $activeSlave.preg > 3>>
- <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
- $His waist is greatly distended by $his overfilled womb in its desperate search for more room, leaving $his original waistline barely visible from behind.
- <<else>>
- However, $his body is so adapted to pregnancy that $his womb rests forward enough to preserve the shape of $his waistline.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<</if>>
-
-<</widget>>
-
<<widget "heelDescription">>
@@ -17634,7 +17348,8 @@ $He has
<<widget "skinDescription">>
<<if $activeSlave.fuckdoll > 0>>
- The small areas of visible skin are <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>.
+ The small areas of visible skin are <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><</if>>.
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>$His skin has been tanned <<if $activeSlave.skin == "sun tanned">>to a natural, healthy-looking tone<<elseif $activeSlave.skin == "spray tanned">>with obvious, garish-looking makeup<</if>>.<</if>>
<<elseif ($seeNationality == 1)>>
<<if $activeSlave.nationality == 0>>
Ethnically, $he's
@@ -17649,7 +17364,8 @@ $He has
<<else>>
$He's originally @@.tan;<<print $activeSlave.nationality>>;@@ ethnically, $he's
<</if>>
- @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>.
+ @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><</if>>.
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>$His skin has been tanned <<if $activeSlave.skin == "sun tanned">>to a natural, healthy-looking tone<<elseif $activeSlave.skin == "spray tanned">>with obvious, garish-looking makeup<</if>>.<</if>>
<<if $activeSlave.race != $activeSlave.origRace && $saleDescription != 1>>
$He has received plastic surgery to appear <<print $activeSlave.race>>; $he is originally <<print $activeSlave.origRace>>.
<<elseif $activeSlave.race != $activeSlave.origRace && $saleDescription == 1>>
@@ -17664,7 +17380,8 @@ $He has
<</if>>
<</if>>
<<elseif ($seeRace == 1)>>
- Ethnically, $he's @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>.
+ Ethnically, $he's @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><</if>>.
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>$His skin has been tanned <<if $activeSlave.skin == "sun tanned">>to a natural, healthy-looking tone<<elseif $activeSlave.skin == "spray tanned">>with obvious, garish-looking makeup<</if>>.<</if>>
<<if $activeSlave.race != $activeSlave.origRace && $saleDescription != 1>>
$He has received plastic surgery to appear <<print $activeSlave.race>>; $he is originally <<print $activeSlave.origRace>>.
<<elseif $activeSlave.race != $activeSlave.origRace && $saleDescription == 1>>
@@ -17679,7 +17396,8 @@ $He has
<</if>>
<</if>>
<<else>>
- $His skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>.
+ $His skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><</if>>.
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>$His skin has been tanned <<if $activeSlave.skin == "sun tanned">>to a natural, healthy-looking tone<<elseif $activeSlave.skin == "spray tanned">>with obvious, garish-looking makeup<</if>>.<</if>>
<</if>>
<</widget>>
@@ -17865,30 +17583,6 @@ $He has
<</widget>>
-
-<<widget "amputeeDescription">>
-
-<<if $activeSlave.amp != 0>>
- <<if $activeSlave.amp == -1>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ but $he's equipped with a set of modern prosthetic limbs that allow $him a fairly normal life.
- <<elseif $activeSlave.amp == -2>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ but $he's equipped with P-Limbs customized for sex. $His fingertips vibrate, $his finger joints are masked to prevent pinching, and $his hands can dispense lube.
- <<elseif $activeSlave.amp == -3>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ but $he's equipped with P-Limbs customized to look natural. They are covered in a material that closely mimics living $activeSlave.skin skin, and their servos are noise dampened.
- <<elseif $activeSlave.amp == -4>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ but $he's equipped with P-Limbs customized for combat. They're hardened, strengthened, and more responsive, and they conceal taser knuckles and extensible forearm blades.
- <<elseif $activeSlave.amp == -5>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ but $he's equipped with advanced cybernetic P-Limbs. The ultimate fusion of combat effectiveness and instruments of pleasure, they're capable of performing multiple functions. They can enhance sex through $his vibrating hands and increase $his combat skills with hardened, yet flexible artificial muscles. They have an advanced artificial skin that can send electrical impulses that can cause stimulation or extreme pain.
- <<elseif $activeSlave.fuckdoll > 0>>
- $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ making $him a convenient torso-only sex toy.
- <<else>>
- The most obvious thing about $activeSlave.slaveName is that $he is a @@.pink;quadruple amputee:@@ $he has neither arms nor legs.
- <</if>>
-<</if>>
-
-<</widget>>
-
-
<<widget "boobsShapeDescription">>
<<if $showImplantEffects == 1>>
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 058480f26795382984ceca8cc11d811d427b84e6..78a315ad376b5414fdddfb1b3877eeab8ab50c8c 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -85,7 +85,7 @@
limp dicks.
<<elseif ($activeSlave.dick > 0)>>
erect cocks.
- <<elseif ($activeSlave.oralSkill >= 100)>>
+ <<elseif ($activeSlave.skill.oral >= 100)>>
tongues.
<<elseif ($activeSlave.boobs > 1000)>>
heavy breasts.
@@ -615,4 +615,4 @@ $He has a corset piercing, a ladder of steel rings running up each side of $his
<</if>>
<</if>>
<</if>>
-<</widget>>
\ No newline at end of file
+<</widget>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 90d53b5f61a55f76d9f22bfe0272e7264414e3fa..69d3db3d6eb18bba1d151794dd6dc6397a20a408 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -294,8 +294,8 @@ $activeSlave.slaveName is
which lacks arm or leg holes, so $his limbless torso is in a net.
<<else>>
<<if (($activeSlave.nails == 2) || ($activeSlave.nails == 7) || ($activeSlave.nails == 9)) && (($activeSlave.makeup == 3) || ($activeSlave.makeup == 6) || ($activeSlave.nails == 8))>>
- $activeSlave.hColor to match $his monocolor style,
- <<elseif ($activeSlave.skin == "dark") || ($activeSlave.skin == "black")>>
+ $activeSlave.hColor to match $his monochrome style,
+ <<elseif (skinToneLevel($activeSlave.skin) > 22)>>
in white to create a striking contrast with $his $activeSlave.skin skin,
<<elseif ($activeSlave.addict > 5)>>
in the electric blue color of aphrodisiacs to signal $he's down to fuck high,
@@ -753,9 +753,9 @@ $activeSlave.slaveName is
golden whip and manacles insignia of a senior slave officer,
<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $Attendant.ID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID) || ($activeSlave.ID == $Collectrix.ID)>>
golden manacles insignia of a junior slave officer,
- <<elseif ($activeSlave.combatSkill > 0) && ($activeSlave.amp == -4)>>
+ <<elseif ($activeSlave.skill.combat > 0) && ($activeSlave.amp == -4)>>
silver spear and manacles insignia of an augmented slave soldier,
- <<elseif ($activeSlave.combatSkill > 0) && ($activeSlave.amp != 1)>>
+ <<elseif ($activeSlave.skill.combat > 0) && ($activeSlave.amp != 1)>>
silver manacles insignia of a slave soldier,
<<else>>
black iron manacles insignia of a slave,
@@ -775,9 +775,9 @@ $activeSlave.slaveName is
golden whip and manacles insignia of a senior slave officer,
<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $Attendant.ID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID) || ($activeSlave.ID == $Collectrix.ID)>>
golden manacles insignia of a junior slave officer,
- <<elseif ($activeSlave.combatSkill > 0) && ($activeSlave.amp == -4)>>
+ <<elseif ($activeSlave.skill.combat > 0) && ($activeSlave.amp == -4)>>
silver spear and manacles insignia of an augmented slave soldier,
- <<elseif ($activeSlave.combatSkill > 0) && ($activeSlave.amp != 1)>>
+ <<elseif ($activeSlave.skill.combat > 0) && ($activeSlave.amp != 1)>>
silver manacles insignia of a slave soldier,
<<else>>
black iron manacles insignia of a slave,
@@ -797,9 +797,9 @@ $activeSlave.slaveName is
golden whip and manacles insignia of a senior slave officer,
<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $Attendant.ID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID) || ($activeSlave.ID == $Collectrix.ID)>>
golden manacles insignia of a junior slave officer,
- <<elseif ($activeSlave.combatSkill > 0) && ($activeSlave.amp == -4)>>
+ <<elseif ($activeSlave.skill.combat > 0) && ($activeSlave.amp == -4)>>
silver spear and manacles insignia of an augmented slave soldier,
- <<elseif ($activeSlave.combatSkill > 0) && ($activeSlave.amp != 1)>>
+ <<elseif ($activeSlave.skill.combat > 0) && ($activeSlave.amp != 1)>>
silver manacles insignia of a slave soldier,
<<else>>
black iron manacles insignia of a slave,
@@ -819,9 +819,9 @@ $activeSlave.slaveName is
golden whip and manacles insignia of a senior slave officer,
<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $Attendant.ID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID) || ($activeSlave.ID == $Collectrix.ID)>>
golden manacles insignia of a junior slave officer,
- <<elseif ($activeSlave.combatSkill > 0) && ($activeSlave.amp == -4)>>
+ <<elseif ($activeSlave.skill.combat > 0) && ($activeSlave.amp == -4)>>
silver spear and manacles insignia of an augmented slave soldier,
- <<elseif ($activeSlave.combatSkill > 0) && ($activeSlave.amp != 1)>>
+ <<elseif ($activeSlave.skill.combat > 0) && ($activeSlave.amp != 1)>>
silver manacles insignia of a slave soldier,
<<else>>
black iron manacles insignia of a slave,
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 6901737f14f7ae4471ee27ef2d44642d1c2dbb89..173bbe91bbe3c4166c62f07d3a941becdd1934ca 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -272,7 +272,7 @@
A line-art rendition of $activeSlave.slaveName $himself cumming copiously while riding a dick is tattooed across $his entire back.
<<elseif $activeSlave.lactation > 0>>
A line-art rendition of $activeSlave.slaveName $himself nursing a pair of $his fellow slaves is tattooed across $his entire back.
- <<elseif $activeSlave.vaginalSkill >= 100>>
+ <<elseif $activeSlave.skill.vaginal >= 100>>
A line-art rendition of $activeSlave.slaveName $himself performing reverse cowgirl and spreading $his pussy is tattooed across $his entire back.
<<elseif $PC.vagina == 1>>
A line-art rendition of $activeSlave.slaveName $himself eating pussy is tattooed across $his entire back.
@@ -405,7 +405,7 @@
<</switch>>
<</if>>
<<if ($activeSlave.brand != 0) && ["buttocks", "left buttock", "left thigh", "right buttock", "right thigh", "thighs"].includes($activeSlave.brandLocation)>>
- <<brandDescription>>
+ <<= App.Desc.brand($activeSlave)>>
<</if>>
<</widget>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index d9df8efafd63a1c932c1f4ad449bfa3de7f170e2..2416ed5cfb96836c89656ecb288dfbe6e0bd4dfa 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -15,10 +15,10 @@
<<if $activeSlave.vagina < 0>>
<<set $activeSlave.ovaries = 0>>
<<elseif $activeSlave.vagina < 1>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<</if>>
<<if $activeSlave.anus < 1>>
- <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.skill.anal = 0>>
<</if>>
<<set $activeSlave.actualAge = Number($activeSlave.actualAge) || 18>>
@@ -528,8 +528,8 @@
%/
<<widget "CustomSlaveWhoreSkills">>
<<replace #whoreskills>>
- <<if $customSlave.whoreSkills <= 10>>Unskilled at prostitution and entertainment.
- <<elseif $customSlave.whoreSkills <= 15>>Basic prostitution and entertainment skills.
+ <<if $customSlave.skill.whores <= 10>>Unskilled at prostitution and entertainment.
+ <<elseif $customSlave.skill.whores <= 15>>Basic prostitution and entertainment skills.
<<else>>Skilled at prostitution and entertainment.
<</if>>
<</replace>>
@@ -540,7 +540,7 @@
%/
<<widget "CustomSlaveCombatSkills">>
<<replace #combatskills>>
- <<if $customSlave.combatSkills == 0>>Unskilled at combat.
+ <<if $customSlave.skill.combats == 0>>Unskilled at combat.
<<else>>Skilled at combat.
<</if>>
<</replace>>
@@ -818,8 +818,8 @@
<</if>>
<<if $corpSpecEducation > 0>>
<<set $activeSlave.intelligenceImplant = 15 * $corpSpecEducation,
- $activeSlave.whoreSkill = Math.clamp($activeSlave.whoreSkill, 15 * $corpSpecEducation, 100),
- $activeSlave.entertainSkill = Math.clamp($activeSlave.entertainSkill, 15 * $corpSpecEducation, 100)>>
+ $activeSlave.skill.whore = Math.clamp($activeSlave.skill.whore, 15 * $corpSpecEducation, 100),
+ $activeSlave.skill.entertainment = Math.clamp($activeSlave.skill.entertainment, 15 * $corpSpecEducation, 100)>>
<<if $corpSpecEducation == 1>>
Its slave students receive basic slave educations.
<<elseif $corpSpecEducation == 2>>
@@ -829,16 +829,16 @@
Its slaves are not given special educational attention.
<</if>>
<<if $corpSpecSexEd > 0>>
- <<set $activeSlave.oralSkill = Math.clamp($activeSlave.oralSkill, 15 * $corpSpecSexEd, 100)>>
+ <<set $activeSlave.skill.oral = Math.clamp($activeSlave.skill.oral, 15 * $corpSpecSexEd, 100)>>
<<if $activeSlave.anus > 0>>
- <<set $activeSlave.analSkill = Math.clamp($activeSlave.analSkill, 15 * $corpSpecSexEd, 100)>>
+ <<set $activeSlave.skill.anal = Math.clamp($activeSlave.skill.anal, 15 * $corpSpecSexEd, 100)>>
<<elseif $activeSlave.anus == 0>>
- <<set $activeSlave.analSkill = Math.clamp($activeSlave.analSkill, 15, 100)>>
+ <<set $activeSlave.skill.anal = Math.clamp($activeSlave.skill.anal, 15, 100)>>
<</if>>
<<if $activeSlave.vagina > 0>>
- <<set $activeSlave.vaginalSkill = Math.clamp($activeSlave.vaginalSkill, 15 * $corpSpecSexEd, 100)>>
+ <<set $activeSlave.skill.vaginal = Math.clamp($activeSlave.skill.vaginal, 15 * $corpSpecSexEd, 100)>>
<<elseif $activeSlave.vagina == 0>>
- <<set $activeSlave.vaginalSkill = Math.clamp($activeSlave.vaginalSkill, 15, 100)>>
+ <<set $activeSlave.skill.vaginal = Math.clamp($activeSlave.skill.vaginal, 15, 100)>>
<</if>>
<<if $corpSpecSexEd == 1>>
Trainees spend many hours learning sexual competence.
@@ -853,11 +853,11 @@
The corporation uses subtle cosmetic surgery to improve its slaves for sale.
<<if ($activeSlave.anus > 3)>>
<<set $activeSlave.anus = 3>>
- <<if $activeSlave.analSkill > 10>><<set $activeSlave.analSkill -= 10>><</if>>
+ <<if $activeSlave.skill.anal > 10>><<set $activeSlave.skill.anal -= 10>><</if>>
<</if>>
<<if ($activeSlave.vagina > 3)>>
<<set $activeSlave.vagina = 3>>
- <<if $activeSlave.vaginalSkill > 10>><<set $activeSlave.vaginalSkill -= 10>><</if>>
+ <<if $activeSlave.skill.vaginal > 10>><<set $activeSlave.skill.vaginal -= 10>><</if>>
<</if>>
<<if $activeSlave.faceImplant <= 30 && $activeSlave.face <= 95>>
<<if $activeSlave.faceShape == "masculine">><<set $activeSlave.faceShape = "androgynous">><</if>>
@@ -1128,12 +1128,12 @@
<<set $activeSlave.trust = -20 + Math.trunc($arcologies[_market].prosperity/10) + random(0,10)>>
<<set $activeSlave.health = -50 + Math.trunc($arcologies[_market].prosperity/25) + random(0,5)>>
<<if $activeSlave.vagina > 0>>
- <<set $activeSlave.vaginalSkill += Math.clamp($arcologies[_market].prosperity/2, 15, 100)>>
+ <<set $activeSlave.skill.vaginal += Math.clamp($arcologies[_market].prosperity/2, 15, 100)>>
<</if>>
<<if $activeSlave.anus > 0>>
- <<set $activeSlave.analSkill += Math.clamp($arcologies[_market].prosperity/2, 15, 100)>>
+ <<set $activeSlave.skill.anal += Math.clamp($arcologies[_market].prosperity/2, 15, 100)>>
<</if>>
- <<set $activeSlave.oralSkill += Math.clamp($arcologies[_market].prosperity/2, 15, 100)>>
+ <<set $activeSlave.skill.oral += Math.clamp($arcologies[_market].prosperity/2, 15, 100)>>
<<set $activeSlave.attrKnown = 1>>
<<set $activeSlave.fetishKnown = 1>>
<<if $activeSlave.accent >= 3>>
@@ -1523,7 +1523,7 @@
<<elseif $arcologies[_market].FSEdoRevivalist > 20>>
They have frequently absorbed much culture there.
<<set $activeSlave.slaveName = setup.edoSlaveNames.random()>>
- <<set $activeSlave.entertainSkill = Math.clamp($activeSlave.entertainSkill, 35, 100)>>
+ <<set $activeSlave.skill.entertainment = Math.clamp($activeSlave.skill.entertainment, 35, 100)>>
<<elseif $arcologies[_market].FSArabianRevivalist > 20>>
They've often been part of large harems in which selflessness is prized.
<<if random(0,1) == 0>>
@@ -1609,12 +1609,12 @@
<<if $activeSlave.boobs > 500>>
<<set $activeSlave.mammaryCount += random(0,300)>>
<</if>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.addict = either(0, 0, 0, 10, 10, 20, 30)>>
<<set $activeSlave.chem = random(0,1000)>>
<<set $activeSlave.behavioralFlaw = "none">>
@@ -1661,11 +1661,11 @@
<<if $activeSlave.boobs > 500>>
<<set $activeSlave.mammaryCount += random(0,300)>>
<</if>>
- <<set $activeSlave.vaginalSkill = random(50,100)>>
- <<set $activeSlave.oralSkill = random(50,100)>>
- <<set $activeSlave.analSkill = random(50,100)>>
- <<set $activeSlave.whoreSkill = random(50,100)>>
- <<set $activeSlave.entertainSkill = random(50,100)>>
+ <<set $activeSlave.skill.vaginal = random(50,100)>>
+ <<set $activeSlave.skill.oral = random(50,100)>>
+ <<set $activeSlave.skill.anal = random(50,100)>>
+ <<set $activeSlave.skill.whore = random(50,100)>>
+ <<set $activeSlave.skill.entertainment = random(50,100)>>
<<switch $activeSlave.career>>
<<case "a lawyer">>
<<set $activeSlave.slaveName = "WCPU-HG">>
@@ -1690,12 +1690,12 @@
<<case "a teacher">>
<<set $activeSlave.slaveName = "WCPU-TE">>
<</switch>>
- <<set $activeSlave.slaveSurname = "#"+$activeSlave.vaginalSkill+$activeSlave.oralSkill+$activeSlave.analSkill+$activeSlave.whoreSkill+$activeSlave.entertainSkill+"-"+$activeSlave.intelligence>>
+ <<set $activeSlave.slaveSurname = "#"+$activeSlave.skill.vaginal+$activeSlave.skill.oral+$activeSlave.skill.anal+$activeSlave.skill.whore+$activeSlave.skill.entertainment+"-"+$activeSlave.intelligence>>
<<set $activeSlave.birthName = "", $activeSlave.birthSurname = "">>
<<if $activeSlave.career == "a soldier">>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<else>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<</if>>
<<set $activeSlave.addict = either(0, 0, 0, 10, 10, 20, 30)>>
<<set $activeSlave.chem = random(500,1000)>>
@@ -1764,7 +1764,7 @@
<<set $activeSlave.pregType = setPregType($activeSlave)>>
<</if>>
<<run SetBellySize($activeSlave)>>
- <<set $activeSlave.vaginalSkill = random(15,100)>>
+ <<set $activeSlave.skill.vaginal = random(15,100)>>
<<set $activeSlave.vagina = random(1,3)>>
<</if>>
<<if $activeSlave.balls > 0>>
@@ -1772,11 +1772,11 @@
<<set $activeSlave.balls = 0>>
<</if>>
<</if>>
- <<set $activeSlave.combatSkill = either(0, 0, 0, 0, 0, 1)>>
- <<set $activeSlave.entertainSkill = random(15,100)>>
- <<set $activeSlave.whoreSkill = random(15,100)>>
- <<set $activeSlave.oralSkill = random(15,100)>>
- <<set $activeSlave.analSkill = random(15,100)>>
+ <<set $activeSlave.skill.combat = either(0, 0, 0, 0, 0, 1)>>
+ <<set $activeSlave.skill.entertainment = random(15,100)>>
+ <<set $activeSlave.skill.whore = random(15,100)>>
+ <<set $activeSlave.skill.oral = random(15,100)>>
+ <<set $activeSlave.skill.anal = random(15,100)>>
<<set $activeSlave.anus = random(1,3)>>
<<set $activeSlave.weight = Math.clamp(-25, 25, $activeSlave.weight)>>
<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy", "devout", "gluttonous", "hates men", "hates women", "hates women", "liberated", "odd")>>
@@ -1819,16 +1819,16 @@
<<set $activeSlave.career = setup.veryYoungCareers.random()>>
<<set $activeSlave.birthWeek = 0>>
<<if $activeSlave.vagina != -1>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.trueVirgin = 1>>
<<set $activeSlave.preg = 0>>
<<run SetBellySize($activeSlave)>>
<</if>>
- <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.anus = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<case "raiders">>
@@ -1843,7 +1843,7 @@
<<set $activeSlave.birthWeek = 0>>
<<if $activeSlave.vagina != -1>>
<<if random(1,2) == 1>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.trueVirgin = 1>>
<<set $activeSlave.preg = 0>>
@@ -1851,13 +1851,13 @@
<</if>>
<</if>>
<<if random(1,2) == 1>>
- <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.skill.anal = 0>>
<<set $activeSlave.anus = 0>>
<</if>>
<<if random(1,2) == 1>>
- <<set $activeSlave.oralSkill = 0>>
+ <<set $activeSlave.skill.oral = 0>>
<</if>>
- <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.skill.whore = 0>>
<<case "trainers">>
@@ -1868,9 +1868,9 @@
<<set $activeSlave.trust += 40>>
<<set $activeSlave.health += 30>>
<<if $activeSlave.vagina != -1>>
- <<set $activeSlave.vaginalSkill += 15>>
+ <<set $activeSlave.skill.vaginal += 15>>
<<else>>
- <<set $activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
<<set $activeSlave.clit = 0>>
<</if>>
<<if $activeSlave.vagina == 0>>
@@ -1879,8 +1879,8 @@
<<if $activeSlave.anus == 0>>
<<set $activeSlave.anus += 1>>
<</if>>
- <<set $activeSlave.oralSkill += 15>>
- <<set $activeSlave.analSkill += 15>>
+ <<set $activeSlave.skill.oral += 15>>
+ <<set $activeSlave.skill.anal += 15>>
<<set $activeSlave.fetishKnown = 1>>
<<if $activeSlave.accent >= 3>>
<<set $activeSlave.accent -= 1>>
@@ -1931,19 +1931,19 @@
<<set $activeSlave.waist = random(-30,10)>>
<<set $activeSlave.chem = 20>>
<<if $TSS.schoolUpgrade == 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<else>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 15>>
<</if>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = either("none")>>
@@ -1986,12 +1986,12 @@
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.waist = random(-20,30)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.birthWeek = 0>>
<<set $activeSlave.behavioralFlaw = either("odd")>>
@@ -2042,19 +2042,19 @@
<<set $activeSlave.weight = -20>>
<<set $activeSlave.waist = -50>>
<<if $SCP.schoolUpgrade == 2>>
- <<set $activeSlave.vaginalSkill = 15>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 15>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 15>>
+ <<set $activeSlave.skill.vaginal = 15>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 15>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 15>>
<<else>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<</if>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.birthWeek = 0>>
@@ -2065,7 +2065,7 @@
<<set $activeSlave.underArmHColor = "blonde">>
<<set $activeSlave.eyebrowHColor = "blonde">>
<<set $activeSlave.race = "white">>
- <<set $activeSlave.skin = "tanned">>
+ <<set $activeSlave.skin = "sun tanned">>
<<set $activeSlave.override_H_Color = 1>>
<<set $activeSlave.override_Arm_H_Color = 1>>
<<set $activeSlave.override_Pubic_H_Color = 1>>
@@ -2116,12 +2116,12 @@
<<set $activeSlave.preg = 0>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.weight = random(0,20)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 15>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 15>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 15>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 15>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.birthWeek = 0>>
<<set $activeSlave.sexualFlaw = "none">>
@@ -2163,15 +2163,15 @@
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.waist = random(-10,30)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
<<if $TGA.schoolUpgrade == 2>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<else>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<</if>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
@@ -2212,12 +2212,12 @@
<<set $activeSlave.weight = random(-20,10)>>
<<set $activeSlave.waist = random(-30,10)>>
<<set $activeSlave.muscles = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.heels = 1>>
@@ -2251,12 +2251,12 @@
<<set $activeSlave.weight = random(10,30)>>
<<set $activeSlave.waist = random(0,100)>>
<<set $activeSlave.muscles = random(80,100)>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.heels = 1>>
@@ -2305,12 +2305,12 @@
<<set $activeSlave.waist = random(-10,50)>>
<<set $activeSlave.muscles = random(60,80)>>
<<set $activeSlave.chem = 0>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.oralSkill = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 0>>
+ <<set $activeSlave.skill.oral = 0>>
+ <<set $activeSlave.skill.anal = 0>>
+ <<set $activeSlave.skill.whore = 0>>
+ <<set $activeSlave.skill.entertainment = 0>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.heels = 1>>
@@ -2539,12 +2539,12 @@
<<if $activeSlave.genes == "XY">>
<<set $activeSlave.shoulders = 1>>
<</if>>
- <<set $activeSlave.vaginalSkill = 100>>
- <<set $activeSlave.oralSkill = 100>>
- <<set $activeSlave.analSkill = 100>>
- <<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.entertainSkill = 100>>
- <<set $activeSlave.combatSkill = 0>>
+ <<set $activeSlave.skill.vaginal = 100>>
+ <<set $activeSlave.skill.oral = 100>>
+ <<set $activeSlave.skill.anal = 100>>
+ <<set $activeSlave.skill.whore = 15>>
+ <<set $activeSlave.skill.entertainment = 100>>
+ <<set $activeSlave.skill.combat = 0>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<if $TFS.schoolUpgrade == 1>>
@@ -2603,20 +2603,20 @@
<<set $activeSlave.shoulders = 0>>
<<if $HA.schoolUpgrade == 1>>
<<set $activeSlave.intelligence = Intelligence.random({limitIntelligence: [20,70]})>>
- <<set $activeSlave.vaginalSkill = either(20,20,40)>>
- <<set $activeSlave.oralSkill = either(20,20,40)>>
- <<set $activeSlave.analSkill = either(20,20,40)>>
- <<set $activeSlave.whoreSkill = either(20,20,40)>>
- <<set $activeSlave.entertainSkill = either(60,80,80,100)>>
+ <<set $activeSlave.skill.vaginal = either(20,20,40)>>
+ <<set $activeSlave.skill.oral = either(20,20,40)>>
+ <<set $activeSlave.skill.anal = either(20,20,40)>>
+ <<set $activeSlave.skill.whore = either(20,20,40)>>
+ <<set $activeSlave.skill.entertainment = either(60,80,80,100)>>
<<else>>
<<set $activeSlave.intelligence = random(0,20)>>
- <<set $activeSlave.vaginalSkill = 10>>
- <<set $activeSlave.oralSkill = 10>>
- <<set $activeSlave.analSkill = 10>>
- <<set $activeSlave.whoreSkill = 10>>
- <<set $activeSlave.entertainSkill = either(20,40,40,60)>>
+ <<set $activeSlave.skill.vaginal = 10>>
+ <<set $activeSlave.skill.oral = 10>>
+ <<set $activeSlave.skill.anal = 10>>
+ <<set $activeSlave.skill.whore = 10>>
+ <<set $activeSlave.skill.entertainment = either(20,40,40,60)>>
<</if>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualQuirk = either("caring", "none", "none", "unflinching")>>
@@ -2757,7 +2757,7 @@
<<set $activeSlave.muscles = random(20,80)>>
<<set $activeSlave.chem = 10 * random(1,3)>>
<<set $activeSlave.customTat = "The prominent emblem of a local gang spans the length of his shoulders.">>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "gang assaulter">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for gang related extortion of local businesses.">>
<<set $prisonCrime = "is incarcerated for gang related activities.">>
@@ -2774,7 +2774,7 @@
<<set $activeSlave.waist = random(10,50)>>
<<set $activeSlave.chem = 10 * random(1,3)>>
<<set $activeSlave.customTat = "The prominent emblem of a local gang spans the length of his shoulders.">>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "gang bruiser">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for a gang related beating of a local businessman.">>
<<set $prisonCrime = "is incarcerated for gang related activities.">>
@@ -2791,7 +2791,7 @@
<<set $activeSlave.waist = random(10,70)>>
<<set $activeSlave.chem = 10 * random(1,3)>>
<<set $activeSlave.customTat = "The prominent emblem of a local gang spans the length of his shoulders.">>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "gang thief">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for gang related raiding of several local warehouses.">>
<<set $prisonCrime = "is incarcerated for gang related activities.">>
@@ -2808,7 +2808,7 @@
<<set $activeSlave.waist = random(10,70)>>
<<set $activeSlave.chem = 10 * random(1,3)>>
<<set $activeSlave.customTat = "The prominent emblem of a local gang spans the length of his shoulders.">>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "drug peddler">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for gang related drug distribution.">>
<<set $prisonCrime = "is incarcerated for gang related activities.">>
@@ -2822,7 +2822,7 @@
<<set $activeSlave.muscles = random(20,40)>>
<<set $activeSlave.chem = 10 * random(3,5)>>
<<set $activeSlave.customTat = "The prominent emblem of a local gang spans the length of his shoulders.">>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "hitman">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for a series of high profile murders.">>
<<set $prisonCrime = "is incarcerated for a series of murders-for-hire.">>
@@ -2836,7 +2836,7 @@
<<set $activeSlave.weight = random(-30,10)>>
<<set $activeSlave.waist = random(-10,50)>>
<<set $activeSlave.muscles = random(20,40)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "assassin">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for a high profile assassination.">>
<<set $prisonCrime = "is incarcerated for an assassination.">>
@@ -2850,7 +2850,7 @@
<<set $activeSlave.weight = random(-30,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(20,40)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "murder">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for repeat murder.">>
<<set $prisonCrime = "is incarcerated for murder.">>
@@ -2862,7 +2862,7 @@
<<set $activeSlave.intelligence = random(-40,60)>>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.muscles = random(20,80)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "manslaughter">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for manslaughter.">>
<<set $prisonCrime = "is incarcerated for manslaughter.">>
@@ -2927,7 +2927,7 @@
<<set $activeSlave.weight = random(-30,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(20,40)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "terrorist">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was a terrorist captured when her attempt to destroy a public building and the people within was foiled.">>
<<set $prisonCrime = "is incarcerated for terrorism.">>
@@ -2954,7 +2954,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(20,60)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<case "deserter">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was a soldier that abandoned her post.">>
@@ -2968,7 +2968,7 @@
<<set $activeSlave.health = random(-40,60)>>
<<set $activeSlave.weight = random(-50,10)>>
<<set $activeSlave.waist = random(-10,10)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "officer">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was an officer that over-extended her forces and was overwhelmed.">>
<<set $prisonCrime = "is a captured enemy officer.">>
@@ -2983,7 +2983,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(20,40)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "specOps">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was a special operations officer that acted on bad intel and ended up captured.">>
<<set $prisonCrime = "is a captured enemy special operations officer.">>
@@ -2998,7 +2998,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(30,60)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "sniper">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was an enemy sniper that was captured after her company lost to your military might.">>
<<set $prisonCrime = "is a captured enemy sniper.">>
@@ -3013,7 +3013,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(30,60)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<if $activeSlave.boobs > 400>>
<<set $activeSlave.boobs = 400>>
<</if>>
@@ -3031,7 +3031,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(50,60)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "soldier">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was an enemy soldier that was captured after her company lost to your military might.">>
<<set $prisonCrime = "is a captured enemy soldier.">>
@@ -3046,7 +3046,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(30,60)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "private">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was an enemy grunt that was captured after her company lost to your military might.">>
<<set $prisonCrime = "is a captured enemy private.">>
@@ -3061,7 +3061,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(10,40)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<</switch>>
<<case "white collar">>
@@ -3211,7 +3211,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(10,40)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "murder">>
<<if random(1,100) > 70>>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for murder. Her actions weigh heavily on her conscience.">>
@@ -3335,7 +3335,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(30,60)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "battery">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for battery.">>
<<set $prisonCrime = "is incarcerated for battery.">>
@@ -3347,7 +3347,7 @@
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-10,10)>>
<<set $activeSlave.muscles = random(40,60)>>
- <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.skill.combat = 1>>
<<case "tax evasion">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for tax evasion.">>
<<set $prisonCrime = "is incarcerated for tax evasion.">>
@@ -3601,13 +3601,13 @@
<<switch $Role>>
/* Opens security */
<<case "Lieutenant Colonel">>
- <<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.intelligence = 70, $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.intelligence = 70, $activeSlave.skill.combat = 1>>
<<set $activeSlave.career = either("a bodyguard", "a bouncer", "a bounty hunter", "a gang member", "a law enforcement officer", "a mercenary", "a prison guard", "a private detective", "a revolutionary", "a security guard", "a soldier", "a street thug", "a transporter", "an assassin", "an enforcer", "in a militia")>>
<<case "Bodyguard">>
- <<set $activeSlave.devotion = 90, $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("normal", "pointy"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.devotion = 90, $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("normal", "pointy"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.skill.combat = 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.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>>
+ <<set $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.skill.combat = 1>>
<<set $activeSlave.career = either("a bouncer", "a bounty hunter", "a gang member", "a mercenary", "a prison guard", "a private detective", "a security guard", "a street thug", "an enforcer")>>
<<if $seeDicks > 0>>
<<set $activeSlave.dick = random(3,6), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2,2,3)>>
@@ -3615,7 +3615,7 @@
/* Closes Security */
/* Opens management */
<<case "Headgirl">>
- <<set $activeSlave.devotion = 90, $activeSlave.trust = 100, $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = random(60,100), $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.career = either("a lawyer", "a military officer", "a politician")>>
+ <<set $activeSlave.devotion = 90, $activeSlave.trust = 100, $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = random(60,100), $activeSlave.skill.entertainment = 100, $activeSlave.skill.whore = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.career = either("a lawyer", "a military officer", "a politician")>>
<<if $seeDicks > 0>>
<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,2)>>
<</if>>
@@ -3627,7 +3627,7 @@
<</if>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
<<case "Teacher">>
- <<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = 100, $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.face = random(41,90), $activeSlave.career = either("a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant")>>
+ <<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = 100, $activeSlave.skill.entertainment = 100, $activeSlave.skill.whore = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.face = random(41,90), $activeSlave.career = either("a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant")>>
<<if $seeDicks > 0>>
<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2,2,3)>>
<</if>>
@@ -3660,7 +3660,7 @@
<</if>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
<<case "Milkmaid">>
- <<set $activeSlave.muscles = random(31,60), $activeSlave.oralSkill = random(31,60), $activeSlave.sexualQuirk = "caring", $activeSlave.behavioralQuirk = "funny", $activeSlave.career = either("a cowgirl", "a dairy worker", "a milkmaid", "a farmer's daughter", "a shepherd", "a veterinarian"), $activeSlave.intelligence = random(20,70)>>
+ <<set $activeSlave.muscles = random(31,60), $activeSlave.skill.oral = random(31,60), $activeSlave.sexualQuirk = "caring", $activeSlave.behavioralQuirk = "funny", $activeSlave.career = either("a cowgirl", "a dairy worker", "a milkmaid", "a farmer's daughter", "a shepherd", "a veterinarian"), $activeSlave.intelligence = random(20,70)>>
<<if $seeDicks > 0>>
<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(4,9), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2)>>
<</if>>
@@ -3678,9 +3678,9 @@
/* Closes management */
/* Opens entertain */
<<case "DJ">>
- <<set $activeSlave.entertainSkill = 100, $activeSlave.muscles = random(6,30), $activeSlave.face = random(80,100), $activeSlave.career = either("a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star")>>
+ <<set $activeSlave.skill.entertainment = 100, $activeSlave.muscles = random(6,30), $activeSlave.face = random(80,100), $activeSlave.career = either("a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star")>>
<<case "Madam">>
- <<set $activeSlave.whoreSkill = 100, $activeSlave.career = either("a business owner", "a manager", "a pimp", "a procuress", "an innkeeper")>>
+ <<set $activeSlave.skill.whore = 100, $activeSlave.career = either("a business owner", "a manager", "a pimp", "a procuress", "an innkeeper")>>
<<if $seeDicks > 0>>
<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,5), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2)>>
<</if>>
@@ -3691,7 +3691,7 @@
<</if>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
<<case "Concubine">>
- <<set $activeSlave.prestige = 3, $activeSlave.energy = random(80,100), $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.face = 100, $activeSlave.devotion = random(90,95), $activeSlave.trust = random(90,100)>>
+ <<set $activeSlave.prestige = 3, $activeSlave.energy = random(80,100), $activeSlave.skill.entertainment = 100, $activeSlave.skill.whore = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.face = 100, $activeSlave.devotion = random(90,95), $activeSlave.trust = random(90,100)>>
/* Closes Entertain */
<</switch>>
<</widget>>