diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 945bffbdf8e323f8e0ccf89abc752ec5b28ff2bf..a305ab7a9be2e20cb5476d8450a5986ff7e51fa8 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -762,7 +762,7 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100, text = `\n`)
text += `\nThe garage has an additional machine room installed, but this one has a special purpose; it is a private research facility for the creation, improvement, and installation of newer, better, and more portable incubators. These incubators are cutting edge by global standards, pioneering the complex science of growing existing babies to become bigger, stronger, smarter, more beautiful, and of course, more fertile. All of this special machinery has a purpose, of course; the next generation of skilled mechanics and crewmen is fast approaching.\n`;
}
if (textDisplay === 65 && V.SF.FS[FS_OPTIONS[i]].lv >= textDisplay) {
- text += `\nEvery main battle tank you have features a much broader and taller turret than before, and even more strangely, each turret is egg-shaped. This peculiar shape accommodates an extreme functionality; the multi-pregnancy cockpit - in which tankers not only control their vehicles, but also conceive, deliver, and incubate their own babies. The latest in compact conventional incubators line the interior walls of the turret, and through these, your tanker crews are known to make and sustain all of their newest children throughout their careers in your armour units. It is well known that your tank crews rarely spend much time away from their vehicles for this very reason, and their offspring often choose to become tankers themselves.\n`;
+ text += `\nEvery main battle tank you have features a much broader and taller turret than before, and even more strangely, each turret is egg-shaped. This peculiar shape accommodates an extreme functionality; the multi-pregnancy cockpit - in which tankers not only control their vehicles, but also conceive, deliver, and incubate their own babies. The latest in compact conventional incubators line the interior walls of the turret, and through these, your tanker crews are known to make and sustain all of their newest children throughout their careers in your armor units. It is well known that your tank crews rarely spend much time away from their vehicles for this very reason, and their offspring often choose to become tankers themselves.\n`;
}
if (textDisplay === 70 && V.SF.FS[FS_OPTIONS[i]].lv >= textDisplay) {
text += `\nThe hangar is a cavernous place, and when takeoffs and landings are not in progress there are many open spaces for gangs of playing children to run around and play, as well as lots of places to simply stow baby carriages out of the way of important airman crews. At any given time, these open spaces are in heavy use by the unattended children of the airmen and airwomen who are busy at work here. The longest wall of the hangar is also host to a massive and beautiful mural altogether depicting all of the newborn children fathered or mothered by the Firebase's pilots and airmen thus far. While artful, this mural also holds the promise that through this multitude of progeny, the hangar will always have a rich supply of dedicated pilots and service personnel for the foreseeable future.\n`;
@@ -2816,7 +2816,7 @@ App.SF.UpgradeCost = function(cost, unit) {
S = V.SF.Squad;
let value = 0;
value = cost * T.Env * (1.15 + (V.SF.Size / 10)) * (1.15 + (unit / 100));
- if ([S.Sub, S.AircraftCarrier, S.MissileSilo, S.GiantRobot, S.Satellite.lv, S.GunS, S.SpacePlane, S.Drones].includes(unit)) {
+ if ([S.AircraftCarrier, S.Drones, S.GiantRobot, S.GunS, S.MissileSilo, S.Satellite.lv, S.SpacePlane, S.Sub].includes(unit)) {
value *= V.HackingSkillMultiplier;
}
return Math.ceil(value);
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index f9e5cce1b2e25ab1a0d0f957c35c7eb64ce914da..654c65441a035be3c8bdca6d05cd61ae1a8e34d4 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -60,7 +60,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (eventSlave.skill.entertainment >= 60 || ["a dancer", "a house DJ", "a party girl", "an aspiring pop star", "an exotic dancer"].includes(eventSlave.career)) {
+ if (eventSlave.skill.entertainment >= 60 || ["a ballerina", "a camgirl", "a camwhore", "a cheerleader", "a classical dancer", "a dancer", "a house DJ", "a party girl", "an aspiring pop star", "an exotic dancer", "an idol"].includes(eventSlave.career)) {
if (canHear(eventSlave)) {
if (eventSlave.health > 40) {
if (eventSlave.devotion > 50) {
@@ -1840,7 +1840,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
State.variables.RESSevent.push("mindbroken morning");
}
if (eventSlave.kindness !== undefined && eventSlave.kindness >= 100) {
- if ((isSlaveAvailable(eventSlave) && canWalk(eventSlave)) || (["please you", "serve in the master suite", "be your Concubine"].includes(eventSlave.assignment))) {
+ if ((isSlaveAvailable(eventSlave) && canWalk(eventSlave)) || (["be your Concubine", "please you", "serve in the master suite"].includes(eventSlave.assignment))) {
if (eventSlave.relationship === -3) {
if (jsRandom(1, 200) < eventSlave.kindness) {
State.variables.RESSevent.push("surprising wakeup");
@@ -2661,7 +2661,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
}
}
- if (["large plug", "long, large plug", "huge plug", "long, huge plug"].includes(eventSlave.buttplug)) {
+ if (["huge plug", "large plug", "long, huge plug", "long, large plug"].includes(eventSlave.buttplug)) {
if (eventSlave.assignment !== "stay confined" && isSlaveAvailable(eventSlave)) {
if (eventSlave.devotion <= 20) {
if (eventSlave.trust >= -50) {
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 30aa181eee457bdc04e8d9421a93a0258985279b..748964e35e40b7dfdb3bf3b81a5c8b8f3bb23e2e 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -411,7 +411,7 @@ window.generateGenetics = (function() {
break;
case "milky white":
case "implant":
- hEyeColor = jsEither(["blue", "green", "brown", "hazel", "light blue", "light green", "dark green", "dark blue"]);
+ hEyeColor = jsEither(["blue", "brown", "dark blue", "dark green", "green", "hazel", "light blue", "light green"]);
break;
}
return jsEither(eyeColorArray);
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 4c109dfbe18d2b915ffee4bbd799664d1abb7483..ab820f12a2672c90598ac8e97161c4f659063382 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -111,7 +111,7 @@ window.Height = (function() {
"American.latina": 158.9,
"American.white": 165,
"American": 163.54,
- "Andorran": 162.90,
+ "Andorran": 162.9,
"Angolan": 157.31,
"Antiguan": 160.65,
"Argentinian": 159.18,
@@ -134,9 +134,9 @@ window.Height = (function() {
"Bolivian": 153.89,
"Bosnian": 165.85,
"Brazilian": 160.86,
- "British": 164.40,
+ "British": 164.4,
"Bruneian": 153.98,
- "Bulgarian": 164.80,
+ "Bulgarian": 164.8,
"Burkinabé": 160.19,
"Burmese": 154.37,
"Burundian": 154.02,
@@ -173,8 +173,8 @@ window.Height = (function() {
"Estonian": 168.67,
"Ethiopian": 155.71,
"Fijian": 161.69,
- "Filipina": 149.60,
- "Finnish": 165.90,
+ "Filipina": 149.6,
+ "Finnish": 165.9,
"French Guianan": 157,
"French Polynesian": 164.52,
"French": 164.88,
@@ -188,19 +188,19 @@ window.Height = (function() {
"Grenadian": 164.51,
"Guamanian": 153.7,
"Guatemalan": 149.39,
- "Guinean": 157.80,
+ "Guinean": 157.8,
"Guyanese": 157.92,
"Haitian": 158.72,
"Honduran": 153.84,
"Hungarian": 163.66,
- "I-Kiribati": 157.00,
+ "I-Kiribati": 157,
"Icelandic": 165.95,
"Indian": 152.59,
- "Indonesian": 152.80,
+ "Indonesian": 152.8,
"Iranian": 159.67,
"Iraqi": 158.67,
"Irish": 165.11,
- "Israeli": 161.80,
+ "Israeli": 161.8,
"Italian": 164.61,
"Ivorian": 158.07,
"Jamaican": 163.12,
@@ -208,14 +208,14 @@ window.Height = (function() {
"Jordanian": 158.83,
"Kazakh": 158.58,
"Kenyan": 158.16,
- "Kittitian": 159.20,
+ "Kittitian": 159.2,
"Korean": 160.65,
"Kosovan": 165.7,
"Kurdish": 165,
"Kuwaiti": 159.43,
"Kyrgyz": 159.35,
"Laotian": 151.28,
- "Latvian": 169.80,
+ "Latvian": 169.8,
"Lebanese": 162.43,
"Liberian": 157.3,
"Libyan": 162.08,
@@ -224,8 +224,8 @@ window.Height = (function() {
"Luxembourgian": 164.43,
"Macedonian": 159.75,
"Malagasy": 151.18,
- "Malawian": 154.40,
- "Malaysian": 156.30,
+ "Malawian": 154.4,
+ "Malaysian": 156.3,
"Maldivian": 155.02,
"Malian": 160.47,
"Maltese": 160.85,
@@ -245,13 +245,13 @@ window.Height = (function() {
"Namibian": 158.78,
"Nauruan": 153.98,
"Nepalese": 150.86,
- "New Caledonian": 158.0,
+ "New Caledonian": 158,
"a New Zealander": 164.94,
"Ni-Vanuatu": 158.17,
"Nicaraguan": 154.39,
"Nigerian": 156.32,
"Nigerien": 158.25,
- "Niuean": 164.80,
+ "Niuean": 164.8,
"Norwegian": 165.56,
"Omani": 157.19,
"Pakistani": 153.84,
@@ -263,7 +263,7 @@ window.Height = (function() {
"Peruvian": 152.93,
"Polish": 164.59,
"Portuguese": 163.04,
- "Puerto Rican": 159.20,
+ "Puerto Rican": 159.2,
"Qatari": 159.38,
"Romanian": 162.73,
"Russian": 165.27,
@@ -279,20 +279,20 @@ window.Height = (function() {
"Senegalese": 162.52,
"Serbian": 167.69,
"Seychellois": 162.08,
- "Sierra Leonean": 156.60,
+ "Sierra Leonean": 156.6,
"Singaporean": 160.32,
"Slovak": 167.47,
"Slovene": 166.05,
"a Solomon Islander": 154.42,
"Somali": 156.06,
"South African": 158.03,
- "South Sudanese": 169.0,
- "Spanish": 163.40,
+ "South Sudanese": 169,
+ "Spanish": 163.4,
"Sri Lankan": 154.56,
"Sudanese": 156.04,
"Surinamese": 160.66,
"Swazi": 158.64,
- "Swedish": 165.70,
+ "Swedish": 165.7,
"Swiss": 163.45,
"Syrian": 158.65,
"Taiwanese": 161.45,
@@ -300,13 +300,13 @@ window.Height = (function() {
"Tanzanian": 156.6,
"Thai": 157.87,
"Tibetan": 158.75,
- "Togolese": 158.30,
+ "Togolese": 158.3,
"Tongan": 165.52,
"Trinidadian": 160.64,
"Tunisian": 160.35,
- "Turkish": 160.50,
+ "Turkish": 160.5,
"Turkmen": 161.73,
- "Tuvaluan": 158.10,
+ "Tuvaluan": 158.1,
"Ugandan": 156.72,
"Ukrainian": 166.34,
"Uruguayan": 162.13,
@@ -314,7 +314,7 @@ window.Height = (function() {
"Vatican": 162.5,
"Venezuelan": 157.44,
"Vietnamese": 153.59,
- "Vincentian": 160.70,
+ "Vincentian": 160.7,
"Yemeni": 153.97,
"Zairian": 155.25,
"Zambian": 155.82,
@@ -334,9 +334,9 @@ window.Height = (function() {
"Angolan": 167.31,
"Antiguan": 164.8,
"Argentinian": 174.62,
- "Armenian": 172.00,
+ "Armenian": 172,
"Aruban": 165.1,
- "Australian": 179.20,
+ "Australian": 179.2,
"Austrian": 177.41,
"Azerbaijani": 169.75,
"Bahamian": 172.75,
@@ -344,12 +344,12 @@ window.Height = (function() {
"Bangladeshi": 163.81,
"Barbadian": 175.92,
"Belarusian": 178.44,
- "Belgian": 181.70,
+ "Belgian": 181.7,
"Belizean": 168.73,
"Beninese": 167.06,
"Bermudian": 172.69,
"Bhutanese": 165.31,
- "Bissau-Guinean": 167.90,
+ "Bissau-Guinean": 167.9,
"Bolivian": 166.85,
"Bosnian": 180.87,
"Brazilian": 173.55,
@@ -368,16 +368,16 @@ window.Height = (function() {
"Chadian": 170.44,
"Chilean": 171.81,
"Chinese": 171.83,
- "Colombian": 169.50,
+ "Colombian": 169.5,
"Comorian": 166.19,
"Congolese": 167.45,
"a Cook Islander": 174.77,
"Costa Rican": 168.93,
"Croatian": 180.78,
- "Cuban": 172.00,
+ "Cuban": 172,
"Curaçaoan": 165.1,
"Cypriot": 174.99,
- "Czech": 180.10,
+ "Czech": 180.1,
"Danish": 181.39,
"Djiboutian": 166.57,
"Dominican": 172.75,
@@ -391,14 +391,14 @@ window.Height = (function() {
"Eritrean": 168.36,
"Estonian": 181.59,
"Ethiopian": 166.23,
- "Fijian": 173.90,
+ "Fijian": 173.9,
"Filipina": 163.23,
"Finnish": 179.59,
"French Guianan": 168,
"French Polynesian": 177.41,
"French": 179.74,
"Gabonese": 167.94,
- "Gambian": 165.40,
+ "Gambian": 165.4,
"Georgian": 174.34,
"German": 179.88,
"Ghanan": 168.85,
@@ -412,7 +412,7 @@ window.Height = (function() {
"Haitian": 172.64,
"Honduran": 166.39,
"Hungarian": 177.26,
- "I-Kiribati": 169.20,
+ "I-Kiribati": 169.2,
"Icelandic": 180.49,
"Indian": 164.95,
"Indonesian": 163.55,
@@ -450,21 +450,21 @@ window.Height = (function() {
"Maltese": 173.32,
"Marshallese": 162.81,
"Mauritanian": 163.28,
- "Mauritian": 170.50,
+ "Mauritian": 170.5,
"Mexican": 169.01,
"Micronesian": 168.51,
"Moldovan": 175.49,
"Monégasque": 177.77,
"Mongolian": 169.07,
"Montenegrin": 178.28,
- "Moroccan": 170.40,
+ "Moroccan": 170.4,
"Mosotho": 165.59,
"Motswana": 171.63,
- "Mozambican": 164.80,
+ "Mozambican": 164.8,
"Namibian": 166.96,
"Nauruan": 167.83,
"Nepalese": 162.32,
- "New Caledonian": 171.0,
+ "New Caledonian": 171,
"a New Zealander": 177.74,
"Ni-Vanuatu": 168.09,
"Nicaraguan": 166.71,
@@ -487,7 +487,7 @@ window.Height = (function() {
"Romanian": 174.74,
"Russian": 176.46,
"Rwandan": 162.68,
- "Sahrawi": 170.40,
+ "Sahrawi": 170.4,
"Saint Lucian": 171.95,
"Salvadoran": 169.77,
"Sammarinese": 177.77,
@@ -500,10 +500,10 @@ window.Height = (function() {
"Seychellois": 174.21,
"Sierra Leonean": 164.41,
"Singaporean": 172.57,
- "Slovak": 179.50,
- "Slovene": 179.80,
+ "Slovak": 179.5,
+ "Slovene": 179.8,
"a Solomon Islander": 164.14,
- "Somali": 166.60,
+ "Somali": 166.6,
"South African": 166.68,
"South Sudanese": 175.9,
"Spanish": 176.59,
@@ -516,7 +516,7 @@ window.Height = (function() {
"Syrian": 170.43,
"Taiwanese": 174.52,
"Tajik": 171.26,
- "Tanzanian": 164.80,
+ "Tanzanian": 164.8,
"Thai": 169.16,
"Tibetan": 168.91,
"Togolese": 168.33,
@@ -535,7 +535,7 @@ window.Height = (function() {
"Vietnamese": 164.45,
"Vincentian": 172.78,
"Yemeni": 159.89,
- "Zairian": 166.80,
+ "Zairian": 166.8,
"Zambian": 166.52,
"Zimbabwean": 168.59,
"": 171.42, // defaults
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 778cb00fe4a12f61b7bac17c25faf07d6d530ea9..ff77c90cadffd1cf2a6d3860b1cf161eae72ea95 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -696,11 +696,11 @@ The previous owner seems to have left in something of a hurry.
<<set $averageTrust += $slaves[$i].trust, $averageDevotion += $slaves[$i].devotion, _slavesContributing += 1>>
<<else>>
<<if $slaves[$i].assignment != "be confined in the cellblock">>
- <<if $slaves[$i].assignment != "be confined in the arcade">>
- <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
- <<set $averageTrust += $slaves[$i].trust*0.5, $averageDevotion += $slaves[$i].devotion*0.5, _slavesContributing += 0.5>>
- <</if>>
- <</if>>
+ <<if $slaves[$i].assignment != "be confined in the arcade">>
+ <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
+ <<set $averageTrust += $slaves[$i].trust*0.5, $averageDevotion += $slaves[$i].devotion*0.5, _slavesContributing += 0.5>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<</for>>
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index 8d50a912ddd73296498268600aa5d379a6016afd..bd6ab19c09700e40a6d8a549600c7c123e6f0558 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -164,8 +164,8 @@
<<case "a kimono">>
Getting out of $his kimono in that amount of time is flagrantly impossible, but $he tries anyway.
<<case "a klan robe">>
- Because $he's nude under $his robes, $he simply lifts it over $his head.
- <<case "a hijab and abaya" "a niqab and abaya" "a klan robe">>
+ Because $he's nude under $his robes, $he simply lifts them over $his head.
+ <<case "a hijab and abaya" "a niqab and abaya">>
Because $he's nude under $his abaya, $he simply lifts it over $his head.
<<case "a burqa">>
Because $he's nude under $his burqa, $he simply lifts it over $his head.
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 5788a8742a62e53a9dcb9e2d9500cf42ec93f71a..f5b259e1c01d2fb7136a6cf1a4d62e80790510e7 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -405,17 +405,17 @@ My favorite part of my body i<<s>>
<<if $activeSlave.need>>
<<if $activeSlave.amp != 1>>
- <<if _lisping == 0>>
- <<set _Amp = "touch myself,">>
- <<else>>
- <<set _Amp = "touch mythelf,">>
- <</if>>
- <<else>>
- <<if _lisping == 0>>
- <<set _Amp = "rub myself against stuff,">>
+ <<if _lisping == 0>>
+ <<set _Amp = "touch myself,">>
+ <<else>>
+ <<set _Amp = "touch mythelf,">>
+ <</if>>
<<else>>
- <<set _Amp = "rub mythelf againtht thtuff,">>
- <</if>>
+ <<if _lisping == 0>>
+ <<set _Amp = "rub myself against stuff,">>
+ <<else>>
+ <<set _Amp = "rub mythelf againtht thtuff,">>
+ <</if>>
<</if>>
<<if ($activeSlave.releaseRules == "permissive") || ($activeSlave.releaseRules == "masturbation")>>
Thank you for letting me
@@ -515,9 +515,9 @@ My favorite part of my body i<<s>>
I'm <<s>>o horny, <<Master>>. I can't <<s>>top <<s>>taring at <<if $PC.dick == 1>>cock<<s>> and imagining them down my throat, cumming and cumming<<else>>pu<<ss>>ie<<s>> and imagining how their jui<<c>>e<<s>> ta<<s>>te<</if>>.
<<case "buttslut">>
I'm <<s>>o horny, <<Master>>.
- <<if (["plug", "long plug"].includes($activeSlave.buttplug) && $activeSlave.anus > 2) >>
+ <<if (["long plug", "plug"].includes($activeSlave.buttplug) && $activeSlave.anus > 2) >>
I wear the buttplug you gave me, but it i<<s>> <<s>>o <<s>>mall... It remind<<s>> me of being fucked in the a<<ss>>, but I can barely feel it. It drive<<s>> me crazy.
- <<elseif (["plug", "long plug"].includes($activeSlave.buttplug) && $activeSlave.anus < 3) || (["large plug", "long, large plug"].includes($activeSlave.buttplug) && $activeSlave.anus == 3) || (["huge plug", "long, huge plug"].includes($activeSlave.buttplug) && $activeSlave.anus >= 4) >>
+ <<elseif (["long plug", "plug"].includes($activeSlave.buttplug) && $activeSlave.anus < 3) || (["large plug", "long, large plug"].includes($activeSlave.buttplug) && $activeSlave.anus == 3) || (["huge plug", "long, huge plug"].includes($activeSlave.buttplug) && $activeSlave.anus >= 4) >>
Thank you for the buttplug. It i<<s>> really fun to have my a<<ss>> filled all day long.
<<elseif (["large plug", "long, large plug"].includes($activeSlave.buttplug) && $activeSlave.anus < 3) || (["huge plug", "long, huge plug"].includes($activeSlave.buttplug) && $activeSlave.anus < 4) >>
I like it up the a<<ss>>, but the plug you make me wear i<<s>> too big. It really hurt<<s>>. Not in the good way.
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index a570465c95d94515d51136d6bdcc667ae8f815c3..d6f11282e6964c72044aad269d54a72c57c27c86 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -18,12 +18,12 @@
<<set $partner = randomAvailableSister($activeSlave)>>
<<set $partner = $slaveIndices[$partner.ID]>>
<<switch areSisters($activeSlave, $slaves[$partner])>>
- <<case 3>>
- <<set _activeSlaveRel = "half-sister", _partnerRel = "half-sister">>
- <<case 2>>
- <<set _activeSlaveRel = "sister", _partnerRel = "sister">>
- <<case 1>>
- <<set _activeSlaveRel = "twin", _partnerRel = "twin">>
+ <<case 3>>
+ <<set _activeSlaveRel = "half-sister", _partnerRel = "half-sister">>
+ <<case 2>>
+ <<set _activeSlaveRel = "sister", _partnerRel = "sister">>
+ <<case 1>>
+ <<set _activeSlaveRel = "twin", _partnerRel = "twin">>
<</switch>>
<<elseif ($partner == "relation")>>
<<set $partner = $slaveIndices[$activeSlave.relationTarget]>>
diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw
index 10d5e08d49a1497c82833cdac2527bc82d627ff6..144f54b472a1ce6be94e0580c587aed5f2e61fd4 100644
--- a/src/pregmod/saClothes.tw
+++ b/src/pregmod/saClothes.tw
@@ -836,7 +836,7 @@
<<if ($slaves[$i].buttplug != "none")>>
<<if ($slaves[$i].buttplug == "plug") || ($slaves[$i].buttplug == "long plug")>>
- <<if ["tail", "cat tail", "fox tail", "cow tail"].includes($slaves[$i].buttplugAttachment)>>
+ <<if ["cat tail", "cow tail", "fox tail", "tail"].includes($slaves[$i].buttplugAttachment)>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
<<if $slaves[$i].anus < 1>>
Constantly wearing a tail plug in $his virgin butthole @@.lime;stretches it out@@ and @@.gold;is a constant degrading reminder of $his submission.@@
@@ -874,7 +874,7 @@
<</if>>
<</if>>
<<elseif ($slaves[$i].buttplug == "large plug") || ($slaves[$i].buttplug == "long, large plug")>>
- <<if ["tail", "cat tail", "fox tail", "cow tail"].includes($slaves[$i].buttplugAttachment)>>
+ <<if ["cat tail", "cow tail", "fox tail", "tail"].includes($slaves[$i].buttplugAttachment)>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
<<if ($slaves[$i].anus < 2)>>
The uncomfortable tailed plug in $his asshole
@@ -940,7 +940,7 @@
<</if>>
<</if>>
<<elseif ($slaves[$i].buttplug == "huge plug") || ($slaves[$i].buttplug == "long, huge plug")>>
- <<if ["tail", "cat tail", "fox tail", "cow tail"].includes($slaves[$i].buttplugAttachment)>>
+ <<if ["cat tail", "cow tail", "fox tail", "tail"].includes($slaves[$i].buttplugAttachment)>>
<<if ($slaves[$i].anus < 4)>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
<<if ($slaves[$i].sexualQuirk == "size queen")>>
@@ -995,7 +995,7 @@
<</if>>
<</if>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
- <<if ["tail", "cat tail", "fox tail", "cow tail"].includes($slaves[$i].buttplugAttachment)>>
+ <<if ["cat tail", "cow tail", "fox tail", "tail"].includes($slaves[$i].buttplugAttachment)>>
<<if ($slaves[$i].fetish == "humiliation") && ($slaves[$i].fetishKnown == 0)>>
$He shows a surprising lack of resistance to the routine of having a tail inserted in $his ass each morning; $he seems to @@.lightcoral;naturally enjoy the humiliation.@@
<<set $slaves[$i].fetishKnown = 1>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 39625a92c0fe25f93dbec326eeb7ec4b6033bef4..dada3506520e73eeb8d8a0dc2ffaee3f577839a9 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -98,7 +98,7 @@
<<set _meanGirl.attrXY = random(60,90)>>
<<set _meanGirl.attrXX = random(10,20)>>
<<set _meanGirl.behavioralFlaw = either("arrogant", "bitchy")>>
- <<set _meanGirl.clothes = either("conservative clothing", "a mini dress", "sport shorts and a t-shirt", "a t-shirt and jeans")>>
+ <<set _meanGirl.clothes = either("a mini dress", "a t-shirt and jeans", "conservative clothing", "sport shorts and a t-shirt")>>
<<set _newSlaves.push(_meanGirl)>>
<</for>>
<span id="artFrame">
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 5d38d1389899dc1290a55e29825301f53790f274..2b5077d71187b2f4dbcb001625291f2690f3a2f1 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -1052,7 +1052,7 @@ Choose a site for branding:
Or a custom site: <<textbox "$brandTarget.local" $brandTarget.local "Body Modification">>
<br>
-<<if ["ear", "cheek", "breast", "shoulder", "upper arm", "lower arm", "wrist", "hand", "buttock", "thigh", "calf", "ankle", "foot", "testicle"].includes($brandTarget.local)>>
+<<if ["ankle", "breast", "buttock", "calf", "cheek", "ear", "foot", "hand", "lower arm", "shoulder", "testicle", "thigh", "upper arm", "wrist"].includes($brandTarget.local)>>
<<set _leftTarget = ("left " + $brandTarget.local)>>
<<set _rightTarget = ("right " + $brandTarget.local)>>
<<if $activeSlave.brand[_leftTarget]>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index d7c6bd92fb5e22b24b1705644edea5a4e4d71e3b..6a380abd27ca0e3d6da82e647be393b5712b538d 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -34,7 +34,7 @@ The firm promptly pays @@.yellowgreen;fair compensation@@ for the minor damage t
<<setLocalPronouns $slaves[_genPlot]>>
<<if _genPlot != -1>>
<<run $slaves.forEach(function(s) {
- if (["breast injections", "intensive breast injections", "hyper breast injections"].includes(s.drugs)) {
+ if (["breast injections", "hyper breast injections", "intensive breast injections"].includes(s.drugs)) {
s.health -= Math.floor(Math.random() * 2 + 1);
}
})>>
diff --git a/src/uncategorized/pCoupLoss.tw b/src/uncategorized/pCoupLoss.tw
index 768077dcd58348066d2d0d6192f6eae60dad4cf2..829a2412ef6527a9f2677ee31a83322376694d89 100644
--- a/src/uncategorized/pCoupLoss.tw
+++ b/src/uncategorized/pCoupLoss.tw
@@ -32,7 +32,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<elseif $traitor.bellyPreg >= 5000>>
the pregnant
<</if>>
- $traitor.slaveName on one of the feeds,
+ $traitor.slaveName on one of the feeds,
<<if $traitorType == "agent" || $traitorType == "trapper">>
trying to sabotage a stockpile of explosives.
<<elseif $traitorType == "horror">>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
index 57c2aaf511fb437d0d361f47b9e28e4e0a3d4958..0796bf023277958262d604b043f6e3814b0124c7 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
@@ -29,7 +29,7 @@ They arrive hand-in-hand and don't let go of each other until the end of the ens
<<set _secondSlave.relationshipTarget = $activeSlave.ID>>
-<<set _secondSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
+<<set _secondSlave.hStyle = either("ass-length", "long", "shaved bald", "short", "shoulder-length", "very short")>>
<<if (_secondSlave.actualAge <= 22)>>
<<set _secondSlave.career = setup.youngCareers.random()>>
<<elseif (_secondSlave.intelligenceImplant >= 15)>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 1dd06ee05cd078cd0faeca8ae5bf9e82112cdf90..8ecf60d36cbda4931941ed104a55dc30c4162c4c 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1490,40 +1490,40 @@ Alter $his race:
<<if $activeSlave.indentureRestrictions < 1>>
$He is $activeSlave.race<<if $activeSlave.race != $activeSlave.origRace>>, but was originally $activeSlave.origRace<</if>>. Surgically alter $him to look more:
<<if $activeSlave.race != "white">>
- [[White|Surgery Degradation][$activeSlave.race = "white",$activeSlave.skin = either("fair", "light", "pale"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "brown", "red"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[White|Surgery Degradation][$activeSlave.race = "white", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "latina">>
- [[Latina|Surgery Degradation][$activeSlave.race = "latina",$activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tan"),$activeSlave.hColor = either("black", "black", "brown", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Latina|Surgery Degradation][$activeSlave.race = "latina", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "black">>
- [[Black|Surgery Degradation][$activeSlave.race = "black",$activeSlave.skin = either("black", "brown", "dark brown"),$activeSlave.hColor = either("black", "black", "black", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Black|Surgery Degradation][$activeSlave.race = "black", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "asian">>
- [[Asian|Surgery Degradation][$activeSlave.race = "asian",$activeSlave.skin = either("dark olive", "light olive", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Asian|Surgery Degradation][$activeSlave.race = "asian", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "middle eastern">>
- [[Middle Eastern|Surgery Degradation][$activeSlave.race = "middle eastern",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Middle Eastern|Surgery Degradation][$activeSlave.race = "middle eastern", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "indo-aryan">>
- [[Indo-Aryan|Surgery Degradation][$activeSlave.race = "indo-aryan",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Indo-Aryan|Surgery Degradation][$activeSlave.race = "indo-aryan", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "pacific islander">>
- [[Pacific Islander|Surgery Degradation][$activeSlave.race = "pacific islander",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Pacific Islander|Surgery Degradation][$activeSlave.race = "pacific islander", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "malay">>
- [[Malay|Surgery Degradation][$activeSlave.race = "malay",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Malay|Surgery Degradation][$activeSlave.race = "malay", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "amerindian">>
- [[Amerindian|Surgery Degradation][$activeSlave.race = "amerindian",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Amerindian|Surgery Degradation][$activeSlave.race = "amerindian", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "southern european">>
- [[Southern European|Surgery Degradation][$activeSlave.race = "southern european",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Southern European|Surgery Degradation][$activeSlave.race = "southern european", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "semitic">>
- [[Semitic|Surgery Degradation][$activeSlave.race = "semitic",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Semitic|Surgery Degradation][$activeSlave.race = "semitic", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "mixed race">>
- [[Mixed Race|Surgery Degradation][$activeSlave.race = "mixed race",$activeSlave.skin = either("dark", "light", "pale"),$activeSlave.hColor = either("black", "black", "black", "black", "blonde", "brown", "brown", "red"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]]
+ [[Mixed Race|Surgery Degradation][$activeSlave.race = "mixed race", $activeSlave.skin = randomRaceSkin($activeSlave.race), $activeSlave.hColor = randomRaceHair($activeSlave.race), $activeSlave.eyeColor = randomRaceEye($activeSlave.race), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]]
<</if>>
<<else>>
//$His indenture forbids elective surgery//
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index d5e3103012da8947ba850bb1e583d667837d4679..4d50142be4fa6ad23c9a500e5e6a4a305d846774 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1055,10 +1055,10 @@
<<set $slaves[$i].devotion -= 3>>
<</if>>
<</if>>
- <<if ["whore", "serve the public", "work in the brothel", "serve in the club", "work a glory hole", "be confined in the arcade"].includes($slaves[$i].assignment)>>
+ <<if ["be confined in the arcade", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by how many dicks $he gets to suck at work.
<<set _para = 1>>
- <<elseif ($PC.dick == 1) && ($slaves[$i].toyHole == "mouth") && ["please you", "serve in the master suite", "be your Concubine"].includes($slaves[$i].assignment)>>
+ <<elseif ($PC.dick == 1) && ($slaves[$i].toyHole == "mouth") && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by constant oral sex with you.
<<set _para = 1>>
<<elseif $slaves[$i].inflation != 0 && $slaves[$i].inflationType == "cum">>
@@ -1096,10 +1096,10 @@
<<set $slaves[$i].devotion -= 3>>
<</if>>
<</if>>
- <<if ["whore", "serve the public", "work in the brothel", "serve in the club", "work a glory hole", "be confined in the arcade"].includes($slaves[$i].assignment)>>
+ <<if ["be confined in the arcade", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by how many dicks get shoved up $his butt at work.
<<set _para = 1>>
- <<elseif ($slaves[$i].toyHole == "ass") && ["please you", "serve in the master suite", "be your Concubine"].includes($slaves[$i].assignment)>>
+ <<elseif ($slaves[$i].toyHole == "ass") && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by constant anal sex with you.
<<set _para = 1>>
<<elseif $suppository != 0>>
@@ -1329,10 +1329,10 @@
<<set $slaves[$i].devotion -= 3>>
<</if>>
<</if>>
- <<if ["whore", "serve the public", "work in the brothel", "serve in the club", "work a glory hole", "be confined in the arcade", "work as a servant", "be the Attendant", "be the Milkmaid"].includes($slaves[$i].assignment)>>
+ <<if ["be confined in the arcade", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel", "work as a servant", "be the Attendant", "be the Milkmaid"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by how $he's expected to serve others' sexual needs at work.
<<set _para = 1>>
- <<elseif ["please you", "serve in the master suite", "be your Concubine"].includes($slaves[$i].assignment)>>
+ <<elseif ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by how $he's expected to serve your sexual needs at work.
<<set _para = 1>>
<<elseif $slaves[$i].assignment == "be a subordinate slave">>
@@ -1388,10 +1388,10 @@
<<elseif $slaves[$i].pregKnown == 1>>
$His paraphilia is satisfied by $his pregnancy.
<<set _para = 1>>
- <<elseif canGetPregnant($slaves[$i]) && ($PC.dick == 1) && ($slaves[$i].toyHole == "pussy" && $slaves[$i].mpreg != 1) && ["please you", "serve in the master suite", "be your Concubine"].includes($slaves[$i].assignment)>>
+ <<elseif canGetPregnant($slaves[$i]) && ($PC.dick == 1) && ($slaves[$i].toyHole == "pussy" && $slaves[$i].mpreg != 1) && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by constant unprotected vaginal sex with you.
<<set _para = 1>>
- <<elseif canGetPregnant($slaves[$i]) && ($PC.dick == 1) && ($slaves[$i].toyHole == "ass" && $slaves[$i].mpreg == 1) && ["please you", "serve in the master suite", "be your Concubine"].includes($slaves[$i].assignment)>>
+ <<elseif canGetPregnant($slaves[$i]) && ($PC.dick == 1) && ($slaves[$i].toyHole == "ass" && $slaves[$i].mpreg == 1) && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by constant unprotected anal sex with you.
<<set _para = 1>>
<<elseif $slaves[$i].bellyImplant >= 60000>>
@@ -1588,10 +1588,10 @@
<<if ($slaves[$i].assignment != "serve in the master suite") || ($masterSuiteUpgradeLuxury < 2)>>
<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyStimulatorsSetting == 0)>>
<<if $slaves[$i].geneMods.rapidCellGrowth != 1>>
- <<if ($slaves[$i].vagina == 3) && !["large dildo", "huge dildo", "long, large dildo", "long, huge dildo"].includes($slaves[$i].vaginalAccessory)>>
+ <<if ($slaves[$i].vagina == 3) && !["huge dildo", "large dildo", "long, huge dildo", "long, large dildo"].includes($slaves[$i].vaginalAccessory)>>
With a rest from strenuous use, @@.lime;$his loose vagina recovers a little.@@
<<set $slaves[$i].vagina -= 1>>
- <<elseif ($slaves[$i].anus == 3) && !["large plug", "huge plug", "long, large plug", "long, huge plug"].includes($slaves[$i].buttplug)>>
+ <<elseif ($slaves[$i].anus == 3) && !["huge plug", "large plug", "long, huge plug", "long, large plug"].includes($slaves[$i].buttplug)>>
With a rest from continual sodomy, @@.lime;$his gaping anus recovers a little.@@
<<set $slaves[$i].anus -= 1>>
<</if>>
@@ -4488,7 +4488,7 @@
<<set _tempSub = getSlave($slaves[$i].subTarget)>>
<<if ndef _tempSub>>@@.red;Error, subTarget not found.@@<</if>>
<</if>>
- <<if (($slaves[$i].relationship == -3) || ($slaves[$i].relationship == -2)) && canImpreg($slaves[$i], $PC) && !["masturbation", "chastity"].includes($slaves[$i].releaseRules)>>
+ <<if (($slaves[$i].relationship == -3) || ($slaves[$i].relationship == -2)) && canImpreg($slaves[$i], $PC) && !["chastity", "masturbation"].includes($slaves[$i].releaseRules)>>
<<set $slaves[$i].pregSource = -1>>
<<elseif ($slaves[$i].relationship > 2) && canImpreg($slaves[$i], _tempLover)>> /* erection not needed for impregnation via consensual sex play (FWB or better) */
<<set $slaves[$i].pregSource = _tempLover.ID>>
@@ -4497,7 +4497,7 @@
<<elseif (random(1,100) > 95) && ($slaves[$i].rivalry > 2) && canAchieveErection(_tempRival) && canImpreg($slaves[$i], _tempRival)>> /* 5% chance to be raped and knocked up by bitter rival - erection needed */
Driven by the bitter rivalry between them, _tempRival.slaveName successfully manages to overpower $slaves[$i].slaveName and rape $him, cumming deep in $his fertile <<if $slaves[$i].mpreg == 1>>asshole<<else>>pussy<</if>>. By the end of the week, $slaves[$i].slaveName is vowing revenge as $he regains confidence.
<<set $slaves[$i].pregSource = _tempRival.ID>>
- <<elseif (random(1,100) > 60) && canImpreg($slaves[$i], $PC) && !["masturbation", "chastity"].includes($slaves[$i].releaseRules)>> /* still 40% chance of impregnation by PC */
+ <<elseif (random(1,100) > 60) && canImpreg($slaves[$i], $PC) && !["chastity", "masturbation"].includes($slaves[$i].releaseRules)>> /* still 40% chance of impregnation by PC */
<<set $slaves[$i].pregSource = -1>>
<<elseif (random(1,100) > 95) && ($slaves[$i].eggType == "human") && $slaves[$i].devotion <= 20>> /* 5% chance of impregnation by random citizen - TODO: make this optional for players who want random fathers from among their own slaves only */
<<set $slaves[$i].pregSource = -2>>
@@ -5846,7 +5846,7 @@
Society @@.green;approves@@ of $slaves[$i].slaveName's collar as an expression of the old ideal of mortification of the flesh, advancing the combination of religious originalism and modern slavery.
<<= FutureSocieties.ChangePorn("ChattelReligionist", 1)>>
<</if>>
- <<if ["a burqa", "a chattel habit", "a fallen nuns habit", "a hijab and abaya", "a klan robe", "a niqab and abaya", "a penitent nuns habit", "a succubus outfit"].includes($slaves[$i].clothes)>>
+ <<if ["a burqa", "a chattel habit", "a fallen nuns habit", "a hijab and abaya", "a niqab and abaya", "a penitent nuns habit", "a succubus outfit"].includes($slaves[$i].clothes)>>
Society @@.green;approves@@ of $his religiously themed clothing, strengthening the connection between sexual servitude and faith.
<<= FutureSocieties.ChangePorn("ChattelReligionist", 1)>>
<<elseif ["a bunny outfit", "a hijab and blouse", "a huipil", "a kimono", "a military uniform", "a nice maid outfit", "a nice nurse outfit", "a slutty qipao", "a toga", "body oil", "chains", "conservative clothing", "nice business attire", "no clothing", "shibari ropes", "uncomfortable straps"].includes($slaves[$i].clothes)>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index df8275863c23da06c16fec86c5b560e9370f9043..0ba9edef52f65a2e443216d21f592f4473ce35b0 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -844,7 +844,7 @@
| <<link "Bit gag">><<set $activeSlave.collar = "bit gag">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
| <<link "Neck corset">><<set $activeSlave.collar = "neck corset">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
| <<link "Porcelain mask">><<set $activeSlave.collar = "porcelain mask">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-
+
<<if $activeSlave.missingArms != 3>>
<br>Arm accessory: ''<span id="armAccessory">$activeSlave.armAccessory</span>.''
<<link "None">><<set $activeSlave.armAccessory = "none">><<replace "#armAccessory">>$activeSlave.armAccessory<</replace>><</link>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index a607196718363904f690bcf5e885cf17dbcf6b1a..fb19526aa7f39f22cda22370f0fc56985e086280 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -799,7 +799,7 @@
<</if>> /* Closes Pass state check */
<br><br>
- <<if !["Options", "Summary Options", "Description Options"].includes(_Pass)>>
+ <<if !["Description Options", "Options", "Summary Options"].includes(_Pass)>>
<span id="optionsButton">
<<link [[Game Options|Options][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 66d61d13a645fb5acb0752f2576de4b782c2b1ba..5116f62586eec1539678f838f6e96d263e4daef2 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -95,7 +95,7 @@ Choose a default site for slaves to be branded. Current site is ''$brandTarget.p
| [[Lower Back|Universal Rules][$brandTarget.primary = "lower back"]]
<br>
-<<if ["ear", "upper arm", "lower arm", "wrist", "hand", "thigh", "calve", "ankle", "foot", "penis", "testicle"].includes($brandTarget.primary)>>
+<<if ["ankle", "calve", "ear", "foot", "hand", "lower arm", "penis", "testicle", "thigh", "upper arm", "wrist"].includes($brandTarget.primary)>>
It's possible that ''$brandTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$brandTarget.secondary'':
/* Material copied from bodyModification, but please leave commented out any sections that may not be on ALL slaves. */
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 102c4f96836e8694a1230225cf4ab92a2f9c03c8..3691494b8ea2f3f8ab7b2e12343c56f231bebcbb 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -297,7 +297,7 @@ The room containing all the clothes and accessories you have available to dress
<tr>
<td>
-<<set _model.clothes = either("battlearmor", "a military uniform", "a red army uniform", "battledress")>>
+<<set _model.clothes = either("a military uniform", "a red army uniform", "battlearmor", "battledress")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -312,7 +312,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a biyelgee costume", "a dirndl", "lederhosen", "a mounty outfit", "a hanbok")>>
+<<set _model.clothes = either("a biyelgee costume", "a dirndl", "a hanbok", "a mounty outfit", "lederhosen")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -344,7 +344,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a button-up shirt and panties", "a button-up shirt", "cutoffs", "jeans", "leather pants and a tube top", "leather pants", "an oversized t-shirt", "a sweater and cutoffs", "a sweater and panties", "a sweater", "a t-shirt and jeans", "a t-shirt and panties", "a t-shirt", "a tank-top and panties", "a tank-top", "a tube top")>>
+<<set _model.clothes = either("a button-up shirt and panties", "a button-up shirt", "a sweater and cutoffs", "a sweater and panties", "a sweater", "a t-shirt and jeans", "a t-shirt and panties", "a t-shirt", "a tank-top and panties", "a tank-top", "a tube top", "an oversized t-shirt", "cutoffs", "jeans", "leather pants and a tube top", "leather pants")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -361,7 +361,7 @@ The room containing all the clothes and accessories you have available to dress
<tr>
<td>
-<<set _model.clothes = either("a police uniform", "nice business attire", "a nice nurse outfit")>>
+<<set _model.clothes = either("a nice nurse outfit", "a police uniform", "nice business attire")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -376,7 +376,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a gothic lolita dress", "a ball gown")>>
+<<set _model.clothes = either("a ball gown", "a gothic lolita dress")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -408,7 +408,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("boyshorts", "a bra", "kitty lingerie", "panties and pasties", "a skimpy loincloth", "a thong", "pasties")>>
+<<set _model.clothes = either("a bra", "a skimpy loincloth", "a thong", "boyshorts", "kitty lingerie", "panties and pasties", "pasties")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -425,7 +425,7 @@ The room containing all the clothes and accessories you have available to dress
<tr>
<td>
-<<set _model.clothes = either("sport shorts and a sports bra", "sport shorts", "a sports bra")>>
+<<set _model.clothes = either("a sports bra", "sport shorts and a sports bra", "sport shorts")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -440,7 +440,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a one-piece swimsuit", "a monokini")>>
+<<set _model.clothes = either("a monokini", "a one-piece swimsuit")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -472,7 +472,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("a klan robe", "a slutty klan robe", "a schutzstaffel uniform", "a slutty schutzstaffel uniform")>>
+<<set _model.clothes = either("a klan robe", "a schutzstaffel uniform", "a slutty klan robe", "a slutty schutzstaffel uniform")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
@@ -504,7 +504,7 @@ The room containing all the clothes and accessories you have available to dress
</td>
<td>
-<<set _model.clothes = either("striped panties","a striped bra", "striped underwear")>>
+<<set _model.clothes = either("a striped bra", "striped panties", "striped underwear")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
<<SlaveArt _model 1 0>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 04488ce8388bb3c27ca9250fc17f404ec20c0dc1..28e873985db1729472ce5401c29a26862705a6fd 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1214,7 +1214,7 @@ $He's got a
<<if $arcologies[0].FSSlimnessEnthusiast > 20 && $arcologies[0].FSHedonisticDecadence == "unset">>
<<print either("fashionable", "sleek and attractive", "small and enticing")>>
<<else>>
- <<print either("small, sleek", "small but rounded", "rounded, small")>>
+ <<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.
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 1b79e95acccf11dd923f934f677b69b4482f4f64..95bac5eff512b37100473a24bc2ccc835dee4527 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -587,7 +587,7 @@ $activeSlave.slaveName is
<<footwearDescription>>
<</if>>
-<<case "a hijab and abaya" "a niqab and abaya" "a klan robe">>
+<<case "a hijab and abaya" "a niqab and abaya">>
which modestly covers $his entire
<<if ($activeSlave.amp == 1)>>
body.
@@ -1082,8 +1082,10 @@ $His
cascades gorgeously down $his bare back.
<<case "a kimono" "a long qipao">>
cascades elegantly down $his back, kept sensibly in place by a set of ivory hairpins.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is not visible under $his hood.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1144,8 +1146,10 @@ $His
flows fashionably down $his bare back.
<<case "a kimono" "a long qipao">>
flows elegantly down $his back, kept sensibly in place by a set of ivory hairpins.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is not visible under $his hood.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1206,8 +1210,10 @@ $His
follows the latest fashion.
<<case "a kimono" "a long qipao">>
is kept sensibly in place by a set of ivory hairpins.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is not visible under $his hood.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1266,8 +1272,10 @@ $His
is gelled into a fashionable wave.
<<case "a ball gown">>
is gelled into a fashionable wave.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is not visible under $his hood.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1328,8 +1336,10 @@ $His
is piled up on $his head in a huge beehive, itself veiled.
<<case "a slave gown" "a halter top dress" "a ball gown">>
is piled up on $his head in a perfect 60's beehive.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is not visible under $his modest head covering, though it's obvious $he has a huge mass of hair restrained under there.
+ <<case "a klan robe" "a slutty klan robe">>
+ is not visible under $his hood, though it's evident $he has a huge mass of hair restrained under there.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1389,8 +1399,10 @@ $His
is piled up on $his head in a beehive, pulling $his veil up a little.
<<case "a slave gown" "a ball gown" "a halter top dress">>
is piled up on $his head in a perfect 60's beehive.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is not visible under $his hood.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1450,8 +1462,10 @@ $His
is piled on $his head, pulling $his veil up a little.
<<case "a slave gown" "a ball gown" "a halter top dress">>
is piled up on $his head in a perfect 60's 'do.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is not visible under $his hood.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1495,8 +1509,10 @@ $His
<<switch $activeSlave.clothes>>
<<case "restrictive latex">>
fits back under $his latex hood.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is not visible under $his hood.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1579,8 +1595,10 @@ $His
is gathered into secure tails and doubled up so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is gathered into floor-length tails by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in long tails, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in long tails, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is in long tails and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1657,8 +1675,10 @@ $His
is gathered into secure tails so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is gathered into long tails by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in tails, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in tails, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is in long tails and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1735,8 +1755,10 @@ $His
is gathered into short tails so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is gathered into short tails by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in tails, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in tails, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is in short braids and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1762,8 +1784,10 @@ $His
<</switch>>
<<else>>
<<switch $activeSlave.clothes>>
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is hidden by $his hood.
<<case "a police uniform" "overalls">>
is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1844,8 +1868,10 @@ $His
is gathered into a ponytail and doubled up so $he can do business without it getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is gathered into a floor-length ponytail by a white cloth tie emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in a long ponytail, but it's hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in a long ponytail, but it's hidden by $his hood.
<<case "a police uniform" "overalls">>
is in a long ponytail and is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -1922,8 +1948,10 @@ $His
is gathered into a secure ponytail so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is gathered into a long ponytail by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in a long ponytail, but it's hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in a long ponytail, but it's hidden by $his hood.
<<case "a police uniform" "overalls">>
is in a long ponytail and is kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2000,8 +2028,10 @@ $His
is gathered into a short ponytail so $he can do business without it getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is gathered into a short ponytail by a white cloth tie emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in a ponytail, but it's hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in a ponytail, but it's hidden by $his hood.
<<case "a police uniform" "overalls">>
is in a ponytail and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2027,8 +2057,10 @@ $His
<</switch>>
<<else>>
<<switch $activeSlave.clothes>>
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is hidden by $his hood.
<<case "a scalemail bikini" "striped panties">>
is combed back and topped by a gold headband.
<<case "kitty lingerie">>
@@ -2087,8 +2119,10 @@ $His
is gathered into secure braids and doubled up so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is gathered into floor-length braids by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in long braids, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in long braids, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is in long braids and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2161,8 +2195,10 @@ $His
is tied into long braids and secured so $he can do business without them getting in the way.
<<case "a slutty nurse outfit">>
is tied into long braids and secured by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in braids, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in braids, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is in braids and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2235,8 +2271,10 @@ $His
is gathered into short braids so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is gathered into short braids by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in short braids, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in short braids, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is in short braids and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2262,8 +2300,10 @@ $His
<</switch>>
<<else>>
<<switch $activeSlave.clothes>>
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is hidden by $his hood.
<<case "a scalemail bikini" "striped panties">>
is combed back and topped by a gold headband.
<<case "kitty lingerie">>
@@ -2322,8 +2362,10 @@ $His
is in dreadlocks and tied up so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is in floor-length dreadlocks, some in white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in long dreadlocks, barely hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in long dreadlocks, well hidden by $his hood.
<<case "a police uniform" "overalls">>
is in long dreadlocks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2400,8 +2442,10 @@ $His
is in dreadlocks and tied so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is in dreadlocks, some with white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in dreadlocks, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in dreadlocks, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is in dreadlocks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2474,8 +2518,10 @@ $His
is in short dreadlocks and tied so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is in short dreadlocks, some in white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is in short dreadlocks, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in short dreadlocks, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is in short dreadlocks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2501,8 +2547,10 @@ $His
<</switch>>
<<else>>
<<switch $activeSlave.clothes>>
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is hidden by $his hood.
<<case "a scalemail bikini" "striped panties">>
is combed back and topped by a gold headband.
<<case "kitty lingerie">>
@@ -2561,8 +2609,10 @@ $His
is curled into long flowing locks and tied up so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is curled into long flowing locks, secured by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is curled into long flowing locks, barely hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is curled into long flowing locks, well hidden by $his hood.
<<case "a police uniform" "overalls">>
is curled into long flowing locks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2635,8 +2685,10 @@ $His
is curled into long locks and tied so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is curled into long locks, secured by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is curled into long locks, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is curled into long locks, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is curled into long locks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2709,8 +2761,10 @@ $His
is curled into short locks and tied so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is curled into short locks secured by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is curled into short locks, but they're hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is curled into short locks, but they're hidden by $his hood.
<<case "a police uniform" "overalls">>
is curled into short locks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2736,8 +2790,10 @@ $His
<</switch>>
<<else>>
<<switch $activeSlave.clothes>>
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is hidden by $his hood.
<<case "a scalemail bikini" "striped panties">>
is in short curls and topped by a gold headband.
<<case "kitty lingerie">>
@@ -2796,8 +2852,10 @@ $His
is permed into long flowing curls and tied up so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is permed into long flowing curls, secured by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
- is permed, barely hidden by $his modest garb.
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
+ is permed into long flowing curls, barely hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is permed into long flowing curls, well hidden by $his hood.
<<case "a police uniform" "overalls">>
is permed and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -2870,8 +2928,10 @@ $His
is permed and tied so $he can do business without them getting in the way.
<<case "a slutty nurse outfit" "a nice nurse outfit">>
is permed, secured by white cloth ties emblazoned with little red crosses.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
- is permed; $his long curls hidden by $his modest garb.
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
+ is permed, $his long curls hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is permed, $his long curls hidden by $his hood.
<<case "a police uniform" "overalls">>
is permed and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -3002,8 +3062,10 @@ $His
is in luxurious layered locks flowing gorgeously down $his bare back.
<<case "a kimono" "a long qipao">>
is in luxurious layered locks flowing elegantly down $his back, kept sensibly in place by a set of ivory hairpins.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is in luxurious layered locks but not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in luxurious layered locks but not visible under $his hood.
<<case "a police uniform" "overalls">>
is in luxurious layered locks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -3062,8 +3124,10 @@ $His
is in luxurious layered locks flowing gorgeously down $his bare back.
<<case "a kimono" "a long qipao">>
is in luxurious layered locks flowing elegantly down $his back, kept sensibly in place by a set of ivory hairpins.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is in luxurious layered locks flowing gorgeously but not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in luxurious layered locks flowing gorgeously but not visible under $his hood.
<<case "a police uniform" "overalls">>
is in luxurious layered locks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -3122,8 +3186,10 @@ $His
is in luxuriously styled short locks.
<<case "a kimono" "a long qipao">>
is in luxuriously styled short locks kept sensibly in place by a set of ivory hairpins.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is in luxuriously styled short locks but not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in luxuriously styled short locks but not visible under $his hood.
<<case "a police uniform" "overalls">>
is in luxurious short layered locks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -3170,7 +3236,7 @@ $His
<</switch>>
<<else>>
<<switch $activeSlave.clothes>>
- <<case "body oil" "a huipil" "a military uniform" "a slave gown" "a halter top dress" "a ball gown" "conservative clothing" "nice business attire" "slutty business attire" "battledress" "battlearmor" "a klan robe" "a slutty klan robe" "a long qipao" "lederhosen" "a dirndl" "a mounty outfit" "a biyelgee costume" "a schutzstaffel uniform" "a slutty schutzstaffel uniform" "a red army uniform">>
+ <<case "body oil" "a huipil" "a military uniform" "a slave gown" "a halter top dress" "a ball gown" "conservative clothing" "nice business attire" "slutty business attire" "battledress" "battlearmor" "a long qipao" "lederhosen" "a dirndl" "a mounty outfit" "a biyelgee costume" "a schutzstaffel uniform" "a slutty schutzstaffel uniform" "a red army uniform">>
is in luxuriously styled short locks.
<<case "restrictive latex">>
fits under $his latex hood.
@@ -3178,6 +3244,8 @@ $His
is in luxuriously styled short locks covered by a flimsy hairnet.
<<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a penitent nuns habit" "a fallen nuns habit" "a chattel habit">>
is in luxuriously styled short locks but not visible under $his modest head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is in luxuriously styled short locks but not visible under $his hood.
<<case "a police uniform" "overalls">>
is in luxurious short layered locks and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -3242,8 +3310,10 @@ $His
is shaved into a strip that cascades magnificently down $his back, with scores of tiny pastel bows woven into it.
<<case "a slutty maid outfit" "a nice maid outfit">>
is shaved into a strip that cascades magnificently down $his back, with scores of tiny black bows woven into it.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is shaved into a strip that's hidden by $his head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is shaved into a strip that's hidden by $his hood.
<<case "a police uniform" "overalls">>
is shaved into a strip and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -3295,8 +3365,10 @@ $His
is shaved into a long braided strip with tiny pastel bows woven into it.
<<case "a slutty maid outfit" "a nice maid outfit">>
is shaved into a long braided strip with tiny black bows woven into it.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is shaved into a long braided strip, hidden by $his head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is shaved into a long braided strip, hidden by $his hood.
<<case "a police uniform" "overalls">>
is shaved into a long braided strip and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -3348,8 +3420,10 @@ $His
is shaved into a strip down the middle of $his head with tiny pastel bows woven into it.
<<case "a slutty maid outfit" "a nice maid outfit">>
is shaved into a strip down the middle of $his head with tiny black bows woven into it.
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is shaved into a strip down the middle of $his head, hidden by $his head covering.
+ <<case "a klan robe" "a slutty klan robe">>
+ is shaved into a strip down the middle of $his head, hidden by $his hood.
<<case "a police uniform" "overalls">>
is shaved into a strip and kept out of $his face by a couple of sturdy hairpins.
<<case "a hanbok">>
@@ -3375,8 +3449,10 @@ $His
<</switch>>
<<else>>
<<switch $activeSlave.clothes>>
- <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya" "a klan robe" "a slutty klan robe">>
+ <<case "a burkini" "a burqa" "a hijab and abaya" "a hijab and blouse" "a niqab and abaya">>
is hidden by $his modest garb.
+ <<case "a klan robe" "a slutty klan robe">>
+ is hidden by $his hood.
<<case "a scalemail bikini">>
is shaved into a mohawk and topped by a gold headband.
<<case "kitty lingerie">>
@@ -5257,7 +5333,16 @@ $His
The handsome silk completely conceals $his support band.
<</if>>
-<<case "a burqa" "a hijab and abaya" "a niqab and abaya" "a klan robe">>
+<<case "a klan robe">>
+ <<if $activeSlave.bellyAccessory == "a corset">>
+ $His corset is hidden by $his long robes.
+ <<elseif $activeSlave.bellyAccessory == "an extreme corset">>
+ $His absurd corsetage is hidden by $his long robes.
+ <<elseif $activeSlave.bellyAccessory == "a support band">>
+ $His support band is hidden by $his long robes.
+ <</if>>
+
+<<case "a burqa" "a hijab and abaya" "a niqab and abaya">>
<<if $activeSlave.bellyAccessory == "a corset">>
$His corset is properly hidden along with everything else.
<<elseif $activeSlave.bellyAccessory == "an extreme corset">>
diff --git a/src/utility/optionsWidgets.tw b/src/utility/optionsWidgets.tw
index 9dbaa27d0488b63c872458ed5f351e7c623056ba..f52e92599a4af30184ca6f40d787d9f4d9a664cb 100644
--- a/src/utility/optionsWidgets.tw
+++ b/src/utility/optionsWidgets.tw
@@ -8,7 +8,7 @@
Line separations are
<<if $lineSeparations == 0>>
@@.red;HIDDEN.@@
- //<<link 'Show'>>
+ //<<link "Show">>
<<set $lineSeparations = 1>>
<<replace '#OptionLineSeparations'>>
<<OptionLineSeparations>>
@@ -16,7 +16,7 @@ Line separations are
<</link>>//
<<else>>
@@.cyan;SHOWN.@@
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $lineSeparations = 0>>
<<replace '#OptionLineSeparations'>>
<<OptionLineSeparations>>
@@ -47,49 +47,49 @@ Line separations are
Slaves are sorted on the main menu by @@.yellow;DEVOTION.@@
<</if>>
//
-<<link 'Devotion'>>
+<<link "Devotion">>
<<set $sortSlavesBy = "devotion">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
<</replace>>
<</link>>
|
-<<link 'Name'>>
+<<link "Name">>
<<set $sortSlavesBy = "name">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
<</replace>>
<</link>>
|
-<<link 'Assignment'>>
+<<link "Assignment">>
<<set $sortSlavesBy = "assignment">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
<</replace>>
<</link>>
|
-<<link 'Date purchased'>>
+<<link "Date purchased">>
<<set $sortSlavesBy = "seniority">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
<</replace>>
<</link>>
|
-<<link 'Age'>>
+<<link "Age">>
<<set $sortSlavesBy = "actualAge">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
<</replace>>
<</link>>
|
-<<link 'How old they look'>>
+<<link "How old they look">>
<<set $sortSlavesBy = "visualAge">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
<</replace>>
<</link>>
|
-<<link 'Age of their body'>>
+<<link "Age of their body">>
<<set $sortSlavesBy = "physicalAge">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
@@ -105,7 +105,7 @@ Line separations are
<<widget "OptionSortOrder">>
<<if $sortSlavesOrder == "ascending">>
Slaves are sorted in @@.cyan;ASCENDING@@ order.
- //<<link 'Sort descending'>>
+ //<<link "Sort descending">>
<<set $sortSlavesOrder = "descending">>
<<replace '#OptionSortOrder'>>
<<OptionSortOrder>>
@@ -113,7 +113,7 @@ Line separations are
<</link>>//
<<else>>
Slaves are sorted in @@.red;DESCENDING@@ order.
- //<<link 'Sort ascending'>>
+ //<<link "Sort ascending">>
<<set $sortSlavesOrder = "ascending">>
<<replace '#OptionSortOrder'>>
<<OptionSortOrder>>
@@ -129,7 +129,7 @@ Line separations are
<<widget "OptionSortMain">>
<<if $sortSlavesMain == 0>>
Sort options are @@.red;HIDDEN@@ on the main menu.
- //<<link 'Show'>>
+ //<<link "Show">>
<<set $sortSlavesMain = 1>>
<<replace '#OptionSortMain'>>
<<OptionSortMain>>
@@ -137,7 +137,7 @@ Line separations are
<</link>>//
<<else>>
Sort options are @@.cyan;SHOWN@@ on the main menu.
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $sortSlavesMain = 0>>
<<replace '#OptionSortMain'>>
<<OptionSortMain>>
@@ -170,7 +170,7 @@ Line separations are
<<widget "OptionRulesAssistantMain">>
<<if $rulesAssistantMain == 0>>
The rules assistant is @@.red;HIDDEN.@@
- //<<link 'Show'>>
+ //<<link "Show">>
<<set $rulesAssistantMain = 1>>
<<replace '#OptionRulesAssistantMain'>>
<<OptionRulesAssistantMain>>
@@ -178,7 +178,7 @@ Line separations are
<</link>>//
<<else>>
The rules assistant is @@.cyan;SHOWN.@@
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $rulesAssistantMain = 0>>
<<replace '#OptionRulesAssistantMain'>>
<<OptionRulesAssistantMain>>
@@ -196,7 +196,7 @@ Line separations are
Main menu assignment shortcuts are
<<if $displayAssignments == 1>>
@@.cyan;SHOWN.@@
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $displayAssignments = 0>>
<<replace '#OptionDisplayAssignments'>>
<<OptionDisplayAssignments>>
@@ -204,7 +204,7 @@ Main menu assignment shortcuts are
<</link>>//
<<else>>
@@.red;HIDDEN.@@
- //<<link 'Show'>>
+ //<<link "Show">>
<<set $displayAssignments = 1>>
<<replace '#OptionDisplayAssignments'>>
<<OptionDisplayAssignments>>
@@ -222,7 +222,7 @@ Main menu assignment shortcuts are
Granular slave stat numbers are
<<if $summaryStats == 1>>
@@.cyan;DISPLAYED.@@
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $summaryStats = 0>>
<<replace '#OptionSummaryStats'>>
<<OptionSummaryStats>>
@@ -230,7 +230,7 @@ Granular slave stat numbers are
<</link>>//
<<else>>
@@.red;HIDDEN.@@
- //<<link 'Display'>>
+ //<<link "Display">>
<<set $summaryStats = 1>>
<<replace '#OptionSummaryStats'>>
<<OptionSummaryStats>>
@@ -254,7 +254,7 @@ Mental stats are
<</if>>
<<if $abbreviateDevotion != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateDevotion = 0>>
<<replace '#OptionAbbreviateDevotion'>>
<<OptionAbbreviateDevotion>>
@@ -262,7 +262,7 @@ Mental stats are
<</link>>// |
<</if>>
<<if $abbreviateDevotion != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateDevotion = 1>>
<<replace '#OptionAbbreviateDevotion'>>
<<OptionAbbreviateDevotion>>
@@ -271,7 +271,7 @@ Mental stats are
<<if $abbreviateDevotion != 2>>|<</if>>
<</if>>
<<if $abbreviateDevotion != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateDevotion = 2>>
<<replace '#OptionAbbreviateDevotion'>>
<<OptionAbbreviateDevotion>>
@@ -295,7 +295,7 @@ Rules are
<</if>>
<<if $abbreviateRules != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateRules = 0>>
<<replace '#OptionAbbreviateRules'>>
<<OptionAbbreviateRules>>
@@ -303,7 +303,7 @@ Rules are
<</link>>// |
<</if>>
<<if $abbreviateRules != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateRules = 1>>
<<replace '#OptionAbbreviateRules'>>
<<OptionAbbreviateRules>>
@@ -312,7 +312,7 @@ Rules are
<<if $abbreviateRules != 2>>|<</if>>
<</if>>
<<if $abbreviateRules != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateRules = 2>>
<<replace '#OptionAbbreviateRules'>>
<<OptionAbbreviateRules>>
@@ -336,7 +336,7 @@ Health is
<</if>>
<<if $abbreviateHealth != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateHealth = 0>>
<<replace '#OptionAbbreviateHealth'>>
<<OptionAbbreviateHealth>>
@@ -344,7 +344,7 @@ Health is
<</link>>// |
<</if>>
<<if $abbreviateHealth != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateHealth = 1>>
<<replace '#OptionAbbreviateHealth'>>
<<OptionAbbreviateHealth>>
@@ -353,7 +353,7 @@ Health is
<<if $abbreviateHealth != 2>>|<</if>>
<</if>>
<<if $abbreviateHealth != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateHealth = 2>>
<<replace '#OptionAbbreviateHealth'>>
<<OptionAbbreviateHealth>>
@@ -377,7 +377,7 @@ Diet and weight are
<</if>>
<<if $abbreviateDiet != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateDiet = 0>>
<<replace '#OptionAbbreviateDiet'>>
<<OptionAbbreviateDiet>>
@@ -385,7 +385,7 @@ Diet and weight are
<</link>>// |
<</if>>
<<if $abbreviateDiet != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateDiet = 1>>
<<replace '#OptionAbbreviateDiet'>>
<<OptionAbbreviateDiet>>
@@ -394,7 +394,7 @@ Diet and weight are
<<if $abbreviateDiet != 2>>|<</if>>
<</if>>
<<if $abbreviateDiet != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateDiet = 2>>
<<replace '#OptionAbbreviateDiet'>>
<<OptionAbbreviateDiet>>
@@ -418,7 +418,7 @@ Drugs and addiction are
<</if>>
<<if $abbreviateDrugs != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateDrugs = 0>>
<<replace '#OptionAbbreviateDrugs'>>
<<OptionAbbreviateDrugs>>
@@ -426,7 +426,7 @@ Drugs and addiction are
<</link>>// |
<</if>>
<<if $abbreviateDrugs != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateDrugs = 1>>
<<replace '#OptionAbbreviateDrugs'>>
<<OptionAbbreviateDrugs>>
@@ -435,7 +435,7 @@ Drugs and addiction are
<<if $abbreviateDrugs != 2>>|<</if>>
<</if>>
<<if $abbreviateDrugs != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateDrugs = 2>>
<<replace '#OptionAbbreviateDrugs'>>
<<OptionAbbreviateDrugs>>
@@ -450,48 +450,37 @@ Drugs and addiction are
%/
<<widget "OptionAbbreviateHormoneBalance">>
Hormone balance is
-<<if $abbreviateHormoneBalance == 1>>
- @@.yellow;ABBREVIATED.@@
- <<link 'Hide'>>
- <<set $abbreviateHormoneBalance = 0>>
- <<replace '#OptionAbbreviateHormoneBalance'>>
- <<OptionAbbreviateHormoneBalance>>
- <</replace>>
- <</link>>
- | <<link 'Summarize'>>
- <<set $abbreviateHormoneBalance = 2>>
- <<replace '#OptionAbbreviateHormoneBalance'>>
- <<OptionAbbreviateHormoneBalance>>
- <</replace>>
- <</link>>
-<<elseif $abbreviateHormoneBalance == 2>>
+<<if $abbreviateHormoneBalance == 2>>
@@.cyan;SUMMARIZED.@@
- <<link 'Hide'>>
+<<elseif $abbreviateHormoneBalance == 1>>
+ @@.yellow;ABBREVIATED.@@
+<<else>>
+ @@.red;HIDDEN.@@
+<</if>>
+<<if $abbreviateHormoneBalance != 0>>
+ //<<link "Hide">>
<<set $abbreviateHormoneBalance = 0>>
<<replace '#OptionAbbreviateHormoneBalance'>>
<<OptionAbbreviateHormoneBalance>>
<</replace>>
- <</link>>
- | <<link 'Abbreviate'>>
- <<set $abbreviateHormoneBalance = 1>>
- <<replace '#OptionAbbreviateHormoneBalance'>>
- <<OptionAbbreviateHormoneBalance>>
- <</replace>>
- <</link>>
-<<else>>
- @@.red;HIDDEN.@@
- <<link 'Abbreviate'>>
+ <</link>>// |
+<</if>>
+<<if $abbreviateHormoneBalance != 1>>
+ //<<link "Abbreviate">>
<<set $abbreviateHormoneBalance = 1>>
<<replace '#OptionAbbreviateHormoneBalance'>>
<<OptionAbbreviateHormoneBalance>>
<</replace>>
- <</link>>
- | <<link 'Summarize'>>
+ <</link>>//
+ <<if $abbreviateHormoneBalance != 2>>|<</if>>
+<</if>>
+<<if $abbreviateHormoneBalance != 2>>
+ //<<link "Summarize">>
<<set $abbreviateHormoneBalance = 2>>
<<replace '#OptionAbbreviateHormoneBalance'>>
<<OptionAbbreviateHormoneBalance>>
<</replace>>
- <</link>>
+ <</link>>//
<</if>>
<</widget>>
@@ -510,7 +499,7 @@ Genitalia are
<</if>>
<<if $abbreviateGenitalia != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateGenitalia = 0>>
<<replace '#OptionAbbreviateGenitalia'>>
<<OptionAbbreviateGenitalia>>
@@ -518,7 +507,7 @@ Genitalia are
<</link>>// |
<</if>>
<<if $abbreviateGenitalia != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateGenitalia = 1>>
<<replace '#OptionAbbreviateGenitalia'>>
<<OptionAbbreviateGenitalia>>
@@ -527,7 +516,7 @@ Genitalia are
<<if $abbreviateGenitalia != 2>>|<</if>>
<</if>>
<<if $abbreviateGenitalia != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateGenitalia = 2>>
<<replace '#OptionAbbreviateGenitalia'>>
<<OptionAbbreviateGenitalia>>
@@ -551,7 +540,7 @@ Physical traits are
<</if>>
<<if $abbreviatePhysicals != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviatePhysicals = 0>>
<<replace '#OptionAbbreviatePhysicals'>>
<<OptionAbbreviatePhysicals>>
@@ -559,7 +548,7 @@ Physical traits are
<</link>>// |
<</if>>
<<if $abbreviatePhysicals != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviatePhysicals = 1>>
<<replace '#OptionAbbreviatePhysicals'>>
<<OptionAbbreviatePhysicals>>
@@ -568,7 +557,7 @@ Physical traits are
<<if $abbreviatePhysicals != 2>>|<</if>>
<</if>>
<<if $abbreviatePhysicals != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviatePhysicals = 2>>
<<replace '#OptionAbbreviatePhysicals'>>
<<OptionAbbreviatePhysicals>>
@@ -592,7 +581,7 @@ Skills are
<</if>>
<<if $abbreviateSkills != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateSkills = 0>>
<<replace '#OptionAbbreviateSkills'>>
<<OptionAbbreviateSkills>>
@@ -600,7 +589,7 @@ Skills are
<</link>>// |
<</if>>
<<if $abbreviateSkills != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateSkills = 1>>
<<replace '#OptionAbbreviateSkills'>>
<<OptionAbbreviateSkills>>
@@ -609,7 +598,7 @@ Skills are
<<if $abbreviateSkills != 2>>|<</if>>
<</if>>
<<if $abbreviateSkills != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateSkills = 2>>
<<replace '#OptionAbbreviateSkills'>>
<<OptionAbbreviateSkills>>
@@ -633,7 +622,7 @@ Mental attributes are
<</if>>
<<if $abbreviateMental != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateMental = 0>>
<<replace '#OptionAbbreviateMental'>>
<<OptionAbbreviateMental>>
@@ -641,7 +630,7 @@ Mental attributes are
<</link>>// |
<</if>>
<<if $abbreviateMental != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateMental = 1>>
<<replace '#OptionAbbreviateMental'>>
<<OptionAbbreviateMental>>
@@ -650,7 +639,7 @@ Mental attributes are
<<if $abbreviateMental != 2>>|<</if>>
<</if>>
<<if $abbreviateMental != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateMental = 2>>
<<replace '#OptionAbbreviateMental'>>
<<OptionAbbreviateMental>>
@@ -674,7 +663,7 @@ Nationality is
<</if>>
<<if $abbreviateNationality != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateNationality = 0>>
<<replace '#OptionAbbreviateNationality'>>
<<OptionAbbreviateNationality>>
@@ -682,7 +671,7 @@ Nationality is
<</link>>// |
<</if>>
<<if $abbreviateNationality != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateNationality = 1>>
<<replace '#OptionAbbreviateNationality'>>
<<OptionAbbreviateNationality>>
@@ -691,7 +680,7 @@ Nationality is
<<if $abbreviateNationality != 2>>|<</if>>
<</if>>
<<if $abbreviateNationality != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateNationality = 2>>
<<replace '#OptionAbbreviateNationality'>>
<<OptionAbbreviateNationality>>
@@ -715,7 +704,7 @@ Race is
<</if>>
<<if $abbreviateRace != 0>>
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateRace = 0>>
<<replace '#OptionAbbreviateRace'>>
<<OptionAbbreviateRace>>
@@ -723,7 +712,7 @@ Race is
<</link>>// |
<</if>>
<<if $abbreviateRace != 1>>
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateRace = 1>>
<<replace '#OptionAbbreviateRace'>>
<<OptionAbbreviateRace>>
@@ -732,7 +721,7 @@ Race is
<<if $abbreviateRace != 2>>|<</if>>
<</if>>
<<if $abbreviateRace != 2>>
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateRace = 2>>
<<replace '#OptionAbbreviateRace'>>
<<OptionAbbreviateRace>>
@@ -749,7 +738,7 @@ Race is
Clothes are
<<if $abbreviateClothes == 2>>
@@.cyan;SUMMARIZED.@@
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateClothes = 0>>
<<replace '#OptionAbbreviateClothes'>>
<<OptionAbbreviateClothes>>
@@ -757,7 +746,7 @@ Clothes are
<</link>>//
<<else>>
@@.red;HIDDEN.@@
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateClothes = 2>>
<<replace '#OptionAbbreviateClothes'>>
<<OptionAbbreviateClothes>>
@@ -774,7 +763,7 @@ Clothes are
Origins are
<<if $abbreviateOrigins == 2>>
@@.cyan;SUMMARIZED.@@
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateOrigins = 0>>
<<replace '#OptionAbbreviateOrigins'>>
<<OptionAbbreviateOrigins>>
@@ -782,7 +771,7 @@ Origins are
<</link>>//
<<else>>
@@.red;HIDDEN.@@
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateOrigins = 2>>
<<replace '#OptionAbbreviateOrigins'>>
<<OptionAbbreviateOrigins>>
@@ -799,7 +788,7 @@ Origins are
Rules Assistant rulesets are
<<if $abbreviateRulesets == 2>>
@@.cyan;SUMMARIZED.@@
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $abbreviateRulesets = 0>>
<<replace '#OptionAbbreviateRulesets'>>
<<OptionAbbreviateRulesets>>
@@ -807,7 +796,7 @@ Rules Assistant rulesets are
<</link>>//
<<else>>
@@.red;HIDDEN.@@
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateRulesets = 2>>
<<replace '#OptionAbbreviateRulesets'>>
<<OptionAbbreviateRulesets>>
@@ -824,7 +813,7 @@ Rules Assistant rulesets are
Facilities in the sidebar are
<<if $abbreviateSidebar == 2>>
@@.cyan;SUMMARIZED.@@
- //<<link 'Abbreviate'>>
+ //<<link "Abbreviate">>
<<set $abbreviateSidebar = 1>>
<<replace '#OptionAbbreviateSidebar'>>
<<OptionAbbreviateSidebar>>
@@ -832,7 +821,7 @@ Facilities in the sidebar are
<</link>>//
<<else>>
@@.yellow;ABBREVIATED.@@
- //<<link 'Summarize'>>
+ //<<link "Summarize">>
<<set $abbreviateSidebar = 2>>
<<replace '#OptionAbbreviateSidebar'>>
<<OptionAbbreviateSidebar>>
@@ -849,7 +838,7 @@ Facilities in the sidebar are
Missing slave parents are
<<if $showMissingSlavesSD>>
@@.cyan;SHOWN.@@
- //<<link 'Hide'>>
+ //<<link "Hide">>
<<set $showMissingSlavesSD = false>>
<<replace '#OptionAbbreviateMissing'>>
<<OptionAbbreviateMissing>>
@@ -857,7 +846,7 @@ Missing slave parents are
<</link>>//
<<else>>
@@.red;HIDDEN.@@
- //<<link 'Show'>>
+ //<<link "Show">>
<<set $showMissingSlavesSD = true>>
<<replace '#OptionAbbreviateMissing'>>
<<OptionAbbreviateMissing>>