diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 732c71b7286f3a3cde8cef9b0a551fb045d38761..170aa548ebc8cb70dd8d23a1b3996c5723b51c05 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2294,7 +2294,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
@@ -2302,7 +2305,7 @@ vaginalSkill:
61-99 - expert
100+ - master
-oralSkill:
+skill.oral:
0-10 - unskilled
11-30 - basic
@@ -2310,7 +2313,7 @@ oralSkill:
61-99 - expert
100+ - master
-analSkill:
+skill.anal:
0-10 - unskilled
11-30 - basic
@@ -2318,7 +2321,7 @@ analSkill:
61-99 - expert
100+ - master
-whoreSkill:
+skillwhore:
0-10 - unskilled
11-30 - basic
@@ -2326,7 +2329,7 @@ whoreSkill:
61-99 - expert
100+ - master
-entertainSkill:
+skill.entertainment:
0-10 - unskilled
11-30 - basic
@@ -2334,11 +2337,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"
@@ -3473,98 +3568,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/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/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..b27d66826b906fbb12b981f5932386f35b0401cb 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -2034,123 +2034,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..b40ecbd297d7da61cbfa95db39902462abe04b02 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -415,24 +415,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 +744,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 +814,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 +1054,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..0afe5c873c5854526cf0e03c8aac1884946fd3a8 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -2838,123 +2838,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/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..dc6b87b0298d8fee9746a0a7d0679a2ca0f0732d 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -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>>
@@ -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>>
@@ -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/storyInit.tw b/src/init/storyInit.tw
index 78fb80a9dbd2c918483ce2b1b9456bec63c85827..3642ff563f2cb46e9515dad2a688076bdfae3f0e 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1345,7 +1345,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/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/SlaveState.js b/src/js/SlaveState.js
index fcdf4391fd71132f568fba03c67f6c9ae7950383..f340be428662edbc9570300ff4b2563f50b4bfcc 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 */
@@ -1230,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"
@@ -2168,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 */
@@ -2308,7 +2321,8 @@ App.Entity.SlaveState = class SlaveState {
return {
porn: {
fame: { }
- }
+ },
+ skill: { },
};
}
};
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 526284a123e2aa73c4c81415b0c1e728b124fb04..292345e9d2b9013e7ba0e7281945f7d932cbc8c3 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -192,7 +192,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 ) {
@@ -1595,7 +1595,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") {
@@ -1665,22 +1665,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) {
@@ -1691,7 +1691,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) {
@@ -2013,13 +2013,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 adc8935d0cff87fb6651c7dd72d58bda6f3a9eb2..4c7f562bad91925ac41f831666ce29486dc43a45 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];
+ }
+ }
+ }
}
})();
@@ -564,28 +610,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 */
@@ -1138,28 +1184,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) {
@@ -1787,4 +1833,4 @@ App.Entity.Utils.GenePoolRecordCleanup = (function () {
"slaveCost"
].forEach((s) => delete slave[s]);
}
-})();
\ No newline at end of file
+})();
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 33f09c86e304632e6d87c18c2d0fcb640bfe110c..937eebc2ea4c02e41b5144287b852b4bf5eee762 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -576,7 +576,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;
}
}
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/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/generateGenetics.js b/src/js/generateGenetics.js
index 557b73d3954a8f75cfb968ae6aebf0430947bf35..b415ba2cc7039db2a5014bdcb6ed2c84cab0445d 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -307,7 +307,7 @@ window.generateGenetics = (function() {
eyeColor = fatherEye;
} else {
eyeColor = mother.origEye;
- }
+ }
} else {
eyeColor = jsEither([fatherEye, mother.origEye]);
}
@@ -1402,12 +1402,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..3cfe0bfbe99e197505ec4243f2461ef1b725d5c9 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1421,11 +1421,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/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 7e508b6c59df5693bc25c63b291cdae1c50ef616..2b33dbadf8065db6b686ce4d03ae2fef10748e70 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -282,8 +282,8 @@ 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;
@@ -291,8 +291,8 @@ window.rulesAutosurgery = (function() {
} 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;
@@ -300,8 +300,8 @@ window.rulesAutosurgery = (function() {
} 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;
@@ -310,8 +310,8 @@ window.rulesAutosurgery = (function() {
} 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;
@@ -319,8 +319,8 @@ window.rulesAutosurgery = (function() {
} 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;
@@ -329,8 +329,8 @@ window.rulesAutosurgery = (function() {
} 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;
@@ -426,8 +426,8 @@ 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 +435,8 @@ 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;
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index e605baafcd2d3dfd28c0b5d21508782c7fc0a003..bac3794b5d2652d6feb7c2e61cbfc97d10ef76e1 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -295,12 +295,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") {
@@ -946,7 +946,7 @@ window.Beauty = (function() {
beauty += 4*(slave.hips - 1); /*8*/ /* offsets the malus for big butts */
}
}
- if (slave.analSkill > 60 && slave.anus >= 2) {
+ 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 */
@@ -1383,19 +1383,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);
@@ -1945,7 +1945,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 +1955,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;
}
}
@@ -2073,22 +2073,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) {
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 924dbdd23d39b6c783fafff62a3c316e518a822e..90e50532969f2ffd79953fe619479c1669e73e1f 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -215,7 +215,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 +224,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> ";
@@ -2740,12 +2740,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 +2762,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 +2886,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 +2904,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 += " ";
}
@@ -5240,7 +5240,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 {
@@ -5630,7 +5630,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 +5722,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 +5736,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 +5758,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 +5774,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 +5790,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 +5814,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 +5833,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 +5849,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 +5865,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 +5881,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 +5897,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 +5923,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.@@');
}
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index ab90e35637439342bf7db1a4342ea2be3e0a9125..13b6a9d9161c8f847a3cd788054cace7dffb9ff5 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1213,24 +1213,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 +1241,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 +1270,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 +1299,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 +1327,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 +1476,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;
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/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..e285912f701aeddd8bf09963a707f288ed6af721 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.skin = "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.skin = "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.skin = "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.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.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,96 +163,96 @@
/*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.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.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*/
@@ -262,13 +262,13 @@
/*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,55 +300,55 @@
/*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*/
@@ -359,7 +359,7 @@
/*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,37 +381,37 @@
/*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*/
@@ -421,91 +421,91 @@
<<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.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.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.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.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 = "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.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.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.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 = "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.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.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.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..2ca849d5dba0406443655d75f282352ec8f429b2 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.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.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.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.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.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.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 = "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.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.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.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.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.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.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.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..91490615c5925716753acb78d342cd2c125174f7 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.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.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.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.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.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.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/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..ed47234ff3fcefe2fdcf1117f867068a526b18be 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>>
*/
@@ -1162,7 +1162,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 +1172,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 +1195,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 +1205,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 +1213,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 +1222,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
@@ -1603,7 +1603,7 @@ __You are customizing this slave:__
<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 +1618,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/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/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/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index c990581a2c690a179c73f3a8c01bc3d6d6f54c79..ab48c021da0932553acf61b88537abbb7df0d8e9 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -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/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index b67d3efb65e81e30fd765bd8cf80248c402e1838..a5718596d962567d98e420e71b9bd5a75cd30aae 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3043,49 +3043,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..cc0fafc192c4174c636a5e15157526d9558e5d8b 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>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index b7197cb4beddc164b875a53a0ff7ee42388c528a..c4ed9138cfe62c46524c197d1053e026c5cedb29 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.
@@ -742,7 +742,7 @@ 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."
@@ -6279,7 +6279,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)>>
@@ -6917,11 +6917,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 +8731,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.
@@ -15087,7 +15087,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>>
@@ -16585,9 +16585,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 +16675,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.
@@ -18414,7 +18414,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">>
@@ -18786,7 +18786,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>>
@@ -19614,7 +19614,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 +19761,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 +20283,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 +20349,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
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 7b3008518b3e25b9a4016530206759fee63b5701..08e2d288b33ff67896e33c9da81ab753361c2104 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">>
@@ -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."
@@ -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>>
@@ -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/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/customSlave.tw b/src/uncategorized/customSlave.tw
index 08c6f865eca42d3e25ae23ce32715538ca827a56..27618357c8450dc6400df64204e7e1558d6f47ab 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -1016,40 +1016,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 +1274,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..f165d48ba19bb44da7dfae0768eacf2436c9615d 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -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>>
@@ -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>>
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..a2276f9350ce858d5ed29521a14a46db4ea0f2e9 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -101,7 +101,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 +641,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 +887,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 +899,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 +911,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 +923,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 +935,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 +947,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 +1153,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 +2029,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..b1b4d7d45eb1c9c9eb9b78e710528eb55f5d7a79 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -171,11 +171,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/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 1341b39758b54e17ee4ff8821c9a84cb9cc5c0da..dcbd146a59c6c9bee93e65def83f5eca2407200e 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/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..1f8f83ea72743db40071743bc8c98fa532ce5ff3 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -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/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..7344c2dcd6fbd9b8c3081caf18d102ea14c09aaa 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>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 30c82df63bb7f5487f1530c3efa580bb3f84ee15..c59480cb68a9e69214727528d61ed4491bb109cc 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>>
@@ -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..b0c089a21cfe6bf3f2fb52b5a23a5ad002250301 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)>>
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/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/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 7434784d6c1a422685b540249aa7c5797c61c903..f9bf0fec63b097fe63f99a1435fb48d31bed23ca 100644
--- a/src/uncategorized/slaveStats.tw
+++ b/src/uncategorized/slaveStats.tw
@@ -222,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
@@ -349,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..88b795be9dadadac224c6453c1fb6b0a5eadb5af 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -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..aa9a76acc7c5b126bc2ee09bfc89b37376595ab5 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">>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index e59b0a23397f98b45c84a19b0f2bb0fb4190322b..bc2c322a3d5d1a0e306fc8c516456e5b5b4ed9d4 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.
@@ -415,4 +415,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 8ad5b58911363ea3fde29778261062c718f4b5ee..fe7108b19e1e3719401c52a94d500297b12b318d 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -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.
@@ -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>>
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..a8518c8666a2dc53f8c266bcd897b1d8fa794380 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -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..bd19313578492d7d6e4f16bdcc0cb6973ecc587d 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.
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 8c744cb4dac0490c720dd0276109f4df4a17543e..2ba0228468d6c47b19c76b56bd4115fc0833dad8 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>>
@@ -2117,12 +2117,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">>
@@ -2165,15 +2165,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">>
@@ -2214,12 +2214,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>>
@@ -2253,12 +2253,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>>
@@ -2307,12 +2307,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>>
@@ -2541,12 +2541,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>>
@@ -2609,20 +2609,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")>>
@@ -2727,7 +2727,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.">>
@@ -2744,7 +2744,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.">>
@@ -2761,7 +2761,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.">>
@@ -2778,7 +2778,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.">>
@@ -2792,7 +2792,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.">>
@@ -2806,7 +2806,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.">>
@@ -2820,7 +2820,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.">>
@@ -2832,7 +2832,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.">>
@@ -2897,7 +2897,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.">>
@@ -2924,7 +2924,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.">>
@@ -2938,7 +2938,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.">>
@@ -2953,7 +2953,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.">>
@@ -2968,7 +2968,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.">>
@@ -2983,7 +2983,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>>
@@ -3001,7 +3001,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.">>
@@ -3016,7 +3016,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.">>
@@ -3031,7 +3031,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">>
@@ -3181,7 +3181,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.">>
@@ -3305,7 +3305,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.">>
@@ -3317,7 +3317,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.">>
@@ -3567,13 +3567,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)>>
@@ -3581,7 +3581,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>>
@@ -3593,7 +3593,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>>
@@ -3626,7 +3626,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>>
@@ -3644,9 +3644,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>>
@@ -3657,7 +3657,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>>