diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index ef5d21ea06cba2a22268b22e3e79167f38b53bb8..b91086f582ab2a5622c4c8929dbf13c844fd2f40 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -28,7 +28,7 @@
| [[Auto salon|Salon][$degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$artificialEyeFill = "",$tattooChoice = "",$piercingLevel = ""]]
| [[Body mod studio|Body Modification][$degradation = 0, $tattooChoice = undefined]]
| [[Remote surgery|Remote Surgery][$degradation = 0]]
-| [[Configure cybernetics|Prosthetics Config][$prostheticsConfig = "main"]]
+| [[Configure cybernetics|Prosthetics Configuration][$prostheticsConfig = "main"]]
*/
/*TODO: These will most likely need to be reworked*/
<<if $extremeUnderage == 1>>
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 4a1ebb19e48f6c9c71db572756ea21e1b447ccd2..a7a4091c21c21938fa185c46006a513b28151b7b 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -684,11 +684,9 @@ is
<</if>>
<<if $activeChild.fuckdoll == 0>>
- <<= App.Desc.brand($activeChild, "left cheek")>>
- <<= App.Desc.brand($activeChild, "left ear")>>
+ <<= App.Desc.brand($activeChild, "cheek")>>
+ <<= App.Desc.brand($activeChild, "ear")>>
<<= App.Desc.brand($activeChild, "neck")>>
- <<= App.Desc.brand($activeChild, "right cheek")>>
- <<= App.Desc.brand($activeChild, "right ear")>>
<</if>>
<<if $familyTesting == 1>>
@@ -1175,25 +1173,16 @@ $He is
<<= App.Desc.brand($activeChild, "lower back")>>
/* Arms */
- <<= App.Desc.brand($activeChild, "left upper arm")>>
- <<= App.Desc.brand($activeChild, "left lower arm")>>
- <<= App.Desc.brand($activeChild, "left wrist")>>
- <<= App.Desc.brand($activeChild, "left hand")>>
-
- <<= App.Desc.brand($activeChild, "right upper arm")>>
- <<= App.Desc.brand($activeChild, "right lower arm")>>
- <<= App.Desc.brand($activeChild, "right hand")>>
- <<= App.Desc.brand($activeChild, "right wrist")>>
+ <<= App.Desc.brand($activeChild, "upper arm")>>
+ <<= App.Desc.brand($activeChild, "lower arm")>>
+ <<= App.Desc.brand($activeChild, "wrist")>>
+ <<= App.Desc.brand($activeChild, "hand")>>
/* Legs */
/*buttock and thigh are displayed in descriptionWidgetsTattoos, if you can believe it */
- <<= App.Desc.brand($activeChild), "left calf")>>
- <<= App.Desc.brand($activeChild), "left ankle")>>
- <<= App.Desc.brand($activeChild), "left foot")>>
-
- <<= App.Desc.brand($activeChild), "right calf")>>
- <<= App.Desc.brand($activeChild), "right ankle")>>
- <<= App.Desc.brand($activeChild), "right foot")>>
+ <<= App.Desc.brand($activeChild), "calf")>>
+ <<= App.Desc.brand($activeChild), "ankle")>>
+ <<= App.Desc.brand($activeChild), "foot")>>
<</if>>
/* Opposite way of handling above, if that ever proves more conevient. This will print everything that's not on the face. The risk is that it may print things that are already printed elsewhere. */
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 8b327839f79af68e8f9a5e687faef0ca290c80a1..ed9f415d57e1fe6f92458867ff3e55e6106b6a1d 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -2055,7 +2055,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
<<set setup.ArcologyNamesRomanRevivalist = ["Abila", "Aeminium", "Aequum", "Agrigentum", "Ala", "Albanianis", "Ambianum", "Antaeopolis", "Antiochia", "Apulum", "Aquileia", "Argentoratum", "Ariminum", "Arsinoë", "Ascrivium", "Asculum", "Attalia", "Augusta Vindelicorum", "Barium", "Belum", "Berytus", "Biriciana", "Blestium", "Bonna", "Bononia", "Bovium", "Brixia", "Burgodunum", "Byzantium", "Caesaraugusta", "Caesarea", "Caesaromagus", "Calleva Atrebatum", "Camulodunum", "Capua", "Carthago Nova", "Catana", "Celeia", "Cibalae", "Clausentum", "Comum", "Condate", "Conimbriga", "Constantinopolis", "Corduba", "Coria", "Coriovallum", "Danum", "Deva Victrix", "Divodurum", "Dubris", "Durnovaria", "Durocornovium", "Duroliponte", "Dyrrachium", "Eboracum", "Eburobrittium", "Elysian Fields", "Emona", "Epidaurum", "Florentia", "Gerulata", "Gerunda", "Isca Augusta", "Italica", "Iuvavum", "Lacobrica", "Lagentium", "Lauri", "Lentia", "Leptis Magna", "Letocetum", "Lindinis", "Londinium", "Longaricum", "Lopodunum", "Lousonna", "Lugdunum", "Luguvalium", "Lutetia", "Mancunium", "Marsonia", "Massa", "Massalia", "Matilo", "Mediolanum", "Messana", "Mod", "Mogontiacum", "Moridunum", "Mursa", "Naissus", "Nauportus", "Neapolis", "Neviodunum", "Nicaea", "Nicomedia", "Nida", "Nova Roma", "Novaesium", "Noviomagus", "Olicana", "Olisippo", "Ostia", "Partiscum", "Patavium", "Pistoria", "Placentia", "Poetovio", "Polemonion", "Pomaria", "Pompeii", "Ragusium", "Ravenna", "Regulbium", "Rhegium", "Rutupiae", "Salernum", "Scalabis", "Segovia", "Sirmium", "Siscia", "Spalatum", "Sumelocenna", "Syracusae", "Tarraco", "Tarsus", "The City of the Seven Hills", "Theranda", "Thuburbo Majus", "Thubursicum", "Tilurium", "Tingi", "Traiectum", "Trapezus", "Turicum", "Venta Icenorum", "Verulamium", "Vesontio", "Vindobona", "Vinovia", "Volubilis"]>>
<<set setup.ArcologyNamesAztecRevivalist = ["Acolmiztli", "Acozac", "Amaquemecan", "Anenecuilco", "Azcapotzalco", "Aztlan", "Calixtlahuaca", "Chalco", "Chapultepec", "Chicomoztoc", "Cholula", "Coixtlahuaca", "Coyoacan", "Coyoacán", "Cuautla", "Culhuacan", "Cuzcatlan", "Ecatepec", "Huitzilopochco", "Itzcahuacan", "Itztapalapan", "Iztapalapa", "Kaminaljuyu", "Malinalco", "Mexicatzinco", "Nojpetén", "Ocotelolco", "Ocuituco", "Omeyocan", "Otompan", "Oxwitik", "Quiahuiztlan", "Tacuba", "Tamoanchan", "Tenayuca", "Tenochtitlan", "Teopanzolco", "Teotihuacan", "Tepeticpac", "Tepetlaoztoc", "Tepozteco", "Texcoco", "Texcotzingo", "The Halls of Montezuma", "Tizatlan", "Tlacopan", "Tlalmanalco", "Tlatelolco", "Tollan", "Utatlán", "Xalapa", "Xaltocan", "Xochimilco", "Zacpeten"]>>
<<set setup.ArcologyNamesEgyptianRevivalist = ["Aaru", "Abdju", "Abu", "Aka", "Akhetaten", "Amenemhat-itj-tawy", "Aneb-Hetch", "Ankh-Tawy", "Anpet", "Apu", "Aushamem", "Baki", "Behdet", "Behedet-jabtet", "Buhen", "Chenem-Waset", "Dehenet", "Dep", "Dja", "Djanet", "Djed-Sut", "Djedu", "Djerty", "Djew-Qa", "Gebtu", "Gesa", "Gesy", "Hapi", "Hebenu", "Henen-nesut", "Herwer", "Hut-hery-ib", "Hut-ka-ptah", "Hut-Repyt", "Hut-Sekhem", "Hut-waret", "Iken", "Imet", "Imu", "Imura", "Inbu-Hedj", "Ipet-Resyt", "Ipu", "Itjtawy", "Iu-miteru", "Iunet", "Iunu", "Iuny", "Iunyt", "Iushenshen", "Khasut", "Khem", "Khemenu", "Khent-min", "Kheny", "Khenyt", "Khito", "Khmun", "Kis", "Madu", "Men-nefer", "Menfe", "Mer-nefer", "Mesen", "Moph", "Napata", "Nay-Ta-Hut", "Nekheb", "Nekhen", "Nubt", "Pe", "Peguat", "Pekher-wer", "Per-Amun", "Per-Atum", "Per-Banebdjedet", "Per-Bast", "Per-Bastet", "Per-Hathor", "Per-Imen-mat-khent", "Per-Medjed", "Per-Nemty", "Per-Ra-mes-su", "Per-Ramesses", "Per-Sopdu", "Per-Usiri", "Per-Wadjet", "Piemro", "Pikaut", "Pikuat", "Pselqet", "Ptah", "Ptkheka", "Qedesh", "Qedshu", "Qis", "Râ-Kedet", "Raqote", "Rebu", "Saka", "Sangar", "Semabehdet", "Senet", "Sepermeru", "Seshesh", "Šetennu", "Shashotep", "Shasu", "Shedet", "Sheten", "Sumenu", "Swenett", "Ta-senet", "Tamiat", "Taremu", "Tayu-djayet", "Tepihu", "Timinhor", "Tjaru", "Tjebnutjer", "Tjebu", "Tjeku", "Tjenu", "Tpyhwt", "Waset", "Weprehwy", "Yamu", "Ypu", "Zau", "Zauti", "Zawty", "Zay"]>>
-<<set setup.ArcologyNamesEdoRevivalist = ["Amano-Iwato", "Ando", "Asakura", "Asuka", "Dejima", "Edo", "Hakodate", "Heian-kyÅ", "HeijÅ-kyÅ", "Hiraizumi", "Hirakata", "Idano", "Ise", "Isonokami", "Itsukushima", "Iware", "Izakaha", "Karu", "Karushima", "Kasagiyama", "Kashihara", "Katashiha", "Kawagoe", "Kawanakajima", "Kazuraki", "Kobe", "Kokyo", "Koryo", "Kuni-kyÅ", "Kuruda", "Kyotanabe", "Mahoroba", "Makimuko", "Mikatagahara", "Miki", "Miyajima", "Miyako", "Muro", "Nagaoka-kyÅ", "Nagashima", "Nagashino", "Nakatsukuni", "Naniwa", "Nara", "Negoro", "New Kyoto", "New Tokyo", "Odawara", "Okazaki", "Okehazama", "Onogoro", "Osaka", "Otsu", "RyÅ«gÅ«-jÅ", "Sakurai", "Sekigahara", "Shiga", "Shika", "Shiki", "Shikoku", "Shimonoseki", "Shuri", "Sunpu", "Tajihi", "Takama-ga-hara", "Tanegashima", "Tengoku", "Tenmokuzan", "Tenri", "The Imperial Palace", "Ujiyamada", "Urasoe", "Waki-no-kami", "Yamazaki", "Yawata", "Yoshino"]>>
+<<set setup.ArcologyNamesEdoRevivalist = ["Amano-Iwato", "Ando", "Asakura", "Asuka", "Dejima", "Edo", "Hakodate", "Heian-kyÅ", "HeijÅ-kyÅ", "Hiraizumi", "Hirakata", "Idano", "Ise", "Isonokami", "Itsukushima", "Iware", "Izakaha", "Karu", "Karushima", "Kasagiyama", "Kashihara", "Katashiha", "Kawagoe", "Kawanakajima", "Kazuraki", "Kobe", "Kokyo", "Koryo", "Kuni-kyÅ", "Kuruda", "Kyotanabe", "Mahoroba", "Makimuko", "Mikatagahara", "Miki", "Miyajima", "Miyako", "Muro", "Nagaoka-kyÅ", "Nagashima", "Nagashino", "Nakatsukuni", "Naniwa", "Nara", "Negoro", "Neo Tokyo", "New Kyoto", "New Tokyo", "Odawara", "Okazaki", "Okehazama", "Onogoro", "Osaka", "Otsu", "RyÅ«gÅ«-jÅ", "Sakurai", "Sekigahara", "Shiga", "Shika", "Shiki", "Shikoku", "Shimonoseki", "Shuri", "Sunpu", "Tajihi", "Takama-ga-hara", "Tanegashima", "Tengoku", "Tenmokuzan", "Tenri", "The Imperial Palace", "Ujiyamada", "Urasoe", "Waki-no-kami", "Yamazaki", "Yawata", "Yoshino"]>>
<<set setup.ArcologyNamesArabianRevivalist = ["Abha", "Achir", "Al Bahah", "Al-Hasa", "Al-Mansuriya", "Al-Qata'i", "Aleppo", "Alhambra", "Amadiya", "Amid", "Arar", "Arbil", "Ardabil", "Arjish", "Arzan", "Badr", "Baghdad", "Basra", "Bayt al-Hikma", "Béjaïa", "Beni Hammad", "Buraidah", "Cairo", "Córdoba", "Damascus", "Dammam", "Dhala", "Diyarbakır", "El-Mansuriya", "Faiyum", "Fes-al-Bali", "Fes", "Fez", "Fustat", "Ha'il", "Hajar an-Nasar", "Hama", "Harput", "Harran", "Hasankeyf", "Hejaz", "Ifriqiya", "Isfahan", "Jannah", "Jenin", "Jerusalem", "Jizan", "Jubayl", "Kairouan", "Karbala", "Khilat", "Kirkuk", "Kufa", "Madinah", "Madinat al-Hareer", "Madinat al-Salam", "Madinat al-Yasmin", "Madinat al-Zahra", "Mahdia", "Makkah", "Manzikart", "Maragha", "Mardin", "Marrakech", "Marrakesh", "Marsala", "Mayyafariqin", "Mecca", "Medina", "Mosul", "Murakuc", "Najran", "Nekor", "Qatif", "Qazvin", "Raqqa", "Raqqada", "Resafa", "Riyadh", "Sakakah", "Samarra", "Saqifah", "Say'un", "Sidon", "Sulaimaniyah", "Suq Abdulla", "Tabriz", "Tabuk", "Tahert", "Tarim", "Temsaman", "Tlemcen", "Tunis", "Walilli", "Zabid"]>>
<<set setup.ArcologyNamesChineseRevivalist = ["Acheng", "Anyang", "Anyi", "Balasagun", "Beijing", "Bian", "Bianjing", "Bianzhou", "Binzhou", "Bogu", "Boping", "Chang'an", "Changle", "Changping", "Changsha", "Chengdu", "Chengzhou", "Chuqiu", "Dadu", "Daliang", "Daming", "Danyang", "Datong", "Daxing", "Dinglian", "Diqiu", "Dongdu", "Dongjing", "Dujianshan", "Dunhuang", "Ezhou", "Fanyang", "Feng Huang", "Fenghao", "Fengxiang", "Fuhan", "Fusang", "Guanggu", "Guangling", "Guangzhou", "Gusu", "Guzang", "Handan", "Hangzhou", "Haojing", "Hefei", "Henglong", "Hezhou", "Huanbei", "Huangquan", "Huangzhong", "Huatai", "Huokang", "Ji", "Jian", "Jiang", "Jiangling", "Jiangning", "Jiankang", "Jianye", "Jicheng", "Jin Shan", "Jinan", "Jincheng", "Jingsha", "Jingzhao", "Jingzhou", "Jinling", "Jinyang", "Jiuquan", "Kaifeng", "Khanbaliq", "Kuaiji", "Laosicheng", "Ledu", "Lianchuan", "Liaodong", "Liaoyang", "Lin'an", "Linhuang", "Linxiang", "Linzi", "Lishi", "Liting", "Longcheng", "Lujiang", "Luoyang", "Luoyi", "Luyi", "Mingfu", "Moling", "Mount Tai", "Nan'an", "Nanchang", "Nanjing", "Nanjun", "Nanyang", "Panyu", "Peking", "Pengcheng", "Pingcheng", "Pingjiang", "Pingliang", "Pingyang", "Pingzhou", "Puzi", "Qi Lin", "Qian", "Qiantang", "Qiling", "Qin", "Quanqiu", "Qufu", "Quwo", "Ruyin", "Shangcai", "Shanggui", "Shangjing", "Shangqiu", "Shengjing", "Shengle", "Shouchun", "Suzhou", "Taiyuan", "Tang", "Tanheli", "Tanjiao", "Tanzhou", "Taoqiu", "The Forbidden Palace", "The Middle Kingdom", "Tianlin", "Tongwan", "Wanchuan", "Wangcheng", "Wanqiu", "Wu", "Wuchang", "Wudu", "Xi'an", "Xiacai", "Xiangguo", "Xiangning", "Xiangping", "Xianyang", "Xibo", "Xicheng", "Xin Hua", "Xincai", "Xingqing", "Xingwang", "Xintian", "Xinzheng", "Xiping", "Xuchang", "Yangcheng", "Yangzhai", "Yanjing", "Yanshi", "Yecheng", "Yewang", "Yin", "Yinfu", "Ying", "Yingdu", "Yingqiu", "Yingtian", "Yong", "Yongshicheng", "You", "Youdu", "Youming", "Youzhou", "Yueyang", "Yuezhou", "Yuhang", "Yushan", "Zhangye", "Zhangzi", "Zhaoge", "Zhending", "Zheng", "Zhenxun", "Zhongdu", "Zhongguo", "Zhongshan", "Zibo", "Zichuan"]>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 909e9f9f5b06f3db95a5305d3c639e1d065db2e1..35cba90a733cdd3a9ae7d32e057b390da3d3756e 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -131,7 +131,7 @@ You should have received a copy of the GNU General Public License along with thi
<</if>>
<</for>>
<<set $genePool = ngUpdateGenePool($genePool)>>
- <<if ndef $missingTable || $showMissingSlaves == 0>>
+ <<if ndef $missingTable || $showMissingSlaves == false>>
<<set $missingTable = {}>>
<<else>>
<<set $missingTable = ngUpdateMissingTable($missingTable)>>
diff --git a/src/interaction/main/toychest.js b/src/interaction/main/toychest.js
index 78965d47422e33624452f829ec24309ee1fc3a2e..6d585abbae9e0f8218a0263413fd5b2a55451a77 100644
--- a/src/interaction/main/toychest.js
+++ b/src/interaction/main/toychest.js
@@ -135,7 +135,7 @@ App.Interact.ToyChest = function(slave) {
if (V.PC.title === 0) {
r += `ess`;
}
- r += `in this office, and ${he} serves `;
+ r += ` in this office, and ${he} serves `;
if (V.PC.title === 0) {
r += `her.`;
} else {
diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw
index 10b0338b53822110cfd50cb3ab7f2f6a80725250..f50c30ad3e1f71c9bf19c079abb7a5b944328dfd 100644
--- a/src/interaction/prostheticConfig.tw
+++ b/src/interaction/prostheticConfig.tw
@@ -1,4 +1,4 @@
-:: Prosthetics Config [nobr]
+:: Prosthetics Configuration [nobr]
<<switch $prostheticsConfig>>
@@ -17,6 +17,8 @@
<</if>>
/* base screen START */
+<h1>Prosthetic Configuration</h1>
+
This room is lined with shelves and cabinets, it could be easily mistaken for a storage room if it were not for the examination table in its center.<br>
<<if $activeSlave.amp != 1>>
Your slave $activeSlave.slaveName is obediently waiting for your instructions.
@@ -35,13 +37,13 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
<</if>>
<br><br>
<<if $activeSlave.eyes != 1>>
- [[Restore vision|Prosthetics Config][$activeSlave.eyes = 1, $prostheticsConfig = "eyes"]] |
+ [[Restore vision|Prosthetics Configuration][$activeSlave.eyes = 1, $prostheticsConfig = "eyes"]] |
<</if>>
<<if $activeSlave.eyes != -1>>
- [[Blur|Prosthetics Config][$activeSlave.eyes = -1, $prostheticsConfig = "eyes"]] |
+ [[Blur|Prosthetics Configuration][$activeSlave.eyes = -1, $prostheticsConfig = "eyes"]] |
<</if>>
<<if $activeSlave.eyes != -2>>
- [[Disable|Prosthetics Config][$activeSlave.eyes = -2, $prostheticsConfig = "eyes"]]
+ [[Disable|Prosthetics Configuration][$activeSlave.eyes = -2, $prostheticsConfig = "eyes"]]
<</if>>
$He currently has $activeSlave.eyeColor lenses equipped.
@@ -51,52 +53,52 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
Swap out $his lenses:
<br>
Iris Color:
- [[Blue|Prosthetics Config][$activeSlave.eyeColor = "blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Black|Prosthetics Config][$activeSlave.eyeColor = "black", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Brown|Prosthetics Config][$activeSlave.eyeColor = "brown", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Green|Prosthetics Config][$activeSlave.eyeColor = "green", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Turquoise|Prosthetics Config][$activeSlave.eyeColor = "turquoise", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Sky-Blue|Prosthetics Config][$activeSlave.eyeColor = "sky-blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Hazel|Prosthetics Config][$activeSlave.eyeColor = "hazel", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Pale-Grey|Prosthetics Config][$activeSlave.eyeColor = "pale-grey", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[White|Prosthetics Config][$activeSlave.eyeColor = "white", $prostheticsConfig = "eyeColor" ,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Pink|Prosthetics Config][$activeSlave.eyeColor = "pink", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Amber|Prosthetics Config][$activeSlave.eyeColor = "amber", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Red|Prosthetics Config][$activeSlave.eyeColor = "red", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Yellow|Prosthetics Config][$activeSlave.eyeColor = "yellow", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Orange|Prosthetics Config][$activeSlave.eyeColor = "orange", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[Blue|Prosthetics Configuration][$activeSlave.eyeColor = "blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Black|Prosthetics Configuration][$activeSlave.eyeColor = "black", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Brown|Prosthetics Configuration][$activeSlave.eyeColor = "brown", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Green|Prosthetics Configuration][$activeSlave.eyeColor = "green", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Turquoise|Prosthetics Configuration][$activeSlave.eyeColor = "turquoise", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Sky-Blue|Prosthetics Configuration][$activeSlave.eyeColor = "sky-blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Hazel|Prosthetics Configuration][$activeSlave.eyeColor = "hazel", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Pale-Grey|Prosthetics Configuration][$activeSlave.eyeColor = "pale-grey", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[White|Prosthetics Configuration][$activeSlave.eyeColor = "white", $prostheticsConfig = "eyeColor" ,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Pink|Prosthetics Configuration][$activeSlave.eyeColor = "pink", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Amber|Prosthetics Configuration][$activeSlave.eyeColor = "amber", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Red|Prosthetics Configuration][$activeSlave.eyeColor = "red", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Yellow|Prosthetics Configuration][$activeSlave.eyeColor = "yellow", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Orange|Prosthetics Configuration][$activeSlave.eyeColor = "orange", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<br>
Pupil Shape:
- <br>[[Circular|Prosthetics Config][$activeSlave.pupil = "circular", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Catlike|Prosthetics Config][$activeSlave.pupil = "catlike", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Serpent-Like|Prosthetics Config][$activeSlave.pupil = "serpent-like", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Devilish|Prosthetics Config][$activeSlave.pupil = "devilish", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Demonic|Prosthetics Config][$activeSlave.pupil = "demonic", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Hypnotic|Prosthetics Config][$activeSlave.pupil = "hypnotic", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Heart-Shaped|Prosthetics Config][$activeSlave.pupil = "heart-shaped", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Wide-Eyed|Prosthetics Config][$activeSlave.pupil = "wide-eyed", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Almond-Shaped|Prosthetics Config][$activeSlave.pupil = "almond-shaped", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Bright|Prosthetics Config][$activeSlave.pupil = "bright", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Teary|Prosthetics Config][$activeSlave.pupil = "teary", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Vacant|Prosthetics Config][$activeSlave.pupil = "vacant", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Star-Shaped|Prosthetics Config][$activeSlave.pupil = "star-shaped", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Goat-Like|Prosthetics Config][$activeSlave.pupil = "goat-like", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <br>[[Circular|Prosthetics Configuration][$activeSlave.pupil = "circular", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Catlike|Prosthetics Configuration][$activeSlave.pupil = "catlike", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Serpent-Like|Prosthetics Configuration][$activeSlave.pupil = "serpent-like", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Devilish|Prosthetics Configuration][$activeSlave.pupil = "devilish", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Demonic|Prosthetics Configuration][$activeSlave.pupil = "demonic", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Hypnotic|Prosthetics Configuration][$activeSlave.pupil = "hypnotic", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Heart-Shaped|Prosthetics Configuration][$activeSlave.pupil = "heart-shaped", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Wide-Eyed|Prosthetics Configuration][$activeSlave.pupil = "wide-eyed", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Almond-Shaped|Prosthetics Configuration][$activeSlave.pupil = "almond-shaped", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Bright|Prosthetics Configuration][$activeSlave.pupil = "bright", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Teary|Prosthetics Configuration][$activeSlave.pupil = "teary", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Vacant|Prosthetics Configuration][$activeSlave.pupil = "vacant", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Star-Shaped|Prosthetics Configuration][$activeSlave.pupil = "star-shaped", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Goat-Like|Prosthetics Configuration][$activeSlave.pupil = "goat-like", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<br>
Sclera Colors:
- [[White|Prosthetics Config][$activeSlave.sclerae = "white", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Blue|Prosthetics Config][$activeSlave.sclerae = "blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Black|Prosthetics Config][$activeSlave.sclerae = "black", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Brown|Prosthetics Config][$activeSlave.sclerae = "brown", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Green|Prosthetics Config][$activeSlave.sclerae = "green", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Turquoise|Prosthetics Config][$activeSlave.sclerae = "turquoise", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Sky-Blue|Prosthetics Config][$activeSlave.sclerae = "sky-blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Hazel|Prosthetics Config][$activeSlave.sclerae = "hazel", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Pale-Grey|Prosthetics Config][$activeSlave.sclerae = "pale-grey", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Pink|Prosthetics Config][$activeSlave.sclerae = "pink", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Amber|Prosthetics Config][$activeSlave.sclerae = "amber", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Red|Prosthetics Config][$activeSlave.sclerae = "red", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Yellow|Prosthetics Config][$activeSlave.sclerae = "yellow", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Orange|Prosthetics Config][$activeSlave.sclerae = "orange", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[White|Prosthetics Configuration][$activeSlave.sclerae = "white", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Blue|Prosthetics Configuration][$activeSlave.sclerae = "blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Black|Prosthetics Configuration][$activeSlave.sclerae = "black", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Brown|Prosthetics Configuration][$activeSlave.sclerae = "brown", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Green|Prosthetics Configuration][$activeSlave.sclerae = "green", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Turquoise|Prosthetics Configuration][$activeSlave.sclerae = "turquoise", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Sky-Blue|Prosthetics Configuration][$activeSlave.sclerae = "sky-blue", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Hazel|Prosthetics Configuration][$activeSlave.sclerae = "hazel", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Pale-Grey|Prosthetics Configuration][$activeSlave.sclerae = "pale-grey", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Pink|Prosthetics Configuration][$activeSlave.sclerae = "pink", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Amber|Prosthetics Configuration][$activeSlave.sclerae = "amber", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Red|Prosthetics Configuration][$activeSlave.sclerae = "red", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Yellow|Prosthetics Configuration][$activeSlave.sclerae = "yellow", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Orange|Prosthetics Configuration][$activeSlave.sclerae = "orange", $prostheticsConfig = "eyeColor", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
<<if $activeSlave.earImplant == 1>><br><br>
@@ -110,13 +112,13 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
<</if>>
<br><br>
<<if $activeSlave.hears != 0>>
- [[Restore hearing|Prosthetics Config][$activeSlave.hears = 0, $prostheticsConfig = "hearing"]] |
+ [[Restore hearing|Prosthetics Configuration][$activeSlave.hears = 0, $prostheticsConfig = "hearing"]] |
<</if>>
<<if $activeSlave.hears != -1>>
- [[Muffle|Prosthetics Config][$activeSlave.hears = -1, $prostheticsConfig = "hearing"]] |
+ [[Muffle|Prosthetics Configuration][$activeSlave.hears = -1, $prostheticsConfig = "hearing"]] |
<</if>>
<<if $activeSlave.hears != -2>>
- [[Disable|Prosthetics Config][$activeSlave.hears = -2, $prostheticsConfig = "hearing"]]
+ [[Disable|Prosthetics Configuration][$activeSlave.hears = -2, $prostheticsConfig = "hearing"]]
<</if>>
<</if>>
@@ -133,16 +135,16 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
<</if>>
<br><br>
<<if $activeSlave.voice != 0>>
- [[Disable|Prosthetics Config][$activeSlave.voice = 0, $prostheticsConfig = "voice"]] |
+ [[Disable|Prosthetics Configuration][$activeSlave.voice = 0, $prostheticsConfig = "voice"]] |
<</if>>
<<if $activeSlave.voice != 1>>
- [[Deep voice setting|Prosthetics Config][$activeSlave.voice = 1, $prostheticsConfig = "voice"]] |
+ [[Deep voice setting|Prosthetics Configuration][$activeSlave.voice = 1, $prostheticsConfig = "voice"]] |
<</if>>
<<if $activeSlave.voice != 2>>
- [[Standard voice setting|Prosthetics Config][$activeSlave.voice = 2, $prostheticsConfig = "voice"]] |
+ [[Standard voice setting|Prosthetics Configuration][$activeSlave.voice = 2, $prostheticsConfig = "voice"]] |
<</if>>
<<if $activeSlave.voice != 3>>
- [[High voice setting|Prosthetics Config][$activeSlave.voice = 3, $prostheticsConfig = "voice"]]
+ [[High voice setting|Prosthetics Configuration][$activeSlave.voice = 3, $prostheticsConfig = "voice"]]
<</if>>
<</if>>
@@ -165,39 +167,39 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
<<case -5>> <<= addA(setup.prosthetics.cyberneticL.name)>>
<</switch>>
installed.//<br>
- <<link "Detach <<= $his>> limbs" "Prosthetics Config">>
+ <<link "Detach <<= $his>> limbs" "Prosthetics Configuration">>
<<set $activeSlave.amp = 1, $prostheticsConfig = "removeLimbs">>
<</link>>
<br><br>
<</if>>
/*TODO save .legsTat and .armsTat / link them to prosthetic*/
<<if $activeSlave.amp != -1 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "basicL"}) != -1>>
- <<link "Attach <<= addA(setup.prosthetics.basicL.name)>>" "Prosthetics Config">>
+ <<link "Attach <<= addA(setup.prosthetics.basicL.name)>>" "Prosthetics Configuration">>
<<set $activeSlave.amp = -1, $prostheticsConfig = "basicPLimbs">>
<</link>>
<br>
<</if>>
<<if $activeSlave.amp != -2 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "sexL"}) != -1>>
- <<link "Attach <<= addA(setup.prosthetics.sexL.name)>>" "Prosthetics Config">>
+ <<link "Attach <<= addA(setup.prosthetics.sexL.name)>>" "Prosthetics Configuration">>
<<set $activeSlave.amp = -2, $prostheticsConfig = "sexPLimbs">>
<</link>>
<br>
<</if>>
<<if $activeSlave.amp != -3 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "beautyL"}) != -1>>
- <<link "Attach <<= addA(setup.prosthetics.beautyL.name)>>" "Prosthetics Config">>
+ <<link "Attach <<= addA(setup.prosthetics.beautyL.name)>>" "Prosthetics Configuration">>
<<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
<</link>>
<br>
<</if>>
<<if $activeSlave.amp != -4 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "combatL"}) != -1>>
- <<link "Attach <<= addA(setup.prosthetics.combatL.name)>>" "Prosthetics Config">>
+ <<link "Attach <<= addA(setup.prosthetics.combatL.name)>>" "Prosthetics Configuration">>
<<set $activeSlave.amp = -4, $prostheticsConfig = "combatPLimbs">>
<</link>>
<br>
<</if>>
<<if $activeSlave.amp != -5 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "cyberneticL"}) != -1>>
<<if $activeSlave.PLimb == 2>>
- <<link "Attach <<= addA(setup.prosthetics.cyberneticL.name)>>" "Prosthetics Config">>
+ <<link "Attach <<= addA(setup.prosthetics.cyberneticL.name)>>" "Prosthetics Configuration">>
<<set $activeSlave.amp = -5, $prostheticsConfig = "cyberPLimbs">>
<</link>>
<<else>>
@@ -211,23 +213,23 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
$He has a neural tail interface installed. You can assign and adjust $his tail here.
<<if $activeSlave.tail != "none">><br>
$He currently has a tail attached, if you wish to change it you will first need to detach it.<br>
- [[Detach|Prosthetics Config][$prostheticsConfig = "detachTail",$nextButton = "Continue", $nextLink = "Prosthetics Config"]]
+ [[Detach|Prosthetics Configuration][$prostheticsConfig = "detachTail",$nextButton = "Continue", $nextLink = "Prosthetics Configuration"]]
<<else>><br>
<<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "modT"})>>
Attach a modular tail designed to look like a:<br>
- [[Cat's Tail|Prosthetics Config][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "neko", $activeSlave.tailColor = $activeSlave.hColor]]
- | [[Dog's Tail|Prosthetics Config][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "inu", $activeSlave.tailColor = $activeSlave.hColor]]
- | [[Fox's Tail|Prosthetics Config][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "kit", $activeSlave.tailColor = $activeSlave.hColor]]
- | [[Kitsune's Tail|Prosthetics Config][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "kitsune", $activeSlave.tailColor = $activeSlave.hColor]]
- | [[Tanuki's Tail|Prosthetics Config][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "tanuki", $activeSlave.tailColor = $activeSlave.hColor]]
- | [[Cow's Tail|Prosthetics Config][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailColor = "ushi", $activeSlave.tailColor = $activeSlave.hColor]]
+ [[Cat's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "neko", $activeSlave.tailColor = $activeSlave.hColor]]
+ | [[Dog's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "inu", $activeSlave.tailColor = $activeSlave.hColor]]
+ | [[Fox's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "kit", $activeSlave.tailColor = $activeSlave.hColor]]
+ | [[Kitsune's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "kitsune", $activeSlave.tailColor = $activeSlave.hColor]]
+ | [[Tanuki's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "tanuki", $activeSlave.tailColor = $activeSlave.hColor]]
+ | [[Cow's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailColor = "ushi", $activeSlave.tailColor = $activeSlave.hColor]]
<br>
<</if>>
<<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "combatT"})>>
- [[Attach Combat Tail|Prosthetics Config][$prostheticsConfig = "attachTail", $activeSlave.tail = "combat", $activeSlave.tailColor = "jet black"]]
+ [[Attach Combat Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "combat", $activeSlave.tailColor = "jet black"]]
<</if>>
<<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "sexT"})>>
- | [[Attach Pleasure Tail|Prosthetics Config][$prostheticsConfig = "attachTail", $activeSlave.tail = "sex", $activeSlave.tailColor = "pink"]]
+ | [[Attach Pleasure Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "sex", $activeSlave.tailColor = "pink"]]
<</if>>
<</if>>
<<else>><br><br>
@@ -251,46 +253,63 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
<br>
Modify $his tail's appearance:<br>
- [[Cat|Prosthetics Config][$activeSlave.tailShape = "neko", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Dog|Prosthetics Config][$activeSlave.tailShape = "inu", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Fox|Prosthetics Config][$activeSlave.tailShape = "kit", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Kitsune|Prosthetics Config][$activeSlave.tailShape = "kitsune", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Tanuki|Prosthetics Config][$activeSlave.tailShape = "tanuki", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- | [[Bovine|Prosthetics Config][$activeSlave.tailShape = "ushi", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-<</if>>
-
-<<if $activeSlave.readyProsthetics.length > 0>>
- <br><br>
- These prosthetics are in storage or already equipped by $him:<br>
- <<for _p range $activeSlave.readyProsthetics>>
- <<= capFirstChar(setup.prosthetics[_p.id].name)>> <br>
- <</for>>
+ [[Cat|Prosthetics Configuration][$activeSlave.tailShape = "neko", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Dog|Prosthetics Configuration][$activeSlave.tailShape = "inu", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Fox|Prosthetics Configuration][$activeSlave.tailShape = "kit", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Kitsune|Prosthetics Configuration][$activeSlave.tailShape = "kitsune", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Tanuki|Prosthetics Configuration][$activeSlave.tailShape = "tanuki", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ | [[Bovine|Prosthetics Configuration][$activeSlave.tailShape = "ushi", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
<br><br>
Fit prosthetics to $him:
+<hr>
+
+<style>
+ .container {
+ display: grid;
+ grid-template-columns: 300px 200px 200px;
+ }
+ .full {
+ grid-column-start: 2;
+ grid-column-end: 4;
+ }
+</style>
+
+<div class="container">
+ <div></div>
+ <div>''Buy and fit''</div>
+ <div>
+ <<if $researchLab.level > 0>>
+ <<= App.UI.disabledLink(`''Construct in lab''`, ["Depending on lab speed might be faster than fitting an existing prosthetic but almost always faster than first building and than fitting it to $him."])>>
+ <</if>>
+ </div>
+
<<for _p range setup.prostheticIDs>>
<<if _p != "erectile">> /* exclude erectile implant */
- <<if $adjustProsthetics.findIndex(function(p) {return p.id == _p && p.slaveID == $activeSlave.ID}) != -1 || $researchLab.tasks.findIndex(function(p) {return p.type == "craftFit" && p.id == _p && p.slaveID == $activeSlave.ID}) != -1>><br>
- //<<= capFirstChar(addA(setup.prosthetics[_p].name))>> is already being fitted to $him.//
- <<elseif setup.prosthetics[_p].level > $prostheticsUpgrade>><br>
- //You need better contracts to buy <<= addA(setup.prosthetics[_p].name)>>.//
- <<elseif $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == _p}) == -1>>
- <br>
+ <div><<= capFirstChar(setup.prosthetics[_p].name)>></div>
+ <<if $adjustProsthetics.findIndex(function(p) {return p.id == _p && p.slaveID == $activeSlave.ID}) != -1 || $researchLab.tasks.findIndex(function(p) {return p.type == "craftFit" && p.id == _p && p.slaveID == $activeSlave.ID}) != -1>>
+ <div class="full">//Already being fitted to $him.//</div>
+ <<elseif setup.prosthetics[_p].level > $prostheticsUpgrade>>
+ <div class="full">//Better contracts needed to buy this.//</div>
+ <<elseif $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == _p}) != -1>>
+ <div class="full">//Completed.//</div>
+ <<else>>
<<capture _p>>
+ <div>
<<if $prosthetics[_p].amount > 0>>
- <<link "Fit <<= addA(setup.prosthetics[_p].name)>> from storage to <<= $him>>" "Prosthetics Config">>
+ <<link "From storage" "Prosthetics Configuration">>
<<set $adjustProsthetics.push({id: _p, workLeft: setup.prosthetics[_p].adjust, slaveID: $activeSlave.ID}), $prosthetics[_p].amount -= 1>>
<</link>>
<<else>>
- <<link "Buy and fit <<= addA(setup.prosthetics[_p].name)>> to <<= $him>>" "Prosthetics Config">>
+ <<link "<<= cashFormat(setup.prosthetics[_p].costs)>>" "Prosthetics Configuration">>
<<set $adjustProsthetics.push({id: _p, workLeft: setup.prosthetics[_p].adjust, slaveID: $activeSlave.ID}), cashX(forceNeg(setup.prosthetics[_p].costs), "slaveMod", $activeSlave)>>
<</link>>
- //Costs <<= cashFormat(setup.prosthetics[_p].costs)>>.//
<</if>>
- <<if $researchLab.level > 0 & $prosthetics[_p].research > 0>>
- <br>
- <<link "Construct <<= addA(setup.prosthetics[_p].name)>> for <<= $him>>" "Prosthetics Config">>
+ </div>
+ <div>
+ <<if $researchLab.level > 0 && $prosthetics[_p].research > 0>>
+ <<link "Construct" "Prosthetics Configuration">>
<<set $researchLab.tasks.push({
type: "craftFit",
id: _p,
@@ -298,21 +317,22 @@ Fit prosthetics to $him:
slaveID: $activeSlave.ID})>>
/* 1.5: longer than adjust, but faster than adjust+craft. */
<</link>>
- //Will take longer than fitting an existing prosthetic but faster than first building it and than fitting it to $him.//
<</if>>
+ </div>
<</capture>>
<</if>>
<</if>>
<</for>>
+</div>
/* base screen END */
<<case "eyeColor">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
<<if $activeSlave.amp != 1>>You have $him lie down and<<else>>You<</if>> use a speculum to keep $his eyes open while you disengage $his lenses remotely and swap them out with $his new $activeSlave.eyeColor lenses<<if $activeSlave.pupil != "circular" || $activeSlave.sclerae != "white">> with <<if $activeSlave.pupil != "circular" >>$activeSlave.pupil pupils<</if>><<if $activeSlave.pupil != "circular" && $activeSlave.sclerae != "white">> and <</if>><<if $activeSlave.sclerae != "white" >>$activeSlave.sclerae sclerae<</if>><</if>>.
<<case "eyes">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
<<if $activeSlave.eyes == 1>>
$He blinks as $his vision returns.
<<elseif $activeSlave.eyes == -1>>
@@ -322,7 +342,7 @@ Fit prosthetics to $him:
<</if>>
<<case "basicPLimbs">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
Attaching $his limbs is a simple procedure, you simply push a connector on each limb into the socket in $his implants until the lock engages.<<if $activeSlave.PLimb == 2>> $He jumps a bit as limbs connect to $his nerves.<</if>>
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<<if $activeSlave.devotion > 20>>
@@ -335,7 +355,7 @@ Fit prosthetics to $him:
<</if>>
<<case "sexPLimbs">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
Attaching $his limbs is a simple procedure, you simply push a connector on each limb into the socket in $his implants until the lock engages.<<if $activeSlave.PLimb == 2>> $He jumps a bit as limbs connect to $his nerves.<</if>>
While exiting the prosthetic lab $he is experimenting with $his new arms and legs.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
@@ -349,7 +369,7 @@ Fit prosthetics to $him:
<</if>>
<<case "beautyPLimbs">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
Attaching $his limbs is a simple procedure, you simply push a connector on each limb into the socket in $his implants until the lock engages.<<if $activeSlave.PLimb == 2>> $He jumps a bit as limbs connect to $his nerves.<</if>> $He exits the prosthetic lab <<if canSee($activeSlave)>>marveling at the beautiful, natural appearance of $his new arms and legs<<else>>thanking you for $his new arms and legs, unaware of how natural they look<</if>>.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<<if $activeSlave.devotion <= 20>>
@@ -362,7 +382,7 @@ Fit prosthetics to $him:
<</if>>
<<case "combatPLimbs">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
Attaching $his limbs is a simple procedure, you simply push a connector on each limb into the socket in $his implants until the lock engages.<<if $activeSlave.PLimb == 2>> $He jumps a bit as limbs connect to $his nerves.<</if>> While exiting the prosthetic lab $he is wondering over the bulky <<if canSee($activeSlave)>>appearance<<else>>weight<</if>> of $his reinforced arms and legs.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<<if $activeSlave.devotion <= 20>>
@@ -375,7 +395,7 @@ Fit prosthetics to $him:
<</if>>
<<case "cyberPLimbs">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
Attaching $his limbs is a simple procedure, you simply push a connector on each limb into the socket in $his implants until the lock engages.<<if $activeSlave.PLimb == 2>> $He jumps a bit as limbs connect to $his nerves.<</if>> $He exits the prosthetic lab marveling <<if canSee($activeSlave)>>at the shiny artificial skin of $his new arms and legs<<else>>at the feel of the artificial skin of $his new arms and legs under $his new fingers<</if>>.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<<if $activeSlave.devotion <= 20>>
@@ -388,7 +408,7 @@ Fit prosthetics to $him:
<</if>>
<<case "removeLimbs">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
<<set $activeSlave.amp = 1>>
Due to built-in safeties it is necessary to remove each limb separately, first releasing the lock and then waiting for automated seal release.<br>
<<if ($activeSlave.devotion > 20)>>
@@ -398,7 +418,7 @@ Fit prosthetics to $him:
<</if>>
<<case "hearing">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
<<if $activeSlave.hears == 0>>
$He tilts $his head as $his hearing returns.
<<elseif $activeSlave.hears == -1>>
@@ -408,7 +428,7 @@ Fit prosthetics to $him:
<</if>>
<<case "voice">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
<<if $activeSlave.voice == 0>>
$He tries testing out $his new voice, only to discover $he's been made mute.
<<elseif $activeSlave.voice == 1>>
@@ -420,12 +440,12 @@ Fit prosthetics to $him:
<</if>>
<<case "detachTail">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
<<set $activeSlave.tail = "none", $activeSlave.tailShape = "none", $activeSlave.tailColor = "none">>
You send the release signal and the mechanical lock disengages allowing the artificial tail to pop right off.
<<case "attachTail">>
- <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Config">>
+ <<set $prostheticsConfig = "main", $nextButton = "Continue", $nextLink = "Prosthetics Configuration">>
Attaching $his tail is a simple procedure, you simply push the connector into a socket, right where $his tailbone ends, until the lock engages.<br>
When you are done, $he looks back and
<<if $activeSlave.tailShape == "neko">>sways $his tail side to side enigmatically.
@@ -450,7 +470,7 @@ Fit prosthetics to $him:
<</if>>
<<link "Attach <<= addA(setup.prosthetics.basicL.name)>>">>
<<set $activeSlave.amp = -1, $prostheticsConfig = "basicPLimbs">>
- <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <<replace #attach>><br><br><<include "Prosthetics Configuration">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<br>
<</if>>
@@ -461,7 +481,7 @@ Fit prosthetics to $him:
<</if>>
<<link "Attach <<= addA(setup.prosthetics.sexL.name)>>">>
<<set $activeSlave.amp = -2, $prostheticsConfig = "sexPLimbs">>
- <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <<replace #attach>><br><br><<include "Prosthetics Configuration">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<br>
<</if>>
@@ -472,7 +492,7 @@ Fit prosthetics to $him:
<</if>>
<<link "Attach <<= addA(setup.prosthetics.beautyL.name)>>">>
<<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
- <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <<replace #attach>><br><br><<include "Prosthetics Configuration">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<br>
<</if>>
@@ -483,7 +503,7 @@ Fit prosthetics to $him:
<</if>>
<<link "Attach <<= addA(setup.prosthetics.combatL.name)>>">>
<<set $activeSlave.amp = -4, $prostheticsConfig = "combatPLimbs">>
- <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <<replace #attach>><br><br><<include "Prosthetics Configuration">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<br>
<</if>>
@@ -493,9 +513,9 @@ Fit prosthetics to $him:
<br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br>
<<set _first = 0>>
<</if>>
- <<link "Attach <<= addA(setup.prosthetics.cyberneticL.name)>>" "Prosthetics Config">>
+ <<link "Attach <<= addA(setup.prosthetics.cyberneticL.name)>>" "Prosthetics Configuration">>
<<set $activeSlave.amp = -5, $prostheticsConfig = "cyberPLimbs">>
- <<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
+ <<replace #attach>><br><br><<include "Prosthetics Configuration">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<</if>>
<</if>>
diff --git a/src/js/ageAdjustYoungRelative.js b/src/js/ageAdjustYoungRelative.js
new file mode 100644
index 0000000000000000000000000000000000000000..35eefdb75eca66fd67f4ed43b4a01377c77707ac
--- /dev/null
+++ b/src/js/ageAdjustYoungRelative.js
@@ -0,0 +1,101 @@
+/* When generating a younger relative by cloning an older one (for example, for Household Liquidators),
+ * clamp certain physical parameters of the younger relative appropriately for their physical age.
+ * Generally these adjustments should match the age limiters found in generateNewSlave.js.
+ */
+
+ window.AgeAdjustYoungRelative = function(slave) {
+ /* breast size */
+ var origBoobs = slave.boobs;
+ if (slave.physicalAge <= 10) {
+ slave.boobs = Math.clamp(slave.boobs, 0, 100);
+ } else if (slave.physicalAge <= 12) {
+ slave.boobs = Math.clamp(slave.boobs, 0, 300);
+ } else if (slave.physicalAge <= 14) {
+ slave.boobs = Math.clamp(slave.boobs, 0, 400);
+ } else if (slave.physicalAge <= 15) {
+ slave.boobs = Math.clamp(slave.boobs, 0, 450);
+ }
+
+ /* if we've reduced breast size because of age, reapply minimum weight modifiers */
+ if (origBoobs > slave.boobs && State.variables.weightAffectsAssets !== 0) {
+ if (slave.weight > 190) {
+ slave.boobs += 300;
+ } else if (slave.weight > 160) {
+ slave.boobs += 200;
+ } else if (slave.weight > 30) {
+ slave.boobs += 100;
+ }
+ }
+
+ /* if we've managed to *increase* breast size, just put it back */
+ if (origBoobs < slave.boobs) {
+ slave.boobs = origBoobs;
+ }
+
+ /* breast shape - preserve if it would have been valid, otherwise reset to normal (don't reroll) */
+ const AllowedBoobShapes = [];
+ if (slave.boobs > 250 && slave.boobs < 800) {
+ AllowedBoobShapes.push("perky");
+ AllowedBoobShapes.push("downward-facing");
+ }
+ if (slave.boobs > 400 && slave.boobs < 1200) {
+ AllowedBoobShapes.push("torpedo-shaped");
+ AllowedBoobShapes.push("wide-set");
+ }
+ if (!AllowedBoobShapes.includes(slave.boobShape)) {
+ slave.boobShape = "normal";
+ }
+
+ /* voice */
+ if (slave.physicalAge <= 16 && slave.voice <= 1) {
+ slave.voice = 2;
+ }
+
+ /* XX genitals */
+ if (slave.physicalAge < 20 && slave.vagina > 1) {
+ slave.vagina = 1;
+ }
+
+ if (slave.physicalAge <= 13 && slave.clit > 1) {
+ slave.clit = 1;
+ }
+
+ if (slave.physicalAge <= 13 && slave.labia > 1) {
+ slave.labia = 1;
+ } else if (slave.physicalAge <= 15 && slave.labia > 2) {
+ slave.labia = 2;
+ }
+
+ /* XY genitals */
+ if (slave.physicalAge <= 13) {
+ if (slave.geneticQuirks.wellHung === 2 && slave.physicalAge >= 8 && slave.dick > 4) {
+ slave.dick = 4;
+ } else if (slave.dick > 3) {
+ slave.dick = 3;
+ }
+ if (slave.balls > 3) {
+ slave.balls = 3
+ slave.scrotum = slave.balls;
+ }
+ } else if (slave.physicalAge <= 15) {
+ if (slave.geneticQuirks.wellHung === 2 && slave.dick > 5) {
+ slave.dick = 5;
+ } else if (slave.dick > 3) {
+ slave.dick = 3;
+ }
+ if (slave.balls > 4) {
+ slave.balls = 4;
+ slave.scrotum = slave.balls;
+ }
+ }
+
+ /* teeth */
+ if (slave.physicalAge < 6) {
+ slave.teeth = "baby";
+ } else if (slave.physicalAge < 12) {
+ slave.teeth = "mixed";
+ }
+
+ /* reset puberty status */
+ generatePuberty(slave);
+};
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 37c771a001d3bab8831817e5d4d39d9851e8d28b..a702976f1ac0da6c303a775b34d3bb6c668cdc6c 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -564,7 +564,7 @@ App.Desc.ageAndHealth = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {string} Slave's brand
+ * @returns {string} Slave's brand. Slave is the slave in question, but call the body part without modifiers. Rather than using "left breast" and "right breast" just use "breast". The function will then describe any brands on the breasts, if present, in natural language.
*/
App.Desc.brand = function(slave, surface) {
"use strict";
@@ -579,8 +579,28 @@ App.Desc.brand = function(slave, surface) {
if (surface) { /* describes a single branded body part */
if (surface === "belly" && setup.fakeBellies.includes(bellyAccessory) && slave.brand.belly) {
r += `${His} fake belly has the same brand, ${slave.brand.belly}, as ${his} real one. `;
- } else if (slave.brand[surface]) {
- r += `${He} has ${slave.brand[surface]} branded into the flesh of ${his} ${surface}. `;
+ } else {
+ surface = App.Desc.oppositeSides(surface);
+ if (slave.brand[surface.center]) { // center defined, body part has no mirror.
+ r += `${He} has ${slave.brand[surface.center]} branded into the flesh of ${his} ${surface.center}. `;
+ } else { // Center not defined, body part has a mirror.
+ if (!slave.brand[surface.left] && !slave.brand[surface.right]) {
+ // no marks
+ } else if (slave.brand[surface.left] === slave.brand[surface.right]) {
+ // matching places and marks
+ // note that the slave.brand object won't have slave.brand["upper armS"] with an S defined, just the left and right, so we just use the left since we know they match.
+ r += `${He} has ${slave.brand[surface.left]} branded into the flesh of both ${his} ${surface.both}. `;
+ } else if (slave.brand[surface.left] && slave.brand[surface.right]) {
+ // matching places but different marks
+ r += `${He} has both ${slave.brand[surface.left]} branded into the flesh of ${his} ${surface.left}, and ${slave.brand[surface.right]} branded into ${his} ${surface.right}. `;
+ } else if (slave.brand[surface.left]) {
+ // left
+ r += `${He} has ${slave.brand[surface.left]} branded into the flesh of ${his} ${surface.left}. `;
+ } else if (slave.brand[surface.right]) {
+ // right
+ r += `${He} has ${slave.brand[surface.right]} branded into the flesh of ${his} ${surface.right}. `;
+ }
+ }
}
} else { /* describes all branded body parts */
for (let [key, value] of Object.entries(slave.brand)) {
@@ -673,3 +693,29 @@ App.Desc.inscrip = function(slave) {
}
return `"I <3 ${object}"`;
};
+
+/**
+ * @param {string} surface
+ * @returns {object} Checks if body part has an opposite side. Returns an object with the appropriate part as center if it has no mirror, or left/right/both if it does.
+ */
+App.Desc.oppositeSides = function(surface) {
+ let parts = {};
+ if (["neck", "chest", "back", "lower back", "belly", "pubic mound"].includes(surface) || surface.startsWith("left") || surface.startsWith("right")) {
+ parts.center = surface;
+ } else {
+ // set up a left part and a right to check for a mirror brand or marking
+ if (surface === "feet") {
+ parts.both = surface;
+ surface = "foot";
+ } else if (surface === "calves") {
+ parts.both = surface;
+ surface = "calf";
+ }
+ parts.left = "left " + surface;
+ parts.right = "right " + surface;
+ if (!parts.both) {
+ parts.both = surface + "s";
+ }
+ }
+ return parts;
+};
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 74ca168b468877d6c8a57cef114632a0bae45574..ab3d2b8d0a9e33b330fd047b6eb847be2041a593 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -680,6 +680,43 @@ App.UI.SlaveList.penthousePage = function() {
};
}
+ /**
+ * Displays encyclopedia entries for occupations at the top of the tab, if enabled
+ * @returns {string}
+ */
+ function encycTips(jn) {
+ if (V.showTipsFromEncy) {
+ switch (jn) {
+ case "rest":
+ return `<<encyclopediaEntryRest>>`;
+ case "chooseOwn":
+ break; /* no entry written for choose own */
+ case "fucktoy":
+ return `<<encyclopediaEntryFucktoy>>`;
+ case "classes":
+ return `<<encyclopediaEntryAttendingClasses>>`;
+ case "houseServant":
+ return `<<encyclopediaEntryServitude>>`;
+ case "whore":
+ return `<<encyclopediaEntryWhoring>>`;
+ case "publicServant":
+ return `<<encyclopediaEntryPublicService>>`;
+ case "subordinateSlave":
+ return `<<encyclopediaEntrySexualServitude>>`;
+ case "cow":
+ return `<<encyclopediaEntryMilking>>`;
+ case "gloryhole":
+ return `<<encyclopediaEntryGloryHole>>`;
+ case "confinement":
+ return `<<encyclopediaEntryConfinement>>`;
+ default:
+ return `missing tip for this tab`;
+ }
+ } else {
+ return ``;
+ }
+ }
+
let r = '';
if (V.positionMainLinks >= 0) {
@@ -694,14 +731,16 @@ App.UI.SlaveList.penthousePage = function() {
/** @type {tabDesc[]} */
let tabs = [];
+ // Overview tab
if (V.useSlaveSummaryOverviewTab) {
tabs.push(makeTabDesc('overview', 'Overview', overviewTabContent()));
}
+ // tabs for each assignment
for (const jn of ph.jobsNames) {
const slaves = _slavesForJob(jn);
if (slaves.n > 0) {
- tabs.push(makeTabDesc(jn, `${ph.desc.jobs[jn].position} (${slaves.n})`, slaves.text));
+ tabs.push(makeTabDesc(jn, `${ph.desc.jobs[jn].position} (${slaves.n})`, encycTips(jn) + slaves.text));
}
}
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index 99bd4aef890f9662eb725524c28c0be75a1583a5..722eb033a9038b327f736032fbeb8bdb4d9fd999 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -523,12 +523,13 @@ window.canWalk = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
+ * @param {boolean} checkLanguage Does a bad accent count as being unable to speak?
* @returns {boolean}
*/
-window.canTalk = function(slave) {
+window.canTalk = function(slave, checkLanguage = true) {
if (!slave) {
return null;
- } else if (slave.accent > 2) {
+ } else if (checkLanguage && slave.accent > 2) {
return false;
} else if (slave.voice === 0) {
return false;
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 7ce071c73942193b3b7503fb484e21eaaa2fe02a..cfdb71dda2157f7620b55b37f06999e881e8b01d 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -435,7 +435,7 @@ window.SlaveSummaryUncached = (function() {
break;
}
r += " ";
- if (canTalk(slave)) {
+ if (canTalk(slave, false)) {
switch (slave.speechRules) {
case "permissive":
r += `<strong>SpR:P</strong>`;
@@ -519,7 +519,7 @@ window.SlaveSummaryUncached = (function() {
*/
function long_rules(slave) {
r += `Living standard: ${slave.livingRules}. `;
- if (canTalk(slave)) {
+ if (canTalk(slave, false)) {
r += `Speech rules: ${slave.speechRules}. `;
}
r += `Relationship rules: ${slave.relationshipRules}. `;
diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js
index 09869c2f8be77846bf0d38968f94b9d2def1b5cc..0e2219c712c1bb4b74984524f9d6c3d8d4a98726 100644
--- a/src/npc/descriptions/boobs/boobs.js
+++ b/src/npc/descriptions/boobs/boobs.js
@@ -1480,7 +1480,7 @@ App.Desc.boobsExtra = function(slave, pronouns) {
App.Desc.boobsBrand = function(slave) {
if (State.variables.showBodyMods === 1) {
if (slave.fuckdoll === 0) {
- return(App.Desc.brand(slave, "chest") + App.Desc.brand(slave, "left breast") + App.Desc.brand(slave, "right breast"));
+ return(App.Desc.brand(slave, "chest") + App.Desc.brand(slave, "breast"));
}
}
};
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index bd6ab19c09700e40a6d8a549600c7c123e6f0558..6064467f59114791ea4ec2638808ebc2cb3ad021 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -340,8 +340,8 @@ from your victim.
<</if>>
<</if>>
-<<if (!setup.dyedSkins.includes($activeSlave.skin))>>
- $His dyed<<if $seeRace == 1>>, $activeSlave.race<</if>> ass barely shows the spanking.
+<<if (setup.dyedSkins.includes($activeSlave.skin))>>
+ $His $activeSlave.skin<<if $seeRace == 1>>, $activeSlave.race<</if>> ass barely shows the spanking.
<<elseif (skinToneLevel($activeSlave) < 5)>>
$His $activeSlave.skin<<if $seeRace == 1>>, $activeSlave.race<</if>> ass shows the spanking extremely well.
<<elseif (skinToneLevel($activeSlave) < 12)>>
diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw
index b194a00dda1f9823f516f067cd41b43d2b283cad..127fd703e8aecfc5c6417cc74c83197523a1e26f 100644
--- a/src/uncategorized/descriptionOptions.tw
+++ b/src/uncategorized/descriptionOptions.tw
@@ -9,96 +9,87 @@
//These options will affect both the long form description of each slave and the miniscenes available from the main menu.//
-<br><br>
-
-<<if $showSexualHistory == 1>>
- Sexual histories are @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showSexualHistory = 0]]//
-<<else>>
- Sexual histories are @@.red;HIDDEN.@@ //[[Show|Description Options][$showSexualHistory = 1]]//
-<</if>>
-
+<<options $surnameOrder>>
+ <<option 0 "Allow nationality name order">>
+ Order names ''based on country of origin''.
+ <<option 1 "Force name surname">>
+ Names will always be ''Name Surname''.
+ <<option 2 "Force surname name">>
+ Names will always be ''Surname Name''.
+<</options>>
+
+<<options $seeRace>>
+ <<option 0 "Disable most mentions of race">>
+ Ethnicity will ''almost never'' be mentioned.
+ <<option 1 "Enable mentions of race">>
+ Ethnicity will ''occasionally'' be mentioned.
+<</options>>
<br>
-
-<<if $showBodyMods == 1>>
- Cosmetic body mods are @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showBodyMods = 0]]//
-<<else>>
- Cosmetic body mods are @@.red;HIDDEN.@@ //[[Show|Description Options][$showBodyMods = 1]]//
-<</if>>
-
+<<options $seeNationality>>
+ <<option 0 "Disable most mentions of nationality">>
+ Nationality will ''almost never'' be mentioned.
+ <<option 1 "Enable mentions of nationality">>
+ Nationality will ''occasionally'' be mentioned.
+<</options>>
+
+Cosmetic body mods are
+<<options $showBodyMods>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
<br>
-
-<<if $showImplantEffects == 1>>
- The effects of implants are @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showImplantEffects = 0]]//
-<<else>>
- The effects of implants are @@.red;HIDDEN.@@ //[[Show|Description Options][$showImplantEffects = 1]]//
-<</if>>
-
-<br>
-
-<<if $showClothing == 1>>
- Clothing is mostly @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showClothing = 0]]//
-<<else>>
- Clothing is mostly @@.red;HIDDEN.@@ //[[Show|Description Options][$showClothing = 1]]//
-<</if>>
-
-<br>
-
-<<if $showWardrobe == 1>>
- The Slave Interact wardrobe is @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showWardrobe = 0]]//
-<<else>>
- The Slave Interact wardrobe is @@.red;HIDDEN.@@ //[[Show|Description Options][$showWardrobe = 1]]//
-<</if>>
-
+The effects of implants are
+<<options $showImplantEffects>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
+
+Clothing is mostly
+<<options $showClothing>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
<br>
+The Slave Interact wardrobe is
+<<options $showWardrobe>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
Detailed slave age information is
-<<if $showAgeDetail == 1>>
- @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showAgeDetail = 0]]//
-<<else>>
- @@.red;HIDDEN.@@ //[[Show|Description Options][$showAgeDetail = 1]]//
-<</if>>
-
+<<options $showAgeDetail>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
<br>
-
Approximate height is
-<<if $showHeightCMs == 1>>
- @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showHeightCMs = 0]]//
-<<else>>
- @@.red;HIDDEN.@@ //[[Show|Description Options][$showHeightCMs = 1]]//
-<</if>>
-
-<br>
+<<options $showHeightCMs>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
Volume, in CCs, of breasts is
-<<if $showBoobCCs == 1>>
- @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showBoobCCs = 0]]//
-<<else>>
- @@.red;HIDDEN.@@ //[[Show|Description Options][$showBoobCCs = 1]]//
-<</if>>
-
-<<if $seeDicks != 0>>
+<<options $showBoobCCs>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
+<<if $seeDicks > 0>>
<br>
Approximate sizes of dicks and balls are
- <<if $showDickCMs == 1>>
- @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showDickCMs = 0]]//
- <<else>>
- @@.red;HIDDEN.@@ //[[Show|Description Options][$showDickCMs = 1]]//
- <</if>>
+ <<options $showDickCMs>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+ <</options>>
<</if>>
-<br>
-
-Height and length units are in
-<<if $showInches == 1>>
- @@.cyan;BOTH UNITS.@@ //[[Centimeters|Description Options][$showInches = 0]]// | //[[Inches|Description Options][$showInches = 2]]//
-<<elseif $showInches == 2>>
- @@.yellow;INCHES ONLY.@@ //[[Centimeters|Description Options][$showInches = 0]]// | //[[Both|Description Options][$showInches = 1]]//
-<<else>>
- @@.yellow;CENTIMETERS ONLY.@@ //[[Inches|Description Options][$showInches = 2]]// | //[[Both|Description Options][$showInches = 1]]//
-<</if>>
+<br>Height and length units are in
+<<options $showInches>>
+ <<option 1 "Inches">>
+ <<option 1 "Both units">>
+ <<option 0 "Centimeters">>
+<</options>>
<br>
-
<<if $showNumbers == 1>>Only numbers @@.cyan;UP TO $showNumbersMax@@<<else>>Numbers<</if>> are displayed as
<<if $showNumbers == 1>>
words.<br>
@@ -109,22 +100,14 @@ Height and length units are in
@@.yellow;WORDS.@@ //[[Integers|Description Options][$showNumbers = 2]]// | //[[Both|Description Options][$showNumbers = 1, $showNumbersMax = 20]]//
<</if>>
-<br>
+<br>Sexual histories are
+<<options $showSexualHistory>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
Attractiveness and Sexual scores are
-<<if $showScores == 1>>
- @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showScores = 0]]//
-<<else>>
- @@.red;HIDDEN.@@ //[[Show|Description Options][$showScores = 1]]//
-<</if>>
-
-<br>
-
-Names will
-<<if $surnameOrder == 0>>
- adhere to a slave's country of origin. //[[Force name surname|Description Options][$surnameOrder = 1]]// | //[[Force surname name|Description Options][$surnameOrder = 2]]//
-<<elseif $surnameOrder == 1>>
- always be name then surname. //[[Allow nationality name order|Description Options][$surnameOrder = 0]]// | //[[Force surname name|Description Options][$surnameOrder = 2]]//
-<<elseif $surnameOrder == 2>>
- always be surname then name. //[[Allow nationality name order|Description Options][$surnameOrder = 0]]// | //[[Force name surname|Description Options][$surnameOrder = 1]]//
-<</if>>
+<<options $showScores>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
\ No newline at end of file
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 8a97e38d49c5b3cf6b5e00160ca68955a41fc13c..667ece4b8fd4fe2ef9e783828661fd5d286cae4e 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -182,7 +182,7 @@ is
<</if>>
<</if>>
- <<if canTalk($activeSlave)>>
+ <<if canTalk($activeSlave, false)>>
<<accentDescription>>
<</if>>
@@ -1151,11 +1151,9 @@ is
<</if>>
<<if $activeSlave.fuckdoll == 0>>
- <<= App.Desc.brand($activeSlave, "left cheek")>>
- <<= App.Desc.brand($activeSlave, "left ear")>>
+ <<= App.Desc.brand($activeSlave, "cheek")>>
+ <<= App.Desc.brand($activeSlave, "ear")>>
<<= App.Desc.brand($activeSlave, "neck")>>
- <<= App.Desc.brand($activeSlave, "right cheek")>>
- <<= App.Desc.brand($activeSlave, "right ear")>>
<</if>>
<<if $familyTesting == 1>>
diff --git a/src/uncategorized/motherDaughterWorkaround.tw b/src/uncategorized/motherDaughterWorkaround.tw
index e21e5f7e5b37ce00554ae068c13b8fad73d4e0b9..c0772a486e336d4fc1a68bb7699b8f5c71776d7f 100644
--- a/src/uncategorized/motherDaughterWorkaround.tw
+++ b/src/uncategorized/motherDaughterWorkaround.tw
@@ -69,4 +69,8 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.butt += random(-1, 1)>>
<</if>>
+<<if _secondSlave.physicalAge <= 15>>
+ <<run AgeAdjustYoungRelative(_secondSlave)>>
+<</if>>
+
<<run newSlave(_secondSlave)>>
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index 50d9d845830d8bb02eb98d10a1dedab031a13cbb..3d8543b44948d64ba047de24b3eb5f01e54d7880 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -1063,35 +1063,35 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<if _p.id == "basicL">>
<<if $activeSlave.amp > 0>>
<<set $activeSlave.amp = -1, $prostheticsConfig = "basicPLimbs">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<else>>
//Since $he already has more advanced prosthetic limbs attached the <<= setup.prosthetics.basicL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "sexL">>
<<if $activeSlave.amp >= -1>>
<<set $activeSlave.amp = -2, $prostheticsConfig = "sexPLimbs">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.sexL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "beautyL">>
<<if $activeSlave.amp >= -1>>
<<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.beautyL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "combatL">>
<<if $activeSlave.amp >= -1>>
<<set $activeSlave.amp = -4, $prostheticsConfig = "combatPLimbs">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.combatL.name>> will be put into storage.//
<</if>>
<<else>>
<<if $activeSlave.PLimb == 2>>
<<set $activeSlave.amp = -5, $prostheticsConfig = "cyberPLimbs">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<else>>
//Since $he must have <<= addA(setup.prosthetics.interfaceP2.name)>> installed to attach cybernetic limbs the <<= setup.prosthetics.cyberneticL.name>> will be put into storage.//
<</if>>
@@ -1110,10 +1110,10 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
/*Reason: there are different designs player can choose from.*/
<<elseif _p.id == "combatT">>
<<set $prostheticsConfig = "attachTail", $activeSlave.tail = "combat", $activeSlave.tailColor = "jet black">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<elseif _p.id == "sexT">>
<<set $prostheticsConfig = "attachTail", $activeSlave.tail = "sex", $activeSlave.tailColor = "pink">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<</if>>
<<default>>
//Since there is no automated procedure to implant/attach <<= setup.prosthetics[_p.id].name>> it will be put into storage.//
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index eeb24b707882148c837bd3648323200e432f6d9c..99557bf79ac0177618e8de1b44ba806acc704c7a 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -132,8 +132,8 @@ This save was created using FC version $ver build $releaseID.
<<options $showNeighborDetails>>
Economic report neighbor details such as trade impacts on culture are
- <<option 1 "Enabled">>
- <<option 0 "Disabled">>
+ <<option true "Enabled">>
+ <<option false "Disabled">>
<</options>>
<<options $formatNumbers>>
@@ -188,8 +188,8 @@ This save was created using FC version $ver build $releaseID.
<<options $showTipsFromEncy>>
Tips from the Encyclopedia are
- <<option true "Enabled">>
- <<option false "Disabled">>
+ <<option 1 "Enabled">>
+ <<option 0 "Disabled">>
<</options>>
<<options $useSummaryCache>>
@@ -329,8 +329,8 @@ This save was created using FC version $ver build $releaseID.
<<options $showClothingErection>>
Clothing erection bulges
- <<option 1 "Enabled">>
- <<option 0 "Disabled">>
+ <<option true "Enabled">>
+ <<option false "Disabled">>
<</options>>
<<elseif $seeImages === 0>>
<<options $seeMainFetishes>>
@@ -341,8 +341,8 @@ This save was created using FC version $ver build $releaseID.
<<elseif $seeImages === 3>>
<<options $showClothingErection>>
Clothing erection bulges
- <<option 1 "Enabled">>
- <<option 0 "Disabled">>
+ <<option true "Enabled">>
+ <<option false "Disabled">>
<<comment>>
@@.red;Git compiled only, no exceptions.@@
<</options>>
@@ -440,21 +440,13 @@ This save was created using FC version $ver build $releaseID.
<</options>>
<<options $precociousPuberty>>
- Girls can experience precocious puberty.
+ Precocious puberty (pregnancy younger than $fertilityAge)
<<option 1 "Enabled">>
<<option 0 "Disabled">>
<<comment>>
Will not affect existing precocious puberty cases already in-game.
<</options>>
- <div align="center">
- <<if $precociousPuberty == 1>>
- //(In certain conditions they will can become pregnant younger then normal age - $fertilityAge).//
- <<elseif $precociousPuberty == 0>>
- //(Not able to become pregnant younger than normal age - $fertilityAge).//
- <</if>>
- </div>
- <br><br>
<<options $disableLisping>>
Slaves with fat lips or heavy oral piercings can lisp
<<option 1 "Enabled">>
@@ -482,8 +474,8 @@ This save was created using FC version $ver build $releaseID.
<br>
<<options $showMissingSlaves>>
Missing slave names are currently
- <<option 1 "Enabled">>
- <<option 0 "Disabled">>
+ <<option true "Enabled">>
+ <<option false "Disabled">>
<</options>>
<br>
@@ -543,15 +535,15 @@ This save was created using FC version $ver build $releaseID.
<<if $familyTesting > 0>>
<<options $allowFamilyTitles>>
- Relatives use family titles.
+ Family titles for relatives
<<option 1 "Enabled">>
<<option 0 "Disabled">>
<</options>>
<<options $showDistantRelatives>>
Distant relatives such as aunts, nieces and cousins are
- <<option 1 "Shown">>
- <<option 0 "Hidden">>
+ <<option true "Shown">>
+ <<option false "Hidden">>
<</options>>
<</if>>
</div>
@@ -604,6 +596,7 @@ This save was created using FC version $ver build $releaseID.
Difficulty is
<<option 1.5 "Very hard">>
<<option 1.25 "Hard">>
+ <<option 1 "Normal">>
<<option 0.75 "Easy">>
<<option 0.5 "Very easy">>
<</options>>
@@ -933,7 +926,7 @@ This save was created using FC version $ver build $releaseID.
<<option 1 "Enabled">>
<<option 0 "Disabled">>
<<comment>>
- This will allow manual selection of events and unlock some options that would usually be restricted by progress
+ This will allow manual selection of events and unlock some options that would usually be restricted by progress.
<</options>>
<<if $cheatMode > 0>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index ad2712dee4ec1d6a7d270a7f40807c6787c0122b..719c5a97629f574727f02a23917b4d8971fec3ab 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -3,6 +3,12 @@
<<set $HeadGirl = $slaves[_iTemp]>>
<<set _oralUse = 0, _analUse = 0, _vaginalUse = 0, _mammaryUse = 0, _penetrativeUse = 0>>
+<<if $seeImages && $seeReportImages>>
+ <div class="imageRef medImg">
+ <<= SlaveArt($slaves[$i], 2, 0)>>
+ </div>
+<</if>>
+
<<setLocalPronouns $HeadGirl 2>>
<<if $slaves[$i].devotion > 20>>
diff --git a/src/uncategorized/siblingsWorkaround.tw b/src/uncategorized/siblingsWorkaround.tw
index 3c3035f7774b971cc72bfcb0294a4861695a657b..6680ab134bde3d6cfc236b73f96c1b6fd6e55ecc 100644
--- a/src/uncategorized/siblingsWorkaround.tw
+++ b/src/uncategorized/siblingsWorkaround.tw
@@ -67,4 +67,8 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.butt += random (-1, 1)>>
<</if>>
+<<if _secondSlave.physicalAge <= 15>>
+ <<run AgeAdjustYoungRelative(_secondSlave)>>
+<</if>>
+
<<run newSlave(_secondSlave)>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 9b7b5128402fe01015393c40b13f8308ae178e8b..c0da8384ebc0a18a7ff4d72cc74762e0a0df9ac9 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -63,7 +63,7 @@
| [[Auto salon|Salon][$degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$primaryEarColor = "",$secondaryEarColor = "",$primaryTailColor = "",$secondaryTailColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$artificialEyeFill = "",$tattooChoice = "",$piercingLevel = ""]]
| [[Body mod studio|Body Modification][$degradation = 0, $tattooChoice = undefined]]
| [[Remote surgery|Remote Surgery][$degradation = 0]]
-<<if $prostheticsUpgrade > 0>>| [[Configure cybernetics|Prosthetics Config][$prostheticsConfig = "main"]]<</if>>
+<<if $prostheticsUpgrade > 0>>| [[Configure cybernetics|Prosthetics Configuration][$prostheticsConfig = "main"]]<</if>>
<br>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 9e6b406c9ab49b7797dddeb28120d4b4db8c91fe..e17ff6f10bdfed4d917a6ddc761ac5aca695511f 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -11,79 +11,178 @@
//These options will affect the short slave summaries that appear on the main menu and the facility management screens.//
<br><br>
-<span id="OptionAbbreviateSidebar"><<OptionAbbreviateSidebar>></span>
-
-<br>
-<span id="OptionSortMain"><<OptionSortMain>></span>
-
-<br>
-<span id="OptionSortBy"><<OptionSortBy>></span>
-
-<br>
-<span id="OptionSortOrder"><<OptionSortOrder>></span>
-
-<br>
-<span id="OptionRulesAssistantMain"><<OptionRulesAssistantMain>></span>
-
-<br><br>
-<span id="OptionDisplayAssignments"><<OptionDisplayAssignments>></span>
-
-<br>
-<span id="OptionSummaryStats"><<OptionSummaryStats>></span>
-
-<br>
-<span id="OptionLineSeparations"><<OptionLineSeparations>></span>
-
-<br><br>
-<span id="OptionAbbreviateDevotion"><<OptionAbbreviateDevotion>></span>
-
-<br>
-<span id="OptionAbbreviateRules"><<OptionAbbreviateRules>></span>
-
-<br>
-<span id="OptionAbbreviateDiet"><<OptionAbbreviateDiet>></span>
-
-<br>
-<span id="OptionAbbreviateHealth"><<OptionAbbreviateHealth>></span>
-
-<br>
-<span id="OptionAbbreviateDrugs"><<OptionAbbreviateDrugs>></span>
-
-<br>
-<span id="OptionAbbreviateHormoneBalance"><<OptionAbbreviateHormoneBalance>></span>
-
-<br>
-<span id="OptionAbbreviateRace"><<OptionAbbreviateRace>></span>
-
-<br>
-<span id="OptionAbbreviateNationality"><<OptionAbbreviateNationality>></span>
-
-<br>
-<span id="OptionAbbreviateGenitalia"><<OptionAbbreviateGenitalia>></span>
-
-<br>
-<span id="OptionAbbreviatePhysicals"><<OptionAbbreviatePhysicals>></span>
-
-<br>
-<span id="OptionAbbreviateSkills"><<OptionAbbreviateSkills>></span>
-
-<br>
-<span id="OptionAbbreviateMental"><<OptionAbbreviateMental>></span>
-
-<br>
-<span id="OptionAbbreviateClothes"><<OptionAbbreviateClothes>></span>
+Line separations are
+ <<options $lineSeparations>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+ <</options>>
+
+ <br><br>Slaves are sorted on the main menu by:
+ <<options $sortSlavesOrder>>
+ <<option "Devotion" "Devotion">>
+ <<option "name" "name">>
+ <<option "seniority" "Date purchased">>
+ <<option "actualAge" "Age">>
+ <<option "visualAge" "How old they look">>
+ <<option "physicalAge" "Age of their body">>
+ <<option "assignment" "assignment">>
+ <</options>>
+ order.
+ <br>Slaves are sorted in
+ <<options $sortSlavesOrder>>
+ <<option "Ascending" "Ascending">>
+ <<option "Descending" "Descending">>
+ <</options>>
+ order.
+
+<br><br>Sort options are
+<<options $sortSlavesMain>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
+<<if $sortSlavesMain > 0>>
+ <br>
+ Sort by:
+ <<options $sortSlavesBy>>
+ <<option "Devotion" "Devotion">>
+ <<option "name" "name">>
+ <<option "seniority" "Date purchased">>
+ <<option "actualAge" "Age">>
+ <<option "visualAge" "How old they look">>
+ <<option "physicalAge" "Age of their body">>
+ <<option "assignment" "assignment">>
+ <</options>>
+<</if>>
-<br>
-<span id="OptionAbbreviateRulesets"><<OptionAbbreviateRulesets>></span>
-
-<br>
-<span id="OptionAbbreviateOrigins"><<OptionAbbreviateOrigins>></span>
+<br><br>The rules assistant is
+<<options $rulesAssistantMain>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
+<br>
+Main menu assignment shortcuts are
+<<options $displayAssignments>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
+<br>
+Granular slave stat numbers are
+<<options $summaryStats>>
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+<</options>>
+
+<br>Mental stats are
+<<options $abbreviateDevotion>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+Mental attributes are
+<<options $OptionAbbreviateMental>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+
+<br>
+Rules are
+<<options $abbreviateRules>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+
+Health is
+<<options $abbreviateHealth>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+<br>
+Diet and weight are
+<<options $abbreviateDiet>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+
+Drugs and addiction are
+<<options $abbreviateDrugs>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+<br>
+Hormone balance is
+<<options $abbreviateHormoneBalance>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+
+Genitalia are
+<<options $abbreviateGenitalia>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+<br>
+Physical traits are
+<<options $abbreviatePhysicals>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+
+Skills are
+<<options $abbreviateSkills>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+
+<br>Nationality is
+<<options $abbreviateNationality>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+<br>
+Race is
+<<options $abbreviateRace>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+ <<option 0 "Hidden">>
+<</options>>
+
+Origins are
+<<options $abbreviateOrigins>>
+ <<option 2 "Summarized">>
+ <<option 0 "Hidden">>
+<</options>>
+<br>
+Rules Assistant rulesets are
+<<options $abbreviateRulesets>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+<</options>>
+
+Facilities in the sidebar are
+<<options $abbreviateSidebar>>
+ <<option 2 "Summarized">>
+ <<option 1 "Abbreviated">>
+<</options>>
<<if $showMissingSlaves>>
-<br>
-<span id="OptionAbbreviateMissing"><<OptionAbbreviateMissing>></span>
+ <br>
+ Missing slave parents are
+ <<options $showMissingSlavesSD>>
+ <<option true "Shown">>
+ <<option false "Hidden">>
+ <</options>>
<</if>>
<br><br>
-//[[FC Dev's preferred options|Summary Options][$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 1,$abbreviateSidebar = 1]]//
+//[[FC Dev's preferred options|Summary Options ][$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 1,$abbreviateSidebar = 1]]//
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index fb5d957300fa41303ed1768d0390e3a166921116..7c510f44df6879eebac603855aef81720e9455a1 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -1873,7 +1873,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<set $prostheticsConfig = "interface">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<set $nextLink = "Remote Surgery">>
@@ -1893,7 +1893,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<set $prostheticsConfig = "interface">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<set $nextLink = "Remote Surgery">>
<<case "PLimb interface2">>
@@ -1912,7 +1912,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<set $prostheticsConfig = "interface">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<set $nextLink = "Remote Surgery">>
<<case "PLimb interface3">>
@@ -1931,7 +1931,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<set $prostheticsConfig = "interface">>
- <<include "Prosthetics Config">>
+ <<include "Prosthetics Configuration">>
<<set $nextLink = "Remote Surgery">>
/* This was moved to prostheticsConfig.tw
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 2ace2c2c3c88a66f8f0afd0b45fa2611a85c8a2e..bc9b945839761c576d33022ff04688fc684d5d2c 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1209,33 +1209,33 @@ $He's got a
<<else>>
<<print either("skinny", "slim", "taut")>>
<</if>>
- ass.
+ ass,
<<elseif $activeSlave.butt <= 2>>
<<if $arcologies[0].FSSlimnessEnthusiast > 20 && $arcologies[0].FSHedonisticDecadence == "unset">>
<<print either("fashionable", "sleek and attractive", "small and enticing")>>
<<else>>
<<print either("rounded, small", "small but rounded", "small, sleek")>>
<</if>>
- rear end.
-<<elseif $activeSlave.butt <= 3>><<print either("big and healthy", "curved and plump", "healthy and plump")>> derrière.
-<<elseif $activeSlave.butt <= 4>><<print either("big bubble", "curvy and enticing", "juicy and large")>> butt.
-<<elseif $activeSlave.butt <= 5>><<print either("huge", "juicy and huge", "massive and undeniable")>> rear end.
-<<elseif $activeSlave.butt <= 6>><<print either("enormous", "truly massive")>> posterior.
-<<elseif $activeSlave.butt <= 7>><<print either("gigantic", "titanic")>> ass.
-<<elseif $activeSlave.butt <= 10>><<print either("gigantic", "titanic")>> ass.
- <<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so big it jiggles as the machine rapes $his asshole.
- <<elseif !canWalk($activeSlave)>> It's so big it would jiggle as $he walked — if $he could walk.
- <<else>> It's so big it jiggles as $he walks.
+ rear end,
+<<elseif $activeSlave.butt <= 3>><<print either("big and healthy", "curved and plump", "healthy and plump")>> derrière,
+<<elseif $activeSlave.butt <= 4>><<print either("big bubble", "curvy and enticing", "juicy and large")>> butt,
+<<elseif $activeSlave.butt <= 5>><<print either("huge", "juicy and huge", "massive and undeniable")>> rear end,
+<<elseif $activeSlave.butt <= 6>><<print either("enormous", "truly massive")>> posterior,
+<<elseif $activeSlave.butt <= 7>><<print either("gigantic", "titanic")>> ass,
+<<elseif $activeSlave.butt <= 10>><<print either("gigantic", "titanic")>> ass,
+ <<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so big it jiggles as the machine rapes $his asshole,
+ <<elseif !canWalk($activeSlave)>> It's so big it would jiggle as $he walked — if $he could walk,
+ <<else>> It's so big it jiggles as $he walks,
<</if>>
-<<elseif $activeSlave.butt <= 14>><<print either("cushion-like", "hall-crowding")>> ass.
- <<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so big it massively jiggles as the machine rapes $his asshole.
- <<elseif !canWalk($activeSlave)>> It's so big it would jiggle nonstop as $he walked — if $he could walk.
- <<else>> It's so big it jiggles nonstop as $he walks.
+<<elseif $activeSlave.butt <= 14>><<print either("cushion-like", "hall-crowding")>> ass,
+ <<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so big it massively jiggles as the machine rapes $his asshole,
+ <<elseif !canWalk($activeSlave)>> It's so big it would jiggle nonstop as $he walked — if $he could walk,
+ <<else>> It's so big it jiggles nonstop as $he walks,
<</if>>
-<<else>><<print either("bean bag sized", "room-crowding")>> ass.
- <<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so massive it jiggles endlessly as the machine rapes $his asshole.
- <<elseif !canWalk($activeSlave)>> It's so massive it would jiggle endlessly as $he walked — if $he could walk.
- <<else>> It's so massive it jiggles endlessly as $he walks.
+<<else>><<print either("bean bag sized", "room-crowding")>> ass,
+ <<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so massive it jiggles endlessly as the machine rapes $his asshole,
+ <<elseif !canWalk($activeSlave)>> It's so massive it would jiggle endlessly as $he walked — if $he could walk,
+ <<else>> It's so massive it jiggles endlessly as $he walks,
<</if>>
<</if>>
@@ -3617,8 +3617,7 @@ $He's got a
<<dickTatDescription>>
<<dickPiercingDescription>>
<<= App.Desc.brand($activeSlave, "penis")>>
- <<= App.Desc.brand($activeSlave, "left testicle")>>
- <<= App.Desc.brand($activeSlave, "right testicle")>>
+ <<= App.Desc.brand($activeSlave, "testicle")>>
<</if>>
<</if>>
@@ -3833,42 +3832,6 @@ $He's got a
Society looks fondly on $his complete inability to reproduce.
<</if>>
-<<set _pubertyAge = Math.min($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
-<<if ($activeSlave.physicalAge < _pubertyAge-2)>>
- $He is too sexually immature to have pubic hair.
-<<elseif ($activeSlave.pubicHStyle == "hairless")>>
- $He's naturally smooth and hairless.
-<<elseif ($activeSlave.pubicHStyle == "bald")>>
- $He is no longer able to grow pubic hair leaving $him hairless and smooth.
-<<elseif ($activeSlave.pubicHStyle == "waxed")>>
- <<if $activeSlave.fuckdoll > 0>>
- $His pubic hair has been removed to prevent chafing.
- <<elseif ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>>
- $His pubic hair has been removed to prevent chafing.
- <<else>>
- $He's waxed and smooth.
- <</if>>
-<<elseif ($activeSlave.physicalAge < _pubertyAge-1)>>
- $He has a few wisps of pubic hair.
-<<elseif ($activeSlave.physicalAge < _pubertyAge)>>
- $He is on the verge of puberty and has a small patch of $activeSlave.pubicHColor pubic hair above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
-<<elseif ($activeSlave.pubicHStyle == "in a strip")>>
- $His $activeSlave.pubicHColor pubic hair is waxed into a narrow strip above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
-<<elseif ($activeSlave.pubicHStyle == "neat")>>
- $His $activeSlave.pubicHColor pubic hair is waxed into a neat patch above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
-<<elseif ($activeSlave.pubicHStyle == "bushy in the front and neat in the rear")>>
- $His $activeSlave.pubicHColor pubic hair forms a natural bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
-<<elseif ($activeSlave.pubicHStyle == "bushy")>>
- $His $activeSlave.pubicHColor pubic hair forms a natural bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
-<<elseif ($activeSlave.pubicHStyle == "very bushy")>>
- $His $activeSlave.pubicHColor pubic hair forms a dense bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>> that trails up to $his navel.
-<</if>>
-
-<<if $activeSlave.fuckdoll == 0>>
- <<if $showBodyMods == 1>>
- <<= App.Desc.brand($activeSlave, "pubic mound")>>
- <</if>>
-<</if>>
<<if ($activeSlave.dick == 0)>>
<<if ($activeSlave.clit > 0)>>
@@ -4125,6 +4088,43 @@ $He's got a
<</if>>
<</if>>
+<<if $activeSlave.fuckdoll == 0>>
+ <<if $showBodyMods == 1>>
+ <<= App.Desc.brand($activeSlave, "pubic mound")>>
+ <</if>>
+<</if>>
+
+<<set _pubertyAge = Math.min($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
+<<if ($activeSlave.physicalAge < _pubertyAge-2)>>
+ $He is too sexually immature to have pubic hair.
+<<elseif ($activeSlave.pubicHStyle == "hairless")>>
+ $He's naturally smooth and hairless.
+<<elseif ($activeSlave.pubicHStyle == "bald")>>
+ $He is no longer able to grow pubic hair leaving $him hairless and smooth.
+<<elseif ($activeSlave.pubicHStyle == "waxed")>>
+ <<if $activeSlave.fuckdoll > 0>>
+ $His pubic hair has been removed to prevent chafing.
+ <<elseif ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>>
+ $His pubic hair has been removed to prevent chafing.
+ <<else>>
+ $He's waxed and smooth.
+ <</if>>
+<<elseif ($activeSlave.physicalAge < _pubertyAge-1)>>
+ $He has a few wisps of pubic hair.
+<<elseif ($activeSlave.physicalAge < _pubertyAge)>>
+ $He is on the verge of puberty and has a small patch of $activeSlave.pubicHColor pubic hair above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "in a strip")>>
+ $His $activeSlave.pubicHColor pubic hair is waxed into a narrow strip above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "neat")>>
+ $His $activeSlave.pubicHColor pubic hair is waxed into a neat patch above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "bushy in the front and neat in the rear")>>
+ $His $activeSlave.pubicHColor pubic hair forms a natural bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "bushy")>>
+ $His $activeSlave.pubicHColor pubic hair forms a natural bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "very bushy")>>
+ $His $activeSlave.pubicHColor pubic hair forms a dense bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>> that trails up to $his navel.
+<</if>>
+
<</widget>>
<<widget "earDescription">>
@@ -16672,7 +16672,6 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
<<if $activeSlave.hips < -1>>
<<if $activeSlave.butt > 2>>
- $His butt is
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
disproportionately large for $his narrow hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -16683,11 +16682,10 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
@@.red;disproportionately large@@ for $his narrow hips.
<</if>>
<<else>>
- $His hips are very narrow.
+ and $his hips are very narrow.
<</if>>
<<elseif $activeSlave.hips < 0>>
<<if $activeSlave.butt > 4>>
- $His butt is
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
disproportionately large for $his trim hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -16698,23 +16696,22 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
@@.red;disproportionately large@@ for $his trim hips.
<</if>>
<<else>>
- $His butt is complemented by $his trim hips.
+ complemented by $his trim hips.
<</if>>
<<elseif $activeSlave.hips > 2>>
<<if $activeSlave.butt <= 8>>
- $His butt is @@.red;disproportionately small@@ for $his monstrous hips.
+ @@.red;disproportionately small@@ for $his monstrous hips.
<<else>>
- $His butt is fitting for $his monstrous hips.
+ fitting for $his monstrous hips.
<</if>>
<<elseif $activeSlave.hips > 1>>
<<if $activeSlave.butt <= 3 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>>
- $His butt is @@.red;disproportionately small@@ for $his very wide hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
+ @@.red;disproportionately small@@ for $his very wide hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
<<else>>
- $His butt is flattered by $his very wide hips.
+ flattered by $his very wide hips.
<</if>>
<<elseif $activeSlave.hips > 0>>
<<if $activeSlave.butt > 8>>
- $His butt is
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
disproportionately large for $his broad hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -16725,13 +16722,12 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
@@.red;disproportionately large@@ for $his broad hips.
<</if>>
<<elseif $activeSlave.butt <= 2 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>>
- $His butt is @@.red;disproportionately small@@ for $his broad hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
+ @@.red;disproportionately small@@ for $his broad hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
<<else>>
- $His butt is complemented by $his broad hips.
+ complemented by $his broad hips.
<</if>>
<<else>>
<<if $activeSlave.butt > 6>>
- $His butt is
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
disproportionately large for $his womanly hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -16742,9 +16738,9 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
@@.red;disproportionately large@@ for $his womanly hips.
<</if>>
<<elseif $activeSlave.butt <= 1 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>>
- $His butt is @@.red;disproportionately small@@ for $his ample hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
+ @@.red;disproportionately small@@ for $his ample hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
<<else>>
- $His butt is complemented by $his ample hips.
+ complemented by $his ample hips.
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index bd81e81e61fdd8857d07f0b7dbb0ad701aef05d7..f020af540a09a2766204dc99ce77f4526a845383 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -44,8 +44,7 @@
$activeSlave.shouldersTat
<</switch>>
<</if>>
- <<= App.Desc.brand($activeSlave, "left shoulder")>>
- <<= App.Desc.brand($activeSlave, "right shoulder")>>
+ <<= App.Desc.brand($activeSlave, "shoulder")>>
<</if>>
<</widget>>
@@ -137,8 +136,7 @@
<</switch>>
<</if>>
/* App.Desc.boobsBrand handles boobBrands */
- /*<<= App.Desc.brand($activeSlave, "left breast")>>*/
- /*<<= App.Desc.brand($activeSlave, "right breast")>>*/
+ /*<<= App.Desc.brand($activeSlave, "breast")>>*/
<</if>>
<</widget>>
@@ -226,15 +224,10 @@
$activeSlave.armsTat
<</switch>>
<</if>>
- <<= App.Desc.brand($activeSlave, "right upper arm")>>
- <<= App.Desc.brand($activeSlave, "right lower arm")>>
- <<= App.Desc.brand($activeSlave, "right hand")>>
- <<= App.Desc.brand($activeSlave, "right wrist")>>
-
- <<= App.Desc.brand($activeSlave, "left upper arm")>>
- <<= App.Desc.brand($activeSlave, "left lower arm")>>
- <<= App.Desc.brand($activeSlave, "left wrist")>>
- <<= App.Desc.brand($activeSlave, "left hand")>>
+ <<= App.Desc.brand($activeSlave, "upper arm")>>
+ <<= App.Desc.brand($activeSlave, "lower arm")>>
+ <<= App.Desc.brand($activeSlave, "hand")>>
+ <<= App.Desc.brand($activeSlave, "wrist")>>
<</if>>
<</widget>>
@@ -431,8 +424,7 @@
$activeSlave.buttTat
<</switch>>
<</if>>
-<<= App.Desc.brand($activeSlave, "left buttock")>>
-<<= App.Desc.brand($activeSlave, "right buttock")>>
+<<= App.Desc.brand($activeSlave, "buttock")>>
<</if>>
<</widget>>
@@ -641,14 +633,9 @@
$activeSlave.legsTat
<</switch>>
<</if>>
- <<= App.Desc.brand($activeSlave, "left thigh")>>
- <<= App.Desc.brand($activeSlave, "left calf")>>
- <<= App.Desc.brand($activeSlave, "left ankle")>>
- <<= App.Desc.brand($activeSlave, "left foot")>>
-
- <<= App.Desc.brand($activeSlave, "right thigh")>>
- <<= App.Desc.brand($activeSlave, "right calf")>>
- <<= App.Desc.brand($activeSlave, "right ankle")>>
- <<= App.Desc.brand($activeSlave, "right foot")>>
+ <<= App.Desc.brand($activeSlave, "thigh")>>
+ <<= App.Desc.brand($activeSlave, "calf")>>
+ <<= App.Desc.brand($activeSlave, "ankle")>>
+ <<= App.Desc.brand($activeSlave, "foot")>>
<</if>>
<</widget>>
diff --git a/src/utility/optionsWidgets.tw b/src/utility/optionsWidgets.tw
deleted file mode 100644
index f52e92599a4af30184ca6f40d787d9f4d9a664cb..0000000000000000000000000000000000000000
--- a/src/utility/optionsWidgets.tw
+++ /dev/null
@@ -1,856 +0,0 @@
-:: Option Widgets [widget nobr]
-
-/%
- Call as <<OptionLineSeparations>>
- Should be placed in a <span> with id = "OptionLineSeparations"
-%/
-<<widget "OptionLineSeparations">>
-Line separations are
-<<if $lineSeparations == 0>>
- @@.red;HIDDEN.@@
- //<<link "Show">>
- <<set $lineSeparations = 1>>
- <<replace '#OptionLineSeparations'>>
- <<OptionLineSeparations>>
- <</replace>>
- <</link>>//
-<<else>>
- @@.cyan;SHOWN.@@
- //<<link "Hide">>
- <<set $lineSeparations = 0>>
- <<replace '#OptionLineSeparations'>>
- <<OptionLineSeparations>>
- <</replace>>
- <</link>>//
-<</if>>
-
-<</widget>>
-
-/%
- Call as <<OptionSortBy>>
- Should be placed in a <span> with id = "OptionSortBy"
-%/
-<<widget "OptionSortBy">>
-<<if $sortSlavesBy == "name">>
- Slaves are sorted on the main menu by @@.yellow;NAME.@@
-<<elseif $sortSlavesBy == "seniority">>
- Slaves are sorted on the main menu by @@.yellow;SENIORITY.@@
-<<elseif $sortSlavesBy == "actualAge">>
- Slaves are sorted on the main menu by @@.yellow;TRUE AGE.@@
-<<elseif $sortSlavesBy == "visualAge">>
- Slaves are sorted on the main menu by @@.yellow;APPARENT AGE.@@
-<<elseif $sortSlavesBy == "physicalAge">>
- Slaves are sorted on the main menu by @@.yellow;BODILY AGE.@@
-<<elseif $sortSlavesBy == "assignment">>
- Slaves are sorted on the main menu by @@.yellow;ASSIGNMENT.@@
-<<else>>
- Slaves are sorted on the main menu by @@.yellow;DEVOTION.@@
-<</if>>
-//
-<<link "Devotion">>
- <<set $sortSlavesBy = "devotion">>
- <<replace '#OptionSortBy'>>
- <<OptionSortBy>>
- <</replace>>
-<</link>>
-|
-<<link "Name">>
- <<set $sortSlavesBy = "name">>
- <<replace '#OptionSortBy'>>
- <<OptionSortBy>>
- <</replace>>
-<</link>>
-|
-<<link "Assignment">>
- <<set $sortSlavesBy = "assignment">>
- <<replace '#OptionSortBy'>>
- <<OptionSortBy>>
- <</replace>>
-<</link>>
-|
-<<link "Date purchased">>
- <<set $sortSlavesBy = "seniority">>
- <<replace '#OptionSortBy'>>
- <<OptionSortBy>>
- <</replace>>
-<</link>>
-|
-<<link "Age">>
- <<set $sortSlavesBy = "actualAge">>
- <<replace '#OptionSortBy'>>
- <<OptionSortBy>>
- <</replace>>
-<</link>>
-|
-<<link "How old they look">>
- <<set $sortSlavesBy = "visualAge">>
- <<replace '#OptionSortBy'>>
- <<OptionSortBy>>
- <</replace>>
-<</link>>
-|
-<<link "Age of their body">>
- <<set $sortSlavesBy = "physicalAge">>
- <<replace '#OptionSortBy'>>
- <<OptionSortBy>>
- <</replace>>
-<</link>>
-//
-<</widget>>
-
-/%
- Call as <<OptionSortOrder>>
- Should be placed in a <span> with id = "OptionSortOrder"
-%/
-<<widget "OptionSortOrder">>
-<<if $sortSlavesOrder == "ascending">>
- Slaves are sorted in @@.cyan;ASCENDING@@ order.
- //<<link "Sort descending">>
- <<set $sortSlavesOrder = "descending">>
- <<replace '#OptionSortOrder'>>
- <<OptionSortOrder>>
- <</replace>>
- <</link>>//
-<<else>>
- Slaves are sorted in @@.red;DESCENDING@@ order.
- //<<link "Sort ascending">>
- <<set $sortSlavesOrder = "ascending">>
- <<replace '#OptionSortOrder'>>
- <<OptionSortOrder>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionSortMain>>
- Should be placed in a <span> with id = "OptionSortMain"
-%/
-<<widget "OptionSortMain">>
-<<if $sortSlavesMain == 0>>
- Sort options are @@.red;HIDDEN@@ on the main menu.
- //<<link "Show">>
- <<set $sortSlavesMain = 1>>
- <<replace '#OptionSortMain'>>
- <<OptionSortMain>>
- <</replace>>
- <</link>>//
-<<else>>
- Sort options are @@.cyan;SHOWN@@ on the main menu.
- //<<link "Hide">>
- <<set $sortSlavesMain = 0>>
- <<replace '#OptionSortMain'>>
- <<OptionSortMain>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-<<widget "OptionsSortAsAppearsOnMain">>
-<<if $sortSlavesMain != 0>>
- <br>
- Sort by:
- <<if $sortSlavesBy != "devotion">>[[Devotion|Main][$sortSlavesBy = "devotion"]]<<else>>Devotion<</if>> |
- <<if $sortSlavesBy != "name">>[[Name|Main][$sortSlavesBy = "name"]]<<else>>Name<</if>> |
- <<if $sortSlavesBy != "assignment">>[[Assignment|Main][$sortSlavesBy = "assignment"]]<<else>>Assignment<</if>> |
- <<if $sortSlavesBy != "seniority">>[[Seniority purchased|Main][$sortSlavesBy = "seniority"]]<<else>>Seniority<</if>> |
- <<if $sortSlavesBy != "actualAge">>[[Age|Main][$sortSlavesBy = "actualAge"]]<<else>>Age<</if>> |
- <<if $sortSlavesBy != "visualAge">>[[Apparent Age|Main][$sortSlavesBy = "visualAge"]]<<else>>Apparent Age<</if>> |
- <<if $sortSlavesBy != "physicalAge">>[[Bodily Age|Main][$sortSlavesBy = "physicalAge"]]<<else>>Bodily Age<</if>>
-
- Sort: <<if $sortSlavesOrder != "descending">>[[Descending|Main][$sortSlavesOrder = "descending"]]<<else>>Descending<</if>> |
- <<if $sortSlavesOrder != "ascending">>[[Ascending|Main][$sortSlavesOrder = "ascending"]]<<else>>Ascending<</if>>
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionRulesAssistantMain>>
- Should be placed in a <span> with id = "OptionRulesAssistantMain"
-%/
-<<widget "OptionRulesAssistantMain">>
-<<if $rulesAssistantMain == 0>>
- The rules assistant is @@.red;HIDDEN.@@
- //<<link "Show">>
- <<set $rulesAssistantMain = 1>>
- <<replace '#OptionRulesAssistantMain'>>
- <<OptionRulesAssistantMain>>
- <</replace>>
- <</link>>//
-<<else>>
- The rules assistant is @@.cyan;SHOWN.@@
- //<<link "Hide">>
- <<set $rulesAssistantMain = 0>>
- <<replace '#OptionRulesAssistantMain'>>
- <<OptionRulesAssistantMain>>
- <</replace>>
- <</link>>//
-<</if>>
-
-<</widget>>
-
-/%
- Call as <<OptionDisplayAssignments>>
- Should be placed in a <span> with id = "OptionDisplayAssignments"
-%/
-<<widget "OptionDisplayAssignments">>
-Main menu assignment shortcuts are
-<<if $displayAssignments == 1>>
- @@.cyan;SHOWN.@@
- //<<link "Hide">>
- <<set $displayAssignments = 0>>
- <<replace '#OptionDisplayAssignments'>>
- <<OptionDisplayAssignments>>
- <</replace>>
- <</link>>//
-<<else>>
- @@.red;HIDDEN.@@
- //<<link "Show">>
- <<set $displayAssignments = 1>>
- <<replace '#OptionDisplayAssignments'>>
- <<OptionDisplayAssignments>>
- <</replace>>
- <</link>>//
-<</if>>
-
-<</widget>>
-
-/%
- Call as <<OptionSummaryStats>>
- Should be placed in a <span> with id = "OptionSummaryStats"
-%/
-<<widget "OptionSummaryStats">>
-Granular slave stat numbers are
-<<if $summaryStats == 1>>
- @@.cyan;DISPLAYED.@@
- //<<link "Hide">>
- <<set $summaryStats = 0>>
- <<replace '#OptionSummaryStats'>>
- <<OptionSummaryStats>>
- <</replace>>
- <</link>>//
-<<else>>
- @@.red;HIDDEN.@@
- //<<link "Display">>
- <<set $summaryStats = 1>>
- <<replace '#OptionSummaryStats'>>
- <<OptionSummaryStats>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateDevotion>>
- Should be placed in a <span> with id = "OptionAbbreviateDevotion"
-%/
-<<widget "OptionAbbreviateDevotion">>
-Mental stats are
-<<if $abbreviateDevotion == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateDevotion == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateDevotion != 0>>
- //<<link "Hide">>
- <<set $abbreviateDevotion = 0>>
- <<replace '#OptionAbbreviateDevotion'>>
- <<OptionAbbreviateDevotion>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateDevotion != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateDevotion = 1>>
- <<replace '#OptionAbbreviateDevotion'>>
- <<OptionAbbreviateDevotion>>
- <</replace>>
- <</link>>//
- <<if $abbreviateDevotion != 2>>|<</if>>
-<</if>>
-<<if $abbreviateDevotion != 2>>
- //<<link "Summarize">>
- <<set $abbreviateDevotion = 2>>
- <<replace '#OptionAbbreviateDevotion'>>
- <<OptionAbbreviateDevotion>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateRules>>
- Should be placed in a <span> with id = "OptionAbbreviateRules"
-%/
-<<widget "OptionAbbreviateRules">>
-Rules are
-<<if $abbreviateRules == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateRules == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateRules != 0>>
- //<<link "Hide">>
- <<set $abbreviateRules = 0>>
- <<replace '#OptionAbbreviateRules'>>
- <<OptionAbbreviateRules>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateRules != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateRules = 1>>
- <<replace '#OptionAbbreviateRules'>>
- <<OptionAbbreviateRules>>
- <</replace>>
- <</link>>//
- <<if $abbreviateRules != 2>>|<</if>>
-<</if>>
-<<if $abbreviateRules != 2>>
- //<<link "Summarize">>
- <<set $abbreviateRules = 2>>
- <<replace '#OptionAbbreviateRules'>>
- <<OptionAbbreviateRules>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateHealth>>
- Should be placed in a <span> with id = "OptionAbbreviateHealth"
-%/
-<<widget "OptionAbbreviateHealth">>
-Health is
-<<if $abbreviateHealth == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateHealth == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateHealth != 0>>
- //<<link "Hide">>
- <<set $abbreviateHealth = 0>>
- <<replace '#OptionAbbreviateHealth'>>
- <<OptionAbbreviateHealth>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateHealth != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateHealth = 1>>
- <<replace '#OptionAbbreviateHealth'>>
- <<OptionAbbreviateHealth>>
- <</replace>>
- <</link>>//
- <<if $abbreviateHealth != 2>>|<</if>>
-<</if>>
-<<if $abbreviateHealth != 2>>
- //<<link "Summarize">>
- <<set $abbreviateHealth = 2>>
- <<replace '#OptionAbbreviateHealth'>>
- <<OptionAbbreviateHealth>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateDiet>>
- Should be placed in a <span> with id = "OptionAbbreviateDiet"
-%/
-<<widget "OptionAbbreviateDiet">>
-Diet and weight are
-<<if $abbreviateDiet == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateDiet == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateDiet != 0>>
- //<<link "Hide">>
- <<set $abbreviateDiet = 0>>
- <<replace '#OptionAbbreviateDiet'>>
- <<OptionAbbreviateDiet>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateDiet != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateDiet = 1>>
- <<replace '#OptionAbbreviateDiet'>>
- <<OptionAbbreviateDiet>>
- <</replace>>
- <</link>>//
- <<if $abbreviateDiet != 2>>|<</if>>
-<</if>>
-<<if $abbreviateDiet != 2>>
- //<<link "Summarize">>
- <<set $abbreviateDiet = 2>>
- <<replace '#OptionAbbreviateDiet'>>
- <<OptionAbbreviateDiet>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateDrugs>>
- Should be placed in a <span> with id = "OptionAbbreviateDrugs"
-%/
-<<widget "OptionAbbreviateDrugs">>
-Drugs and addiction are
-<<if $abbreviateDrugs == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateDrugs == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateDrugs != 0>>
- //<<link "Hide">>
- <<set $abbreviateDrugs = 0>>
- <<replace '#OptionAbbreviateDrugs'>>
- <<OptionAbbreviateDrugs>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateDrugs != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateDrugs = 1>>
- <<replace '#OptionAbbreviateDrugs'>>
- <<OptionAbbreviateDrugs>>
- <</replace>>
- <</link>>//
- <<if $abbreviateDrugs != 2>>|<</if>>
-<</if>>
-<<if $abbreviateDrugs != 2>>
- //<<link "Summarize">>
- <<set $abbreviateDrugs = 2>>
- <<replace '#OptionAbbreviateDrugs'>>
- <<OptionAbbreviateDrugs>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateHormoneBalance>>
- Should be placed in a <span> with id = "OptionAbbreviateHormoneBalance"
-%/
-<<widget "OptionAbbreviateHormoneBalance">>
-Hormone balance is
-<<if $abbreviateHormoneBalance == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateHormoneBalance == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-<<if $abbreviateHormoneBalance != 0>>
- //<<link "Hide">>
- <<set $abbreviateHormoneBalance = 0>>
- <<replace '#OptionAbbreviateHormoneBalance'>>
- <<OptionAbbreviateHormoneBalance>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateHormoneBalance != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateHormoneBalance = 1>>
- <<replace '#OptionAbbreviateHormoneBalance'>>
- <<OptionAbbreviateHormoneBalance>>
- <</replace>>
- <</link>>//
- <<if $abbreviateHormoneBalance != 2>>|<</if>>
-<</if>>
-<<if $abbreviateHormoneBalance != 2>>
- //<<link "Summarize">>
- <<set $abbreviateHormoneBalance = 2>>
- <<replace '#OptionAbbreviateHormoneBalance'>>
- <<OptionAbbreviateHormoneBalance>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateGenitalia>>
- Should be placed in a <span> with id = "OptionAbbreviateGenitalia"
-%/
-<<widget "OptionAbbreviateGenitalia">>
-Genitalia are
-<<if $abbreviateGenitalia == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateGenitalia == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateGenitalia != 0>>
- //<<link "Hide">>
- <<set $abbreviateGenitalia = 0>>
- <<replace '#OptionAbbreviateGenitalia'>>
- <<OptionAbbreviateGenitalia>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateGenitalia != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateGenitalia = 1>>
- <<replace '#OptionAbbreviateGenitalia'>>
- <<OptionAbbreviateGenitalia>>
- <</replace>>
- <</link>>//
- <<if $abbreviateGenitalia != 2>>|<</if>>
-<</if>>
-<<if $abbreviateGenitalia != 2>>
- //<<link "Summarize">>
- <<set $abbreviateGenitalia = 2>>
- <<replace '#OptionAbbreviateGenitalia'>>
- <<OptionAbbreviateGenitalia>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviatePhysicals>>
- Should be placed in a <span> with id = "OptionAbbreviatePhysicals"
-%/
-<<widget "OptionAbbreviatePhysicals">>
-Physical traits are
-<<if $abbreviatePhysicals == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviatePhysicals == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviatePhysicals != 0>>
- //<<link "Hide">>
- <<set $abbreviatePhysicals = 0>>
- <<replace '#OptionAbbreviatePhysicals'>>
- <<OptionAbbreviatePhysicals>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviatePhysicals != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviatePhysicals = 1>>
- <<replace '#OptionAbbreviatePhysicals'>>
- <<OptionAbbreviatePhysicals>>
- <</replace>>
- <</link>>//
- <<if $abbreviatePhysicals != 2>>|<</if>>
-<</if>>
-<<if $abbreviatePhysicals != 2>>
- //<<link "Summarize">>
- <<set $abbreviatePhysicals = 2>>
- <<replace '#OptionAbbreviatePhysicals'>>
- <<OptionAbbreviatePhysicals>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateSkills>>
- Should be placed in a <span> with id = "OptionAbbreviateSkills"
-%/
-<<widget "OptionAbbreviateSkills">>
-Skills are
-<<if $abbreviateSkills == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateSkills == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateSkills != 0>>
- //<<link "Hide">>
- <<set $abbreviateSkills = 0>>
- <<replace '#OptionAbbreviateSkills'>>
- <<OptionAbbreviateSkills>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateSkills != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateSkills = 1>>
- <<replace '#OptionAbbreviateSkills'>>
- <<OptionAbbreviateSkills>>
- <</replace>>
- <</link>>//
- <<if $abbreviateSkills != 2>>|<</if>>
-<</if>>
-<<if $abbreviateSkills != 2>>
- //<<link "Summarize">>
- <<set $abbreviateSkills = 2>>
- <<replace '#OptionAbbreviateSkills'>>
- <<OptionAbbreviateSkills>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateMental>>
- Should be placed in a <span> with id = "OptionAbbreviateMental"
-%/
-<<widget "OptionAbbreviateMental">>
-Mental attributes are
-<<if $abbreviateMental == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateMental == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateMental != 0>>
- //<<link "Hide">>
- <<set $abbreviateMental = 0>>
- <<replace '#OptionAbbreviateMental'>>
- <<OptionAbbreviateMental>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateMental != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateMental = 1>>
- <<replace '#OptionAbbreviateMental'>>
- <<OptionAbbreviateMental>>
- <</replace>>
- <</link>>//
- <<if $abbreviateMental != 2>>|<</if>>
-<</if>>
-<<if $abbreviateMental != 2>>
- //<<link "Summarize">>
- <<set $abbreviateMental = 2>>
- <<replace '#OptionAbbreviateMental'>>
- <<OptionAbbreviateMental>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateNationality>>
- Should be placed in a <span> with id = "OptionAbbreviateNationality"
-%/
-<<widget "OptionAbbreviateNationality">>
-Nationality is
-<<if $abbreviateNationality == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateNationality == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateNationality != 0>>
- //<<link "Hide">>
- <<set $abbreviateNationality = 0>>
- <<replace '#OptionAbbreviateNationality'>>
- <<OptionAbbreviateNationality>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateNationality != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateNationality = 1>>
- <<replace '#OptionAbbreviateNationality'>>
- <<OptionAbbreviateNationality>>
- <</replace>>
- <</link>>//
- <<if $abbreviateNationality != 2>>|<</if>>
-<</if>>
-<<if $abbreviateNationality != 2>>
- //<<link "Summarize">>
- <<set $abbreviateNationality = 2>>
- <<replace '#OptionAbbreviateNationality'>>
- <<OptionAbbreviateNationality>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateRace>>
- Should be placed in a <span> with id = "OptionAbbreviateRace"
-%/
-<<widget "OptionAbbreviateRace">>
-Race is
-<<if $abbreviateRace == 2>>
- @@.cyan;SUMMARIZED.@@
-<<elseif $abbreviateRace == 1>>
- @@.yellow;ABBREVIATED.@@
-<<else>>
- @@.red;HIDDEN.@@
-<</if>>
-
-<<if $abbreviateRace != 0>>
- //<<link "Hide">>
- <<set $abbreviateRace = 0>>
- <<replace '#OptionAbbreviateRace'>>
- <<OptionAbbreviateRace>>
- <</replace>>
- <</link>>// |
-<</if>>
-<<if $abbreviateRace != 1>>
- //<<link "Abbreviate">>
- <<set $abbreviateRace = 1>>
- <<replace '#OptionAbbreviateRace'>>
- <<OptionAbbreviateRace>>
- <</replace>>
- <</link>>//
- <<if $abbreviateRace != 2>>|<</if>>
-<</if>>
-<<if $abbreviateRace != 2>>
- //<<link "Summarize">>
- <<set $abbreviateRace = 2>>
- <<replace '#OptionAbbreviateRace'>>
- <<OptionAbbreviateRace>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateClothes>>
- Should be placed in a <span> with id = "OptionAbbreviateClothes"
-%/
-<<widget "OptionAbbreviateClothes">>
-Clothes are
-<<if $abbreviateClothes == 2>>
- @@.cyan;SUMMARIZED.@@
- //<<link "Hide">>
- <<set $abbreviateClothes = 0>>
- <<replace '#OptionAbbreviateClothes'>>
- <<OptionAbbreviateClothes>>
- <</replace>>
- <</link>>//
-<<else>>
- @@.red;HIDDEN.@@
- //<<link "Summarize">>
- <<set $abbreviateClothes = 2>>
- <<replace '#OptionAbbreviateClothes'>>
- <<OptionAbbreviateClothes>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateOrigins>>
- Should be placed in a <span> with id = "OptionAbbreviateOrigins"
-%/
-<<widget "OptionAbbreviateOrigins">>
-Origins are
-<<if $abbreviateOrigins == 2>>
- @@.cyan;SUMMARIZED.@@
- //<<link "Hide">>
- <<set $abbreviateOrigins = 0>>
- <<replace '#OptionAbbreviateOrigins'>>
- <<OptionAbbreviateOrigins>>
- <</replace>>
- <</link>>//
-<<else>>
- @@.red;HIDDEN.@@
- //<<link "Summarize">>
- <<set $abbreviateOrigins = 2>>
- <<replace '#OptionAbbreviateOrigins'>>
- <<OptionAbbreviateOrigins>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateRulesets>>
- Should be placed in a <span> with id = "OptionAbbreviateRulesets"
-%/
-<<widget "OptionAbbreviateRulesets">>
-Rules Assistant rulesets are
-<<if $abbreviateRulesets == 2>>
- @@.cyan;SUMMARIZED.@@
- //<<link "Hide">>
- <<set $abbreviateRulesets = 0>>
- <<replace '#OptionAbbreviateRulesets'>>
- <<OptionAbbreviateRulesets>>
- <</replace>>
- <</link>>//
-<<else>>
- @@.red;HIDDEN.@@
- //<<link "Summarize">>
- <<set $abbreviateRulesets = 2>>
- <<replace '#OptionAbbreviateRulesets'>>
- <<OptionAbbreviateRulesets>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateSidebar>>
- Should be placed in a <span> with id = "OptionAbbreviateSidebar"
-%/
-<<widget "OptionAbbreviateSidebar">>
-Facilities in the sidebar are
-<<if $abbreviateSidebar == 2>>
- @@.cyan;SUMMARIZED.@@
- //<<link "Abbreviate">>
- <<set $abbreviateSidebar = 1>>
- <<replace '#OptionAbbreviateSidebar'>>
- <<OptionAbbreviateSidebar>>
- <</replace>>
- <</link>>//
-<<else>>
- @@.yellow;ABBREVIATED.@@
- //<<link "Summarize">>
- <<set $abbreviateSidebar = 2>>
- <<replace '#OptionAbbreviateSidebar'>>
- <<OptionAbbreviateSidebar>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>
-
-/%
- Call as <<OptionAbbreviateMissing>>
- Should be placed in a <span> with id = "OptionAbbreviateMissing"
-%/
-<<widget "OptionAbbreviateMissing">>
-Missing slave parents are
-<<if $showMissingSlavesSD>>
- @@.cyan;SHOWN.@@
- //<<link "Hide">>
- <<set $showMissingSlavesSD = false>>
- <<replace '#OptionAbbreviateMissing'>>
- <<OptionAbbreviateMissing>>
- <</replace>>
- <</link>>//
-<<else>>
- @@.red;HIDDEN.@@
- //<<link "Show">>
- <<set $showMissingSlavesSD = true>>
- <<replace '#OptionAbbreviateMissing'>>
- <<OptionAbbreviateMissing>>
- <</replace>>
- <</link>>//
-<</if>>
-<</widget>>