diff --git a/src/003-assets/CSS/tabs.css b/src/003-assets/CSS/tabs.css
index dfbbd57abb7104b61f994bbd2e0fa052532a8e3d..9f857f236db77b252b0db10cc200f936b2575f1a 100644
--- a/src/003-assets/CSS/tabs.css
+++ b/src/003-assets/CSS/tabs.css
@@ -65,7 +65,6 @@ div.tabbar a.active {
border: 0;
}
-
.tabcontent.card .slaveSummary.card {
background-color: #252525;
}
diff --git a/src/Mods/SecExp/js/secExp.js b/src/Mods/SecExp/js/secExp.js
index a4671c1a71d627b7b66369d2b1ec972530deed63..bdf41b43f2b7b2f97e2ae8319f34d155cb4d8e17 100644
--- a/src/Mods/SecExp/js/secExp.js
+++ b/src/Mods/SecExp/js/secExp.js
@@ -422,9 +422,9 @@ App.SecExp.Check = (function() {
} else if (V.terrain === "ravine") {
init -= jsRandom(5, 5);
}
- if (["wealth", "capitalist", "celebrity", "BlackHat"].includes(V.PC.career)) {
+ if (["BlackHat", "capitalist", "celebrity", "wealth"].includes(V.PC.career)) {
init += jsRandom(5, 5);
- } else if (["escort", "servant", "gang"].includes(V.PC.career)) {
+ } else if (["escort", "gang", "servant"].includes(V.PC.career)) {
init -= jsRandom(5, 5);
}
V.SecExp.core.trade = init;
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 00b11b111c8b2ad6a1175b5526d358d174d0b9e2..81a39ea1e5d527c0921ed35627cdfbacfb3b0183 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -118,7 +118,7 @@ You may review your settings before clicking "Continue" to begin.<br>
<<run _options.addOption("Economic Tabs on weekly reports are", "useTabs")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
-
+
<<includeDOM _options.render()>>
<h2>Images</h2>
@@ -126,7 +126,7 @@ You may review your settings before clicking "Continue" to begin.<br>
<<run _options.addOption("Images are", "seeImages")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
-
+
<<includeDOM _options.render()>>
<<if $seeImages > 0>>
@@ -176,7 +176,7 @@ You may review your settings before clicking "Continue" to begin.<br>
<<run _options.addOption("Slave images in the weekly report are", "seeReportImages")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
-
+
<<includeDOM _options.render()>>
<</if>>
</div>
@@ -186,7 +186,7 @@ You may review your settings before clicking "Continue" to begin.<br>
<div class="content">
<h2>Economy</h2>
-
+
<<set _options = new App.UI.OptionsGroup()>>
<<set $localEcon = $economy>>
@@ -351,7 +351,7 @@ You may review your settings before clicking "Continue" to begin.<br>
<h2>Mods</h2>
<<set _options = new App.UI.OptionsGroup()>>
-
+
<<run _options.addOption("The Special Force Mod is", "Toggle", $SF).addComment("This mod is initially from anon1888 but expanded by SFanon offers a lategame special (started out as security but changed to special in order to try and reduce confusion with CrimeAnon's separate Security Expansion (SecExp) mod) force, that is triggered after week 80. It is non-canon where it conflicts with canonical updates to the base game.")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
diff --git a/src/facilities/nursery/widgets/children/childSummary.js b/src/facilities/nursery/widgets/children/childSummary.js
index 865343ccebc119579c9df52de53bec8f925751c6..9e344622f5271e0b0e3090d0314f73fb079fe226 100644
--- a/src/facilities/nursery/widgets/children/childSummary.js
+++ b/src/facilities/nursery/widgets/children/childSummary.js
@@ -3092,7 +3092,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += `SP:all`;
} else if ((child.energy > 5) && (child.clitSetting === "none")) {
r += `SP:none`;
- } else if (!["women", "men", "anti-women", "anti-men"].includes(child.clitSetting)) {
+ } else if (!["anti-men", "anti-women", "men", "women"].includes(child.clitSetting)) {
r += `SP:monitoring`;
}
} else {
@@ -3551,7 +3551,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += `SP: all. `;
} else if ((child.energy > 5) && (child.clitSetting === "none")) {
r += `SP: none. `;
- } else if (!["women", "men", "anti-women", "anti-men"].includes(child.clitSetting)) {
+ } else if (!["anti-men", "anti-women", "men", "women"].includes(child.clitSetting)) {
r += `SP: monitoring. `;
}
} else {
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 0f3d9b626c9323370b0ad175fba5d89a8ea3d239..fee830050b37af21e4fef9856c5a5f74636a0a99 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1474,7 +1474,7 @@ SLAVE PARAPHILIAS
**********/
<<case "Paraphilias">>
''Paraphilias'' are intense forms of sexual <<= App.Encyclopedia.Dialog.linkSC("flaws", "Flaws")>> that cannot be softened. Slaves with a paraphilia excel at certain jobs, but may suffer penalties at others.
-
+
<br><br>
Choose a more particular entry below:
<br>
@@ -3184,7 +3184,7 @@ MODS
<</switch>>
/* special pages where we don't show related links */
-<<if !["Table of Contents", "Credits", "Special Force"].includes($encyclopedia)>>
+<<if !["Credits", "Special Force", "Table of Contents"].includes($encyclopedia)>>
<br><<include "Related Links">>
<</if>>
diff --git a/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw b/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
index a833910e8c924ead46dde542bcbe0ec66b084f7a..977e489706c77724ea61c26500adbdee70b913f6 100644
--- a/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
+++ b/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
@@ -1,7 +1,7 @@
:: Related Links [nobr]
/* pages asking the player to click a link for more information have no section heading */
-<<if !["Playing Free Cities", "Being in Charge", "Slaves", "Obtaining Slaves", "Leadership Positions", "Slave Assignments", "Body", "Skills", "Fetishes", "Paraphilias", "The X-Series Arcology", "Terrain Types", "Lore", "Game Mods", "Lolimod", "Inflation", "Slave Modification"].includes($encyclopedia)>>
+<<if !["Being in Charge", "Body", "Fetishes", "Game Mods", "Inflation", "Leadership Positions", "Lolimod", "Lore", "Obtaining Slaves", "Paraphilias", "Playing Free Cities", "Skills", "Slave Assignments", "Slave Modification", "Slaves", "Terrain Types", "The X-Series Arcology"].includes($encyclopedia)>>
<br><h3>Related Links</h3>
<</if>>
@@ -10,7 +10,7 @@
/**********
PLAYING FREE CITIES
**********/
-<<case "Playing Free Cities" "First Game Guide" "How to Play" "Keyboard Shortcuts" "The Arcology Interface" "Tips and Tricks" "Design Your Master">>
+<<case "Design Your Master" "First Game Guide" "How to Play" "Keyboard Shortcuts" "Playing Free Cities" "The Arcology Interface" "Tips and Tricks">>
<<= App.Encyclopedia.Dialog.linkSC("First Game Guide", "First Game Guide")>>
| <<= App.Encyclopedia.Dialog.linkSC("How to Play", "How to Play")>>
| <<= App.Encyclopedia.Dialog.linkSC("Keyboard Shortcuts", "Keyboard Shortcuts")>>
@@ -21,7 +21,7 @@ PLAYING FREE CITIES
/**********
BEING IN CHARGE
**********/
-<<case "Being in Charge" "Arcologies and Reputation" "Random Events" "Costs Summary" "Rules Assistant" "The Corporation" "Sexual Energy" "PC Skills">>
+<<case "Arcologies and Reputation" "Being in Charge" "Costs Summary" "PC Skills" "Random Events" "Rules Assistant" "Sexual Energy" "The Corporation">>
<<= App.Encyclopedia.Dialog.linkSC("Arcologies and Reputation", "Arcologies and Reputation")>>
| <<= App.Encyclopedia.Dialog.linkSC("Random Events", "Random Events")>>
| <<= App.Encyclopedia.Dialog.linkSC("Costs Summary", "Costs Summary")>>
@@ -33,7 +33,7 @@ BEING IN CHARGE
/**********
SLAVES
**********/
-<<case "Slaves" "Living Conditions" "Enslaving People" "Demand for Sex" "From Rebellious to Devoted" "Health" "Devotion" "Trust" "Drugs and Their Effects" "Gender" "Nymphomania" "Indentured Servants" "Menial Slaves" "Fuckdolls" "Lingua Franca" "Slave Score (Attractiveness)" "Slave Score (Sexual)">>
+<<case "Demand for Sex" "Devotion" "Drugs and Their Effects" "Enslaving People" "From Rebellious to Devoted" "Fuckdolls" "Gender" "Health" "Indentured Servants" "Lingua Franca" "Living Conditions" "Menial Slaves" "Nymphomania" "Slave Score (Attractiveness)" "Slave Score (Sexual)" "Slaves" "Trust">>
<<= App.Encyclopedia.Dialog.linkSC("Enslaving People", "Enslaving People")>>
| <<= App.Encyclopedia.Dialog.linkSC("Living Conditions", "Living Conditions")>>
| <<= App.Encyclopedia.Dialog.linkSC("Health", "Health")>>
@@ -53,7 +53,7 @@ SLAVES
/**********
OBTAINING SLAVES
**********/
-<<case "Obtaining Slaves" "Kidnapped Slaves" "Slave Schools" "Stables" "Household Liquidations" "Direct Sales" "Pre-Owned Slaves" "The Flesh Heap" "The Job Fulfillment Center">>
+<<case "Direct Sales" "Household Liquidations" "Kidnapped Slaves" "Obtaining Slaves" "Pre-Owned Slaves" "Slave Schools" "Stables" "The Flesh Heap" "The Job Fulfillment Center">>
<<= App.Encyclopedia.Dialog.linkSC("Kidnapped Slaves", "Kidnapped Slaves")>>
| <<= App.Encyclopedia.Dialog.linkSC("Slave Schools", "Slave Schools")>>
| <<= App.Encyclopedia.Dialog.linkSC("Stables", "Stables")>>
@@ -69,7 +69,7 @@ OBTAINING SLAVES
/**********
SLAVE LEADERS:
**********/
-<<case "Leadership Positions" "Slave Assignments" "Attendant" "Matron" "Bodyguard" "Concubine" "DJ" "Head Girl" "Madam" "Milkmaid" "Farmer" "Nurse" "Recruiter" "Schoolteacher" "Stewardess" "Wardeness" "Career Experience">>
+<<case "Attendant" "Bodyguard" "Career Experience" "Concubine" "DJ" "Farmer" "Head Girl" "Leadership Positions" "Madam" "Matron" "Milkmaid" "Nurse" "Recruiter" "Schoolteacher" "Slave Assignments" "Stewardess" "Wardeness">>
<<= App.Encyclopedia.Dialog.linkSC("Common Assignments", "Slave Assignments")>>
| <<= App.Encyclopedia.Dialog.linkSC("Career Experience", "Career Experience")>>
| <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>
@@ -108,7 +108,7 @@ SLAVE ASSIGNMENTS (COMMON):
/**********
SLAVE BODY:
**********/
-<<case "Body" "Anuses" "Areolae" "Breasts" "Butts" "Clits" "Dicks" "Ethnicity" "Faces" "Height" "Hips" "Lactation" "Lips" "Musculature" "Nipples" "Ovaries" "Skin Distinctions" "Teeth" "Testicles" "Vaginas" "Waist" "Weight" "Hormones (XX)" "Hormones (XY)">>
+<<case "Anuses" "Areolae" "Body" "Breasts" "Butts" "Clits" "Dicks" "Ethnicity" "Faces" "Height" "Hips" "Lactation" "Lips" "Musculature" "Nipples" "Ovaries" "Skin Distinctions" "Teeth" "Testicles" "Vaginas" "Waist" "Weight" "Hormones (XX)" "Hormones (XY)">>
<<= App.Encyclopedia.Dialog.linkSC("Anuses", "Anuses")>>
| <<= App.Encyclopedia.Dialog.linkSC("Areolae", "Areolae")>>
| <<= App.Encyclopedia.Dialog.linkSC("Breasts", "Breasts")>>
@@ -137,7 +137,7 @@ SLAVE BODY:
/**********
SLAVE SKILLS
**********/
-<<case "Skills" "Anal Skill" "Combat Skill" "Entertainment Skill" "Oral Skill" "Vaginal Skill" "Whoring Skill">>
+<<case "Anal Skill" "Combat Skill" "Entertainment Skill" "Oral Skill" "Skills" "Vaginal Skill" "Whoring Skill">>
<<= App.Encyclopedia.Dialog.linkSC("Anal Skill", "Anal Skill")>>
| <<= App.Encyclopedia.Dialog.linkSC("Combat Skill", "Combat Skill")>>
| <<= App.Encyclopedia.Dialog.linkSC("Entertainment Skill", "Entertainment Skill")>>
@@ -149,7 +149,7 @@ SLAVE SKILLS
/**********
SLAVE FETISHES:
**********/
-<<case "Fetishes" "Boob Fetishists" "Buttsluts" "Cumsluts" "Doms" "Humiliation Fetishists" "Masochists" "Pregnancy Fetishists" "Sadists" "Submissives">>
+<<case "Boob Fetishists" "Buttsluts" "Cumsluts" "Doms" "Fetishes" "Humiliation Fetishists" "Masochists" "Pregnancy Fetishists" "Sadists" "Submissives">>
<<= App.Encyclopedia.Dialog.linkSC("Boob Fetishists", "Boob Fetishists")>>
| <<= App.Encyclopedia.Dialog.linkSC("Buttsluts", "Buttsluts")>>
| <<= App.Encyclopedia.Dialog.linkSC("Cumsluts", "Cumsluts")>>
@@ -163,7 +163,7 @@ SLAVE FETISHES:
/**********
SLAVE PARAPHILIAS
**********/
-<<case "Paraphilias" "Abusiveness" "Anal Addicts" "Attention Whores" "Breast Obsession" "Breeding Obsession" "Cum Addicts" "Maliciousness" "Self Hatred" "Self Neglect">>
+<<case "Abusiveness" "Anal Addicts" "Attention Whores" "Breast Obsession" "Breeding Obsession" "Cum Addicts" "Maliciousness" "Paraphilias" "Self Hatred" "Self Neglect">>
<<= App.Encyclopedia.Dialog.linkSC("Abusiveness", "Abusiveness")>>
| <<= App.Encyclopedia.Dialog.linkSC("Anal Addicts", "Anal Addicts")>>
| <<= App.Encyclopedia.Dialog.linkSC("Attention Whores", "Attention Whores")>>
@@ -178,7 +178,7 @@ SLAVE PARAPHILIAS
/**********
SLAVE QUIRKS
**********/
-<<case "Quirks" "Adores Men" "Adores Women" "Advocate" "Confident" "Cutting" "Fitness" "Funny" "Insecure" "Sinful" "Caring" "Gagfuck Queen" "Painal Queen" "Perverted" "Romantic" "Size Queen" "Strugglefuck Queen" "Tease" "Unflinching">>
+<<case "Adores Men" "Adores Women" "Advocate" "Confident" "Cutting" "Fitness" "Funny" "Insecure" "Sinful" "Caring" "Gagfuck Queen" "Painal Queen" "Perverted" "Quirks" "Romantic" "Size Queen" "Strugglefuck Queen" "Tease" "Unflinching">>
//Behavioral <<= App.Encyclopedia.Dialog.linkSC("Quirks", "Quirks")>>://
<<= App.Encyclopedia.Dialog.linkSC("Adores men", "Adores Men")>>
| <<= App.Encyclopedia.Dialog.linkSC("Adores women", "Adores Women")>>
@@ -205,7 +205,7 @@ SLAVE QUIRKS
/**********
SLAVE FLAWS
**********/
-<<case "Flaws" "Anorexic" "Arrogant" "Bitchy" "Devout" "Gluttonous" "Hates Men" "Hates Women" "Liberated" "Odd" "Apathetic" "Crude" "Hates Anal" "Hates Oral" "Hates Penetration" "Idealistic" "Judgemental" "Repressed" "Shamefast">>
+<<case "Anorexic" "Arrogant" "Bitchy" "Devout" "Flaws" "Gluttonous" "Hates Men" "Hates Women" "Liberated" "Odd" "Apathetic" "Crude" "Hates Anal" "Hates Oral" "Hates Penetration" "Idealistic" "Judgemental" "Repressed" "Shamefast">>
//Behavioral <<= App.Encyclopedia.Dialog.linkSC("Flaws", "Flaws")>>://
<<= App.Encyclopedia.Dialog.linkSC("Anorexic", "Anorexic")>>
| <<= App.Encyclopedia.Dialog.linkSC("Arrogant", "Arrogant")>>
@@ -216,14 +216,14 @@ SLAVE FLAWS
| <<= App.Encyclopedia.Dialog.linkSC("Hates women", "Hates Women")>>
| <<= App.Encyclopedia.Dialog.linkSC("Liberated", "Liberated")>>
| <<= App.Encyclopedia.Dialog.linkSC("Odd", "Odd")>>
-
+
<br>
//Sexual <<= App.Encyclopedia.Dialog.linkSC("Flaws", "Flaws")>>://
<<= App.Encyclopedia.Dialog.linkSC("Apathetic", "Apathetic")>>
| <<= App.Encyclopedia.Dialog.linkSC("Crude", "Crude")>>
| <<= App.Encyclopedia.Dialog.linkSC("Hates anal", "Hates Anal")>>
| <<= App.Encyclopedia.Dialog.linkSC("Hates oral", "Hates Oral")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hates penetration", "Hates penetration")>>
+ | <<= App.Encyclopedia.Dialog.linkSC("Hates penetration", "Hates Penetration")>>
| <<= App.Encyclopedia.Dialog.linkSC("Idealistic", "Idealistic")>>
| <<= App.Encyclopedia.Dialog.linkSC("Judgemental", "Judgemental")>>
| <<= App.Encyclopedia.Dialog.linkSC("Repressed", "Repressed")>>
@@ -232,7 +232,7 @@ SLAVE FLAWS
/**********
SLAVE RELATIONSHIPS
**********/
-<<case "Relationships" "Rivalries" "Romances" "Emotionally Bonded" "Emotional Slut" "Slave Marriages" "Slaveowner Marriages">>
+<<case "Emotional Slut" "Emotionally Bonded" "Relationships" "Rivalries" "Romances" "Slave Marriages" "Slaveowner Marriages">>
<<= App.Encyclopedia.Dialog.linkSC("Relationships", "Relationships")>>
| <<= App.Encyclopedia.Dialog.linkSC("Rivalries", "Rivalries")>>
| <<= App.Encyclopedia.Dialog.linkSC("Romances", "Romances")>>
@@ -244,7 +244,7 @@ SLAVE RELATIONSHIPS
/**********
PREGNANCY
**********/
-<<case "Pregnancy" "Super Fertility Drugs" "Pregnancy Generator" "Childbirth and C-Secs" "Surrogacy" "Player Pregnancy" "Ova Transplantation" "Gestation Drugs and Labor Suppressants" "Slave Fertility" "Fertility Mix" "Breeders Dietary Blend" "Artificial Insemination" "Cloning" "Hyper-Pregnancy">>
+<<case "Artificial Insemination" "Breeders Dietary Blend" "Childbirth and C-Secs" "Cloning" "Fertility Mix" "Gestation Drugs and Labor Suppressants" "Hyper-Pregnancy" "Ova Transplantation" "Player Pregnancy" "Pregnancy" "Pregnancy Generator" "Slave Fertility" "Super Fertility Drugs" "Surrogacy">>
<<= App.Encyclopedia.Dialog.linkSC("Pregnancy", "Pregnancy")>>
| <<= App.Encyclopedia.Dialog.linkSC("Slave Fertility", "Slave Fertility")>>
| <<= App.Encyclopedia.Dialog.linkSC("Player Pregnancy", "Player Pregnancy")>>
@@ -265,7 +265,7 @@ PREGNANCY
/**********
INFLATION
**********/
-<<case "Inflation" "Enemas and Force-Feeding" "Belly Implants" "Cervix Micropump Filter" "Organic Mesh Breast Implant">>
+<<case "Belly Implants" "Cervix Micropump Filter" "Enemas and Force-Feeding" "Inflation" "Organic Mesh Breast Implant">>
<<= App.Encyclopedia.Dialog.linkSC("Inflation", "Inflation")>>
| <<= App.Encyclopedia.Dialog.linkSC("Enemas and Force-Feeding", "Enemas and Force-Feeding")>>
| <<= App.Encyclopedia.Dialog.linkSC("Belly Implants", "Belly Implants")>>
@@ -284,7 +284,7 @@ SLAVE MODIFICATION
/**********
THE X-SERIES ARCOLOGY
**********/
-<<case "The X-Series Arcology" "What the Upgrades Do" "Personal Assistant" "The Wardrobe" "The Auto Salon" "The Studio" "The Remote Surgery" "The Pharmaceutical Fab." "Security Drones" "Water Filtration" "Slave Nutrition">>
+<<case "Personal Assistant" "Security Drones" "Slave Nutrition" "The Auto Salon" "The Pharmaceutical Fab." "The Remote Surgery" "The Studio" "The Wardrobe" "The X-Series Arcology" "Water Filtration" "What the Upgrades Do">>
<<= App.Encyclopedia.Dialog.linkSC("What the Upgrades Do", "What the Upgrades Do")>>
| <<= App.Encyclopedia.Dialog.linkSC("Personal Assistant", "Personal Assistant")>>
| <<= App.Encyclopedia.Dialog.linkSC("The Wardrobe", "The Wardrobe")>>
@@ -299,7 +299,7 @@ THE X-SERIES ARCOLOGY
/**********
ARCOLOGY FACILITIES
**********/
-<<case "Facilities" "Arcade" "Brothel" "Cellblock" "Clinic" "Club" "Dairy" "Head Girl Suite" "Master Suite" "Pit" "Schoolroom" "Servants' Quarters" "Spa" "Nursery" "Farmyard" "Advertising" "Variety" "The Incubation Facility">>
+<<case "Advertising" "Arcade" "Brothel" "Cellblock" "Clinic" "Club" "Dairy" "Facilities" "Farmyard" "Head Girl Suite" "Master Suite" "Nursery" "Pit" "Schoolroom" "Servants' Quarters" "Spa" "The Incubation Facility" "Variety">>
//Arcology <<= App.Encyclopedia.Dialog.linkSC("Facilities", "Facilities")>>://
<<= App.Encyclopedia.Dialog.linkSC("Arcade", "Arcade")>>
| <<= App.Encyclopedia.Dialog.linkSC("Brothel", "Brothel")>>
@@ -334,7 +334,7 @@ TERRAIN TYPES
/**********
FUTURE SOCIETIES
**********/
-<<case "Future Societies" "Ethnic Supremacy" "Ethnic Subjugationism" "Gender Radicalism" "Gender Fundamentalism" "Paternalism" "Degradationism" "Body Purism" "Transformation Fetishism" "Maturity Preferentialism" "Youth Preferentialism" "Slimness Enthusiasm" "Asset Expansionism" "Pastoralism" "Physical Idealism" "Chattel Religionism" "Multiculturalism" "Roman Revivalism" "Aztec Revivalism" "Egyptian Revivalism" "Edo Revivalism" "Arabian Revivalism" "Chinese Revivalism" "Repopulationism" "Eugenics Focus" "Slave Professionalism" "Intellectual Dependency" "Petite Admiration" "Statuesque Glorification" "Hedonistic Decadence">>
+<<case "Arabian Revivalism" "Asset Expansionism" "Aztec Revivalism" "Body Purism" "Chattel Religionism" "Chinese Revivalism" "Degradationism" "Edo Revivalism" "Egyptian Revivalism" "Ethnic Subjugationism" "Ethnic Supremacy" "Eugenics Focus" "Future Societies" "Gender Fundamentalism" "Gender Radicalism" "Hedonistic Decadence" "Intellectual Dependency" "Maturity Preferentialism" "Multiculturalism" "Pastoralism" "Paternalism" "Petite Admiration" "Physical Idealism" "Repopulationism" "Roman Revivalism" "Slave Professionalism" "Slimness Enthusiasm" "Statuesque Glorification" "Transformation Fetishism" "Youth Preferentialism">>
//Vanilla Future Societies://
<<= App.Encyclopedia.Dialog.linkSC("Ethnic Supremacy", "Ethnic Supremacy")>>
| <<= App.Encyclopedia.Dialog.linkSC("Ethnic Subjugationism", "Ethnic Subjugationism")>>
@@ -357,7 +357,7 @@ FUTURE SOCIETIES
| <<= App.Encyclopedia.Dialog.linkSC("Edo Revivalism", "Edo Revivalism")>>
| <<= App.Encyclopedia.Dialog.linkSC("Arabian Revivalism", "Arabian Revivalism")>>
| <<= App.Encyclopedia.Dialog.linkSC("Chinese Revivalism", "Chinese Revivalism")>>
-
+
<br>
//Modded Future Societies://
<<= App.Encyclopedia.Dialog.linkSC("Repopulationism", "Repopulationism")>>
diff --git a/src/gui/css/options.css b/src/gui/css/options.css
index 4d1d2cadd2d8823059488cd646f9c8943c7c2e2e..eaaa502438caf7810c0b83ed84863fa6c76f1aac 100644
--- a/src/gui/css/options.css
+++ b/src/gui/css/options.css
@@ -1,85 +1,85 @@
div.options-group {
- display: grid;
- grid-template-columns: max-content auto;
- align-items: center;
+ display: grid;
+ grid-template-columns: max-content auto;
+ align-items: center;
}
@media only screen and (min-width: 1600px) {
- div.options-group.double {
- grid-template-columns: max-content auto max-content auto;
+ div.options-group.double {
+ grid-template-columns: max-content auto max-content auto;
}
}
/* left side */
div.options-group div.description {
- margin-right: 10px;
+ margin-right: 10px;
}
/* right side */
div.options-group div.button-group {
- margin: 6px 0;
+ margin: 6px 0;
}
div.options-group span.comment {
- color: gray;
- font-style: italic;
- margin-left: 10px;
+ color: gray;
+ font-style: italic;
+ margin-left: 10px;
}
div.options-group button {
- color: var(--link-color);
- background-color: var(--button-color);
- border: none; /* outline instead of border */
- /* left & right outline overlap each other so we don't have a double border */
- outline: solid 2px var(--button-border-color);
- margin-left: 2px;
+ color: var(--link-color);
+ background-color: var(--button-color);
+ border: none; /* outline instead of border */
+ /* left & right outline overlap each other so we don't have a double border */
+ outline: solid 2px var(--button-border-color);
+ margin-left: 2px;
}
div.options-group button:hover {
- background-color: var(--button-hover-color);
+ background-color: var(--button-hover-color);
}
div.options-group button.selected {
- background-color: var(--button-selected-color);
+ background-color: var(--button-selected-color);
}
div.options-group button.disabled {
- color: white;
- pointer-events: none;
- cursor: default;
+ color: white;
+ pointer-events: none;
+ cursor: default;
}
div.options-group button.selected.on {
- background-color: #103d10;
+ background-color: #103d10;
}
div.options-group button.on:hover {
- background-color: #1b651b;
+ background-color: #1b651b;
}
div.options-group button.selected.off {
- background-color: #40100d;
+ background-color: #40100d;
}
div.options-group button.off:hover {
- background-color: #6a1b16;
+ background-color: #6a1b16;
}
div.options-group button.selected.neutral {
- background-color: #4d4d00;
+ background-color: #4d4d00;
}
div.options-group button.neutral:hover {
- background-color: #666600;
+ background-color: #666600;
}
/* input box */
div.options-group input {
- border: 2px solid var(--button-border-color);
- min-width: unset; /* remove SC styling */
- width: 140px;
+ border: 2px solid var(--button-border-color);
+ min-width: unset; /* remove SC styling */
+ width: 140px;
}
div.options-group input.number {
- width: 50px;
+ width: 50px;
}
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index c3727380d2880993148a76b949a457e760e95f43..dd329a392210a6e6b31406c50ed4575281ef6187 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1259,7 +1259,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
// Test to see if there was a problem with the key
for (let j = 0; j < keys.length; j++) {
- if (!["text", "scene", "goto", "updateSlave", "update", "note", "disabled"].includes(keys[j])) {
+ if (!["disabled", "goto", "note", "scene", "text", "update", "updateSlave"].includes(keys[j])) {
sexArray[i].text += " ERROR, THIS SCENE WAS NOT ENTERED CORRECTLY";
console.log("Trash found while generateRows() was running: " + keys[j] + ": " + sexArray[i][keys[j]]);
break;
diff --git a/src/js/modification.js b/src/js/modification.js
index d593a5c1df2d974229180d3dc234647f9e0c61e9..ae1a952ec044375c7de22ad001a8dea708621a92 100644
--- a/src/js/modification.js
+++ b/src/js/modification.js
@@ -39,7 +39,7 @@ App.Medicine.Modification.removeScar = function(slave, scar, design) {
surgeryDamage(slave, (V.PC.skill.medicine >= 100) ? Math.round(surgery.healthCosts / 2) : surgery.healthCosts);*/
if (slave.scar.hasOwnProperty(scar)) { // if scar object exists for this body part
if (slave.scar[scar].hasOwnProperty(design)) { // if object has this kind of scar (might be custom)
- if (["generic", "whip", "chain", "burn", "menacing", "exotic", "surgical", "c-section", "cutting"].includes(design)) {
+ if (["burn", "c-section", "chain", "cutting", "exotic", "generic", "menacing", "surgical", "whip"].includes(design)) {
slave.scar[scar][design] = 0;
} else {
delete slave.scar[scar][design]; // scar was custom
@@ -64,7 +64,7 @@ App.Medicine.Modification.removeScar = function(slave, scar, design) {
* @param {number} weight
*/
App.Medicine.Modification.addScourged = function(slave, weight) {
- let scarArray = ["left breast", "right breast", "back", "lower back", "left buttock", "right buttock"];
+ let scarArray = ["back", "left breast", "left buttock", "lower back", "right breast", "right buttock"];
let i = 0;
// Whip
if (getLeftArmID(slave) === 1) {
@@ -115,39 +115,39 @@ App.Medicine.Modification.addBulkScars = function(slave, location, type, weight)
/* Divide slave into quarters, and add each quarter as needed. */
/* Top left */
- if (["left", "upper", "full"].includes(location)) {
+ if (["full", "left", "upper"].includes(location)) {
scarArray.push("left breast");
if (getLeftArmID(slave) === 1) {
- scarArray.push("left upper arm", "left lower arm", "left hand");
+ scarArray.push("left hand", "left lower arm", "left upper arm");
}
}
/* Top right */
- if (["right", "upper", "full"].includes(location)) {
+ if (["full", "right", "upper"].includes(location)) {
scarArray.push("right breast");
if (getRightArmID(slave) === 1) {
- scarArray.push("right upper arm", "right lower arm", "right hand");
+ scarArray.push("right hand", "right lower arm", "right upper arm");
}
}
/* Lower left */
- if (["left", "lower", "full"].includes(location)) {
+ if (["full", "left", "lower"].includes(location)) {
scarArray.push("left buttock");
if (getLeftLegID(slave) === 1) {
- scarArray.push("left thigh", "left calf", "left foot");
+ scarArray.push("left calf", "left foot", "left thigh");
}
}
/* Lower Right */
- if (["right", "lower", "full"].includes(location)) {
+ if (["full", "lower", "right"].includes(location)) {
scarArray.push("right buttock");
if (getRightLegID(slave) === 1) {
- scarArray.push("right thigh", "right calf", "right foot");
+ scarArray.push("right calf", "right foot", "right thigh");
}
}
/* Extra */
- if (["upper", "full"].includes(location)) {
+ if (["full", "upper"].includes(location)) {
scarArray.push("back", "lower back");
}
@@ -294,7 +294,7 @@ App.Medicine.Modification.setPiercing = function(slave, location, weight) {
}
}
- if (slave.genes === "XY" && slave.attrXY <= 35 && ["ear", "lips", "nose", "eyebrow", "navel"].contains(location)) {
+ if (slave.genes === "XY" && slave.attrXY <= 35 && ["ear", "eyebrow", "lips", "navel", "nose"].contains(location)) {
r += `${His} girly new `;
switch (location) {
case "ear":
@@ -587,13 +587,10 @@ App.Medicine.Modification.eyeSelector = function(entity, player = false) {
return container;
function assembleLinks() {
- const sides = ["left", "right", "both"];
- const irisColors = ["amber", "black", "blue", "brown", "green", "hazel", "orange", "pale-grey", "pink", "red",
- "sky-blue", "turquoise", "white", "yellow"];
- const pupilShapes = ["none", "circular", "almond-shaped", "bright", "catlike", "demonic", "devilish",
- "goat-like", "heart-shaped", "hypnotic", "serpent-like", "star-shaped", "teary", "vacant", "wide-eyed"];
- const scleraColors = ["none", "white", "amber", "black", "blue", "brown", "green", "hazel", "orange",
- "pale-grey", "pink", "red", "sky-blue", "turquoise", "yellow"];
+ const sides = ["both", "left", "right"];
+ const irisColors = ["amber", "black", "blue", "brown", "green", "hazel", "orange", "pale-grey", "pink", "red", "sky-blue", "turquoise", "white", "yellow"];
+ const pupilShapes = ["almond-shaped", "bright", "catlike", "circular", "demonic", "devilish", "goat-like", "heart-shaped", "hypnotic", "none", "serpent-like", "star-shaped", "teary", "vacant", "wide-eyed"];
+ const scleraColors = ["amber", "black", "blue", "brown", "green", "hazel", "none", "orange", "pale-grey", "pink", "red", "sky-blue", "turquoise", "white", "yellow"];
const div = document.createDocumentFragment();
div.append(
diff --git a/src/npc/interaction/fLips.tw b/src/npc/interaction/fLips.tw
index 3ea471f467cb7ef269c3e02ff130a702e39e0eb9..907be5732da144be1909ffafda156ff03ed55164 100644
--- a/src/npc/interaction/fLips.tw
+++ b/src/npc/interaction/fLips.tw
@@ -156,7 +156,7 @@ You tell <<= getSlave($AS).slaveName>> to
<</if>>
<</if>>
-<<if ["pointy", "fangs", "fang", "straightening braces", "cosmetic braces"].includes(getSlave($AS).teeth)>>
+<<if ["cosmetic braces", "fang", "fangs", "pointy", "straightening braces"].includes(getSlave($AS).teeth)>>
<<if (getSlave($AS).skill.oral >= 100)>>
$He's so orally skilled that $he had the confidence to lightly graze you with
<<if (getSlave($AS).teeth == "pointy")>>
@@ -170,7 +170,7 @@ You tell <<= getSlave($AS).slaveName>> to
<</if>>
on occasion, a delightfully scary sensation.
<<elseif (getSlave($AS).skill.oral > 30)>>
- $He's sufficiently orally skilled that $he managed to accomplish all that without
+ $He's sufficiently orally skilled that $he managed to accomplish all that without
<<if (getSlave($AS).teeth == "pointy")>>
$his sharp teeth
<<elseif (getSlave($AS).teeth == "fangs")>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index e070fd2d061e9bb35f1e9641250020c743eab870..52bfb0c62b35d07a8aef7903c0bbcb2fc602abd5 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -110,7 +110,7 @@
</span>
</div>
<</if>>
-
+
<div class="indent">
<<link "Back" "Starting Girls">> <</link>>
</div>
@@ -385,7 +385,7 @@
<div class="content">
<<set _options = new App.UI.OptionsGroup()>>
-
+
<<set _option = _options.addOption("Devotion", "devotion", $activeSlave).showTextBox()
.addRange(-100, -95, "<", "Utterly hateful")
.addRange(-70, -50, "<", "Hateful")
@@ -425,7 +425,7 @@
.addRange(52, 0, ">=", "Indentured Servant")>>
<<if $activeSlave.indenture > -1>>
<<run _options.addOption("Remaining weeeks", "indenture", $activeSlave).showTextBox()>>
-
+
<<run _options.addOption("Indenture restrictions", "indentureRestrictions", $activeSlave)
.addValueList([["None", 0], ["Protective", 1], ["Restrictive", 2]])>>
<</if>>
@@ -685,7 +685,7 @@
V.activeSlave.bellyPreg = 0;
V.activeSlave.ovaries = 1
})>>
-
+
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.dick === 0>>
<<run _options.addOption("Clit", "clit", $activeSlave)
@@ -814,7 +814,7 @@
}).addValueList([["Vestigial", 1], ["Small", 2], ["Normal", 3], ["Large", 4], ["Massive", 5]])>>
<<run _options.addOption("Age of Male Puberty", "pubertyAgeXY", $activeSlave).showTextBox()>>
-
+
<<if $activeSlave.balls > 0>>
<<run _options.addOption("Ballsack", "scrotum", $activeSlave)
.addValueList([["None", 0], ["Tiny", 1], ["Small", 2], ["Normal", 3], ["Large", 4], ["Massive", 5]])>>
@@ -884,7 +884,7 @@
<div id="Mental" class="tabcontent">
<div class="content">
-
+
<<set _options = new App.UI.OptionsGroup()>>
<<if $activeSlave.fetishKnown === 0>>
<<run _options.addOption("Fetish", "fetishKnown", $activeSlave)
diff --git a/src/pregmod/FCTV/seFCTVshows.tw b/src/pregmod/FCTV/seFCTVshows.tw
index d190eab4e434dc1a9d3bacb061a8b8fadc4f90b9..fa3d38dc4dc53ebaa281c818c1d892bf2c5f4199 100644
--- a/src/pregmod/FCTV/seFCTVshows.tw
+++ b/src/pregmod/FCTV/seFCTVshows.tw
@@ -471,7 +471,7 @@
<<set $activeSlave = _slave, $saleDescription = 1>>
<<if $cash >= _slaveCost>>
- <<link "Buy this contract.">>
+ <<link "Buy this contract.">>
<<run cashX(forceNeg(_slaveCost), "slaveTransfer", _slave)>>
<<set $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">>
<<goto "New Slave Intro">>
@@ -715,7 +715,7 @@
dick: 4, boobs: 0,
hLength: 10, hColor: "black"
},
- _model2, {
+ _model2, {
devotion: 0, trust: 0,
hLength: 50, hStyle: "luxurious",
hColor: "blonde", boobs: 700,
@@ -1469,7 +1469,7 @@
<br><br>
You flip off the TV. News from a pirate, how novel.
<<elseif FCTV.channelCount(2)>>
- the pirate themed channel. Apparently this is a live feed produced by a band of pirates and you tuned in right as they board a small pleasure craft.
+ the pirate themed channel. Apparently this is a live feed produced by a band of pirates and you tuned in right as they board a small pleasure craft.
<br><br>
Three armed pirates are swiftly sweeping the boat, gathering the passengers, a man, his wife and his two children, on deck and tying them up. The camera is attached to the pirate captain as he sweeps below deck finding their supplies.
<br><br>
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index 39f8f2e5966b2803a3afb8dfd46fafcff6f7be44..5f6d156ea4ebf1fa4728a3ac54afc966e02a8f55 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -108,11 +108,11 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
<<replace "#result">>
You decide to give the victimized prodigy a chance for payback. $He moves over to $his former boss and begins to caress the despicable thief as _he2 shakes with dread of what is to come. As $he moves lower, $he applies more pressure, peaking right on the genitals. The cowardly former executive yelps in pain, instinctively trying to get away from the <<if hasAnyArms(_ssb)>>hand<<else>>foot<</if>> crushing the most sensitive spot on _his2 body. After several minutes of the coward screaming in pain, _his2 former victim gets up and delivers a hard <<if hasBothLegs(_ssb)>>kick<<elseif hasAnyLegs(_ssb)>>stomp<<else>>punch<</if>> to the groin, eliciting another scream and causing $his former boss to assume the fetal position. You send for another slave to drag the whimpering slave<<= _girl2>> to _his2 feet for inspection. Being given an opportunity for revenge has increased _ssb.slaveName's @@.hotpink;devotion@@ and @@.mediumaquamarine;trust.@@
<<if _ssb.fetish != "sadist" && fetishChangeChance(_ssb) > jsRandom(0,100)>>
- Abusing the producer has caused $him to @@.lightcoral;develop a fondness for sadism.@@
+ Abusing the producer has caused $him to @@.lightcoral;develop a fondness for sadism.@@
<<set _ssb.fetish = "sadist", _ssb.fetishKnown = 1, _ssb.fetishStrength = 20>>
<<elseif _ssb.fetish == "sadist">>
<<if _ssb.fetishKnown == 1>>
- Abusing the producer has increased $his @@.lightcoral;fondness of sadism.@@
+ Abusing the producer has increased $his @@.lightcoral;fondness of sadism.@@
<<set _ssb.fetishStrength += 5>>
<<else>>
Abusing the producer has revealed $his @@.lightcoral;fondness of sadism!@@
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 3bf52cf63aff857dbc9bd9e65df377da3023267e..83b65de06a916db44bf1e53f9d32b2d5008d874b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2239,7 +2239,7 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgment<</if>>, $he
<</if>>
<</if>>
-<<if ($activeSlave.energy > 95) && ($activeSlave.dick > 0) && ($activeSlave.dick < 5) && ($activeSlave.balls > 0) && !["humiliation", "submissive", "masochist"].includes($activeSlave.fetish)>>
+<<if ($activeSlave.energy > 95) && ($activeSlave.dick > 0) && ($activeSlave.dick < 5) && ($activeSlave.balls > 0) && !["humiliation", "masochist", "submissive"].includes($activeSlave.fetish)>>
<<set _possibleDrugs.push({type: "dick", text: "peni<<s>> enhan<<c>>ement? I ju<<s>>t want to fuck all the time, <<Master>>. Girl<<s>> with big cock<<s>> have more fun, even getting fucked. E<<s>>pe<<c>>ially getting fucked."})>>
<</if>>
@@ -9924,7 +9924,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
grinning far more sweetly than _hisA muscular form should be able to manage.
<<case "businesswoman">>
though _heA's blushing _himselfA.
- <<case "fairy" "pregnant fairy" "cherub">>
+ <<case "cherub" "fairy" "pregnant fairy">>
flitting around and giggling excitedly.
<<case "goddess">>
massaging _hisA pregnant belly meaningfully.
@@ -19320,13 +19320,20 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<</if>>
$He begins to straighten, to face you, but you place a <<if $PC.title == 1>>strong<<else>>feminine<</if>> hand on $his chest, right between $his breasts, and keep $him leaning backward. Then, without any preamble, you take $his right breast in both of your hands, bend forward, and take $his nipple into your mouth. $He gasps<<if canTalk($activeSlave)>>, <<say>>s "Oh, <<Master>>"<</if>> quietly, and then begins to moan as you begin to suck powerfully,
<<switch $activeSlave.nipples>>
- <<case "tiny">>drawing $his tiny nipple entirely into your mouth.
- <<case "puffy">>engorging $his soft, puffy nipple until it fills your mouth.
- <<case "partially inverted">>pulling $his partially inverted nipple straight out and into your mouth.
- <<case "inverted">>gradually pulling at $his inverted nipple until it's finally forced to pop out and into your mouth.
- <<case "huge">>$his huge nipple filling your mouth comfortably.
- <<case "fuckable">>drawing an unreasonable amount of breast into your mouth just to keep a seal.
- <<default>>pulling $his soft nipple and some of the areolae around it into your mouth.
+ <<case "tiny">>
+ drawing $his tiny nipple entirely into your mouth.
+ <<case "puffy">>
+ engorging $his soft, puffy nipple until it fills your mouth.
+ <<case "partially inverted">>
+ pulling $his partially inverted nipple straight out and into your mouth.
+ <<case "inverted">>
+ gradually pulling at $his inverted nipple until it's finally forced to pop out and into your mouth.
+ <<case "huge">>
+ $his huge nipple filling your mouth comfortably.
+ <<case "fuckable">>
+ drawing an unreasonable amount of breast into your mouth just to keep a seal.
+ <<default>>
+ pulling $his soft nipple and some of the areolae around it into your mouth.
<</switch>>
$His rich milk begins to flow across your tongue, creamy and with a hint of vanilla. $He breathes faster and faster as $he becomes aroused, but then the stimulation peaks. You keep drinking from $him, making no move to stop nursing and start fucking $him. $He sighs with sudden contentment, realizing that you're going to drink every drop $he has, and $his sudden relaxation sends a little extra gush of milk into your mouth. $He @@.hotpink;definitely enjoys the experience,@@ leaning back compliantly as you drain that breast and then $his left one, too.
<<if $activeSlave.boobs > 25000 || ($activeSlave.boobs > 10000 && $activeSlave.lactation > 1)>>Your clothes feel tight around your middle for the rest of the day; you may have indulged a little too much.<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index e159920fa7f4d0fce4c2a9ba243a815b1745363b..fb09203737d4e2de441237532a86a4058adca0f3 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -943,7 +943,7 @@ Or design your own: <<textbox "$scarDesign.local" $scarDesign.local "Body Modifi
<div>
Choose a site for scaring:
-<<if ["menacing", "exotic"].includes($scarDesign.local)>>
+<<if ["exotic", "menacing"].includes($scarDesign.local)>>
[[Cheeks|Body Modification][$scarTarget.local = "cheek"]]
<<else>>
/* Sorted head to toe */
@@ -996,7 +996,7 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica
</div>
/* Correct some "bad" choices" */
-<<if ["menacing", "exotic"].includes($scarDesign.local)>>
+<<if ["exotic", "menacing"].includes($scarDesign.local)>>
<<if $scarTarget.local != "cheek">>
<<set $scarTarget.local = "cheek">>
<</if>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 55201fd3c888e84363f6f9cdd54f8bb2b343f1ca..4955a1cf6d709b12fd796b4ee61e9bc6a049b79b 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -35,7 +35,7 @@
<<if $cash > _minimumTen>>
[[(x10)|Bulk Slave Generate][$slaveMarket = "corporate", $introType = "bulk", $numSlaves = 10]] |
<</if>>
- <<if $corp.Market == 1>>//Slaves from your corporation purchased at a discounted rate.//<<else>>//Slaves from your corporation//<</if>>
+ <<if $corp.Market == 1>>//Slaves from your corporation purchased at a discounted rate.//<<else>>//Slaves from your corporation//<</if>>
<</if>>
</div>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 595ad6ae31998f92d53b10888b5417df9411a07d..18626a2712822f7d29cca26e230f5a81a2e65100 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -256,7 +256,7 @@
<</if>>
/* the clinic is a well-equipped medical facility and can allow the Nurse or player to
- * directly cure serious wounds caused by injury and surgery with minimal side effects */
+ * directly cure serious wounds caused by injury and surgery with minimal side effects */
<<if _slave.health.shortDamage >= 10>>
<<if ($Nurse != 0)>>
<<run healthCure(_slave, 5 + _healthBonus)>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index ef5ea69333c6194d2abf625782db428cdf16226f..401c090c3f4f00cf28da9bb47b4c99f34ffe7bc4 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -439,7 +439,7 @@
''active.''
[[Deactivate|Dairy][$dairyStimulatorsSetting = 0]]
<<if ($seeExtreme != 0) && ($dairyRestraintsSetting == 2)>>
- | [[Industrial|Dairy][$dairyStimulatorsSetting = 2, $dairyStimulatorsSettingChanged = 1]]
+ | [[Industrial|Dairy][$dairyStimulatorsSetting = 2, $dairyStimulatorsSettingChanged = 1]]
<</if>>
<<else>>
''inactive.''
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 8ba95ceb91c384a264df2604e43c16023557ceb0..0d0ab4afb89c43a9b6d546f7cc72eaf77c00c514 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -8,7 +8,7 @@
[6000,9000,12000,14000,16000],
[6000,9000,11000,13000,15000,17000]]>>
<<set _FSRepDescriptors = ["solid", "high", "remarkable", "great", "excellent", "unparalleled"]>>
-<<set _ordinalNames = ["second", "third", "fourth", "fifth", "sixth", "seventh"]>>
+<<set _ordinalNames = ["second", "third", "fourth", "fifth", "sixth", "seventh", "eighth"]>>
<<if $FSCredits > 0>>
@@.yellow;$arcologies[0].name's society is ready to begin accepting a new societal direction.@@
<</if>>
@@ -198,7 +198,7 @@
<</if>>
/* Promenade effects */
-<<run _cells = $building.findCells(cell => cell instanceof App.Arcology.Cell.Shop && !["Shops", "Brothel", "Club"].includes(cell.type))>>
+<<run _cells = $building.findCells(cell => cell instanceof App.Arcology.Cell.Shop && !["Brothel", "Club", "Shops"].includes(cell.type))>>
<<for _i = 0; _i < _cells.length; _i++>>
The _cells[_i].type establishments on the Promenade help develop society.
<<set _changed_fs = _cells[_i].type.replace(" ","")>>
@@ -219,7 +219,7 @@
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
- <<if ["businesswoman", "amazon", "imp"].includes($assistant.appearance)>>
+ <<if ["amazon", "businesswoman", "imp"].includes($assistant.appearance)>>
<<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "subjugationist">>
@@ -228,7 +228,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist != "unset">>
- <<if ["monstergirl", "shemale", "incubus", "succubus", "witch"].includes($assistant.appearance)>>
+ <<if ["incubus", "monstergirl", "shemale", "succubus", "witch"].includes($assistant.appearance)>>
<<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "gender radicalist">>
@@ -246,7 +246,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
- <<if ["businesswoman", "schoolgirl", "goddess", "loli", "succubus", "witch", "incubus", "angel"].includes($assistant.appearance)>>
+ <<if ["angel", "businesswoman", "goddess", "incubus", "loli", "schoolgirl", "succubus", "witch"].includes($assistant.appearance)>>
<<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "eugenics">>
@@ -256,7 +256,7 @@
<</if>>
<<if $arcologies[0].FSGenderFundamentalist != "unset">>
- <<if ["schoolgirl", "goddess", "hypergoddess", "preggololi", "loli", "fairy", "pregnant fairy", "angel", "cherub", "succubus", "witch"].includes($assistant.appearance)>>
+ <<if ["angel", "cherub", "fairy", "goddess", "hypergoddess", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"].includes($assistant.appearance)>>
<<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "gender fundamentalist">>
@@ -265,7 +265,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSPaternalist != "unset">>
- <<if ["schoolgirl", "goddess", "hypergoddess", "preggololi", "loli", "fairy", "pregnant fairy", "angel", "cherub"].includes($assistant.appearance)>>
+ <<if ["angel", "cherub", "fairy", "goddess", "hypergoddess", "loli", "preggololi", "pregnant fairy", "schoolgirl"].includes($assistant.appearance)>>
<<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "paternalist">>
@@ -274,7 +274,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSDegradationist != "unset">>
- <<if ["monstergirl", "businesswoman", "preggololi", "succubus", "incubus", "imp"].includes($assistant.appearance)>>
+ <<if ["businesswoman", "imp", "incubus", "monstergirl", "preggololi", "succubus"].includes($assistant.appearance)>>
<<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "degradationist">>
@@ -302,7 +302,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSBodyPurist != "unset">>
- <<if ["amazon", "goddess", "loli", "fairy", "pregnant fairy", "angel", "succubus", "incubus", "witch"].includes($assistant.fsAppearance)>>
+ <<if ["amazon", "angel", "fairy", "goddess", "incubus", "loli", "pregnant fairy", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "body purist">>
@@ -311,7 +311,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSTransformationFetishist != "unset">>
- <<if ["businesswoman", "shemale", "succubus", "incubus", "witch", "ERROR_1606_APPEARANCE_FILE_CORRUPT"].includes($assistant.fsAppearance)>>
+ <<if ["businesswoman", "ERROR_1606_APPEARANCE_FILE_CORRUPT", "incubus", "shemale", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "transformation fetishist">>
@@ -320,7 +320,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist != "unset">>
- <<if ["businesswoman", "goddess", "succubus", "incubus", "witch", "angel"].includes($assistant.fsAppearance)>>
+ <<if ["angel", "businesswoman", "goddess", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "maturity preferentialist">>
@@ -330,7 +330,7 @@
<</if>>
<<if $arcologies[0].FSYouthPreferentialist != "unset">>
- <<if ["schoolgirl", "shemale", "preggololi", "loli", "succubus", "angel", "cherub", "imp", "witch"].includes($assistant.fsAppearance)>>
+ <<if ["angel", "cherub", "imp", "loli", "preggololi", "schoolgirl", "shemale", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "youth preferentialist">>
@@ -357,7 +357,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
- <<if ["schoolgirl", "shemale", "loli", "cherub", "imp", "succubus", "witch"].includes($assistant.fsAppearance)>>
+ <<if ["cherub", "imp", "loli", "schoolgirl", "shemale", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "slimness enthusiast">>
@@ -367,7 +367,7 @@
<</if>>
<<if $arcologies[0].FSAssetExpansionist != "unset">>
- <<if ["businesswoman", "shemale", "hypergoddess", "succubus", "incubus", "witch"].includes($assistant.fsAppearance)>>
+ <<if ["businesswoman", "hypergoddess", "incubus", "shemale", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "asset expansionist">>
@@ -376,7 +376,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSPastoralist != "unset">>
- <<if ["shemale", "goddess", "hypergoddess", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
+ <<if ["goddess", "hypergoddess", "incubus", "shemale", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "pastoralist">>
@@ -385,7 +385,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- <<if ["amazon", "shemale", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
+ <<if ["amazon", "incubus", "shemale", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "physical idealist">>
@@ -394,7 +394,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
- <<if ["goddess", "hypergoddess", "preggololi", "imp", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
+ <<if ["goddess", "hypergoddess", "imp", "incubus", "preggololi", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "hedonistic decadence">>
@@ -404,7 +404,7 @@
<</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
- <<if ["goddess", "monstergirl", "incubus", "succubus", "witch", "angel", "cherub", "imp"].includes($assistant.fsAppearance)>>
+ <<if ["angel", "cherub", "goddess", "imp", "incubus", "monstergirl", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "chattel religionist">>
@@ -432,7 +432,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
- <<if ["goddess", "monstergirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+ <<if ["goddess", "incubus", "monstergirl", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "egyptian revivalist">>
@@ -441,7 +441,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">>
- <<if ["amazon", "monstergirl", "loli", "kitsune", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+ <<if ["amazon", "incubus", "kitsune", "loli", "monstergirl", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "edo revivalist">>
@@ -450,7 +450,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSArabianRevivalist != "unset">>
- <<if ["businesswoman", "schoolgirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+ <<if ["businesswoman", "incubus", "schoolgirl", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "arabian revivalist">>
@@ -459,7 +459,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSChineseRevivalist != "unset">>
- <<if ["schoolgirl", "monstergirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+ <<if ["incubus", "monstergirl", "schoolgirl", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
<<elseif $assistant.fsAppearance == "chinese revivalist">>
@@ -468,7 +468,8 @@
<</if>>
<</if>>
- <br><br>With _hisA $assistant.appearance appearance, $assistant.name's public visibility meshes <<if _seed == 2>>very well<<elseif _seed == 1>>well<</if>> with society.
+ <br><br>
+ With _hisA $assistant.appearance appearance, $assistant.name's public visibility meshes <<if _seed == 2>>very well<<elseif _seed == 1>>well<</if>> with society.
<</if>>
/* Progress overflow into influence */
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 89a77c271e2044b4a3e9d6c40e98d7fef68bf9ac..e8e1c6ddcf044d409dea8d7827f1c8ff53492abb 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2222,7 +2222,7 @@ $He is
so as $he <<if hasAnyLegs($activeSlave)>>stands<<else>>sits<</if>> before you $he rubs $his shaft
<<if hasBothArms($activeSlave)>>
<<if canDoAnal($activeSlave) && $activeSlave.anus > 0>>
- and pussy with one hand while $he fingers $his anus with the other.
+ and pussy with one hand while $he fingers $his anus with the other.
<<else>>
one hand while $he fingers $his pussy with the other.
<</if>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index a3f4578e91d990e977a9a02412ef1ce0e142d8f0..84952b2f43058e02880ead33447c4a0c98cf3a7b 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -495,7 +495,7 @@
<<elseif $miscarriagesTotal > 0>>
They have had a total of <<print num($miscarriagesTotal)>> miscarriages.
<</if>>
-
+
<<if $fuckdollsSold > 0>>
$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 1c1142cea8d13fa3903c869b8e6a5a8b2da3eb68..b7b06b145db46d9afaa5ebda0f128b3b23bd0612 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -2182,7 +2182,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
<<elseif getLimbCount($activeSlave) === 2>>
both limbs
<<else>>
- $his limb
+ $his limb
<</if>>
behind $him, secure them together, and hoist $him up to the ceiling on a rope. $He hangs up there like a sex slave chandelier<<if $activeSlave.boobs >= 650>>, breasts swaying in a lovely way whenever $he struggles<</if>>. Periodically you let $him down to stretch $his aching <<if ((!hasAnyArms($activeSlave) && !hasBothLegs($activeSlave)) || (!hasBothArms($activeSlave) && !hasAnyLegs($activeSlave)))>>limb<<else>>limbs<</if>>, but whenever you put your decoration back up you add some clips with little bells on them: first the nose, then the nipples, and finally the <<if $activeSlave.dick != 0>>dickhead<<else>>pussylips<</if>>. By the end of the day your work is accompanied by the sweet sounds of ringing bells and @@.gold;agonized pleas@@ for mercy in $his <<if $activeSlave.voice == 3>>high, girlish<<elseif $activeSlave.voice == 2>>feminine<<else>>deep<</if>> voice. $He will remember @@.mediumorchid;what you can do to $him.@@
<</replace>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 2e5e940f852f4bec7ee15d35a88206086738579d..eca799a9e6bd84e22cd085b80a2d7b3a9638c026 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -207,7 +207,7 @@ This save was created using FC version $ver build $releaseID.
<<run _options.addOption("Images are", "seeImages")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
-
+
<<includeDOM _options.render()>>
<<if $seeImages > 0>>
@@ -244,7 +244,7 @@ This save was created using FC version $ver build $releaseID.
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
<<elseif $imageChoice === 3>>
<<run _options.addOption("").addComment('<span class="warning">Git compiled only, no exceptions.</span>')>>
-
+
<<run _options.addOption("Clothing erection bulges are", "showClothingErection")
.addValue("Enabled", true).on().addValue("Disabled", false).off()>>
<</if>>
@@ -257,7 +257,7 @@ This save was created using FC version $ver build $releaseID.
<<run _options.addOption("Slave images in the weekly report are", "seeReportImages")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
-
+
<<includeDOM _options.render()>>
<</if>>
</div>
@@ -281,7 +281,7 @@ This save was created using FC version $ver build $releaseID.
<<run _options.addOption("Extreme content like amputation is currently", "seeExtreme")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
.addComment("Will not affect extreme surgeries already applied in-game.")>>
-
+
<<run _options.addOption("Bestiality related content is currently", "seeBestiality")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
@@ -298,7 +298,7 @@ This save was created using FC version $ver build $releaseID.
<<run _options.addOption("Child gender to be generated based off dick content settings", "seeDicksAffectsPregnancy")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
.addComment("<<if $seeDicksAffectsPregnancy === 1>>Currently <<print $seeDicks>>% of children will be born male. <</if>>Will not affect existing pregnancies already in-game.")>>
-
+
<<if $seeDicksAffectsPregnancy > 0>>
<<run _options.addOption("XX slaves can have sons", "adamPrinciple")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
@@ -335,7 +335,7 @@ This save was created using FC version $ver build $releaseID.
<<run _options.addOption("Missing slave names are currently", "showMissingSlaves")
.addValue("Enabled", true).on().addValue("Disabled", false).off()>>
-
+
<<includeDOM _options.render()>>
<h2>Intersecting mechanics</h2>
@@ -388,7 +388,7 @@ This save was created using FC version $ver build $releaseID.
<div id="MODS" class="tabcontent">
<div class="content">
<<set _options = new App.UI.OptionsGroup()>>
-
+
<<run _options.addOption("The Special Force Mod is currently", "Toggle", $SF)
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
@@ -406,12 +406,12 @@ This save was created using FC version $ver build $releaseID.
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
.addComment("<div>The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.</div>
<div>''If you are enabling the mod mid game for the first time, run the either the main or mod specific BC option listed near the top.''</div>")>>
-
+
<<includeDOM _options.render()>>
<<if $secExpEnabled > 0>>
<h2>Security Expansion mod options</h2>
-
+
<<if $terrain === "oceanic">>
<div>Oceanic arcologies are not by default subject to external attacks. You can however allow them to happen anyway. If you choose to do so please keep in mind that descriptions and mechanics are not intended for naval combat but land combat.</div>
@@ -447,7 +447,7 @@ This save was created using FC version $ver build $releaseID.
.addValueList([["Extremely fast", 2], ["Very fast", 1.5], ["Fast", 1.25], ["Normal", 1], ["Slow", 0.75], ["Very slow", 0.5]])>>
<</if>>
-
+
<<if $SecExp.settings.battle.enabled > 0>>
<<run _options.addOption("Commanders gain a prestige rank every 10 victories", "allowSlavePrestige", $SecExp.settings.battle)
.addValue("Yes", 1).on().addValue("No", 0).off()>>
@@ -757,6 +757,6 @@ This save was created using FC version $ver build $releaseID.
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
.addComment("This will enable a controversial but very broken event. Warning: Snuff, cannibalism.")>>
<</if>>
-
+
<<includeDOM _options.render()>>
</div>
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index 88b3f79797b64931c649fe99c7c37f8b604b9c1f..8379add2ba0818f9351fa299b9d0a8a6e45a9e56 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -96,7 +96,7 @@ $pitNameCaps is clean and ready,
<<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>>
<<switch $activeCanine.breed>>
- <<case "French Bulldog" "Beagle" "Poodle" "Yorkshire Terrier">>
+ <<case "Beagle" "French Bulldog" "Poodle" "Yorkshire Terrier">>
<<set _animalEligible = 0>>
<<default>>
<<set _animalEligible = 1>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 2ab1b3b8f9c72dde55c423c84fd669f50d05cb4a..8293e06236324248b66656278b6fa5ecb745dbfb 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -186,7 +186,7 @@
<</if>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
<<if ($cumslutID == 0)>>
- <<if ["ring gag", "none"].includes($slaves[$i].mouthAccessory)>>
+ <<if ["none", "ring gag"].includes($slaves[$i].mouthAccessory)>>
<<set $cumslutID = $slaves[$i].ID>>
<</if>>
<</if>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 628bf12cd0f121087e39ea7873b7217fc9f8325f..3f06aae3c74bac5a56de1eb840de6f6428877819 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1366,7 +1366,7 @@
<</switch>>
/* Inspection details for videocall recruitment */
- <<if ["incest mother son", "incest father daughter", "incest brother sister", "incest sister sister", "incest brother brother", "incest twin sister", "incest twin brother", "incest twins mixed", "incest mother daughter", "incest father son"].includes($RecETSevent)>>
+ <<if ["incest brother brother", "incest brother sister", "incest father daughter", "incest father son", "incest mother daughter", "incest mother son", "incest sister sister", "incest twin brother", "incest twin sister", "incest twins mixed"].includes($RecETSevent)>>
<p>
<<= capFirstChar($assistant.name)>> assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.
</p>
@@ -1401,7 +1401,7 @@
<<set _newSlaves = [$relative, $relative2]>>
<<if $RecETSevent === "desperate broodmother">>
<<set _newSlaves = [$relative]>> /* rushed videocall, no dossier */
- <<elseif ["addict mother daughter", "posh mother daughter", "mismatched pair"].includes($RecETSevent)>>
+ <<elseif ["addict mother daughter", "mismatched pair", "posh mother daughter"].includes($RecETSevent)>>
<<set _newSlaves = [$relative]>> /* caller doesn't want relative involved, so you don't get to inspect her even if you can force a sale */
<</if>>
<<includeDOM App.UI.MultipleInspect(_newSlaves, true, true, false)>>
diff --git a/src/uncategorized/remFluctuations.tw b/src/uncategorized/remFluctuations.tw
index 77fba3331d0e66aba67482600285d0a1631c2bbf..839a0e94d02c58c0f49cfb0ba71a83f30af9a647 100644
--- a/src/uncategorized/remFluctuations.tw
+++ b/src/uncategorized/remFluctuations.tw
@@ -107,16 +107,16 @@
<<elseif $REM == "anti-slavery coup">>
For months there were strong indications that an old world nation was quietly taking steps towards legalizing slavery. The market began to anticipate a serious increase in the demand for slaves in earnest but this week a month of protests against the country's leaders ended in a violent coup. The new government, claiming to only follow the will of the people, has made several promises, including a very vocal rebuke of even the slightest possibility of legal slavery within their borders. The slave market was shocked to find the previous government to be so weak and even more shocked at how unwilling the new one is to accept the times we live in. The panicked market quickly adjusted to greatly lowered slave demand and projections show a short-term price drop of up to ten percent. There will be no immediate impact on you or your slaves, but the coming weeks will be a fine time to buy new stock, and a terrible time to sell. <span class="noteworthy">The market price of slaves has dropped.</span>
<<elseif $REM == "hostilities ended">>
- The Free Cities make a real effort to avoid armed conflict, especially amonst themselves, as such endeavors almost never have any real winners. But tensions grew so high in their trade conflict that the likelihood of a full blown war between two Free Cities became not just a possibility but a near certainty for months. As skirmishes commenced and slave armies were quickly drilled for action on both sides, the slave market anticipated a boost to demand as soon as the fighting intensified. Miraculously, cooler heads prevailed and the Free Cities agreed to disband their armies. While many people sighed with relief the slave market was forced into a shock adjustment, projections show a short-term price drop of up to five percent. There will be no immediate impact on you or your slaves, but the coming weeks will be a fine time to buy new stock, and a terrible time to sell. <span class="noteworthy">The market price of slaves has dropped.</span>
+ The Free Cities make a real effort to avoid armed conflict, especially amongst themselves, as such endeavors almost never have any real winners. But tensions grew so high in their trade conflict that the likelihood of a full blown war between two Free Cities became not just a possibility but a near certainty for months. As skirmishes commenced and slave armies were quickly drilled for action on both sides, the slave market anticipated a boost to demand as soon as the fighting intensified. Miraculously, cooler heads prevailed and the Free Cities agreed to disband their armies. While many people sighed with relief the slave market was forced into a shock adjustment, projections show a short-term price drop of up to five percent. There will be no immediate impact on you or your slaves, but the coming weeks will be a fine time to buy new stock, and a terrible time to sell. <span class="noteworthy">The market price of slaves has dropped.</span>
<</if>>
-<<if ["revel", "bankruptcy", "refugee boat", "arcology change"].includes($REM)>>
+<<if ["arcology change", "bankruptcy", "refugee boat", "revel"].includes($REM)>>
<<set $menialSupplyFactor += 12000>>
-<<elseif ["tainted drugs", "antislavery terrorism", "hostilities ended"].includes($REM)>>
+<<elseif ["antislavery terrorism", "hostilities ended", "tainted drugs"].includes($REM)>>
<<set $menialDemandFactor -= 12000>>
-<<elseif ["new free city", "medical breakthrough", "war", "empty prisons", "unemployment"].includes($REM)>>
+<<elseif ["empty prisons", "medical breakthrough", "new free city", "unemployment", "war"].includes($REM)>>
<<set $menialSupplyFactor += 20000>>
-<<elseif ["speculation", "anti-slavery coup"].includes($REM)>>
+<<elseif ["anti-slavery coup", "speculation"].includes($REM)>>
<<set $menialDemandFactor -= 20000>>
<</if>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index ee20d86efd047b425862a293b959f98a02195013..27c867f9d11197f0fea16b9067dab2d9b2202851 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -669,7 +669,7 @@
<<if ($seeExtreme == 1) && (getSlave($AS).indentureRestrictions < 1)>>
| [[Replace them with removable prosthetics|Surgery Degradation][getSlave($AS).teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),20),$surgeryType = "teeth"]] |
[[Replace them with sharp teeth|Surgery Degradation][getSlave($AS).teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),20),$surgeryType = "sharp"]] |
- [[Replace them with fangs|Surgery Degradation][getSlave($AS).teeth = "fangs",cashX(forceNeg($surgeryCost), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),20),$surgeryType = "fangs"]] |
+ [[Replace them with fangs|Surgery Degradation][getSlave($AS).teeth = "fangs",cashX(forceNeg($surgeryCost), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),20),$surgeryType = "fangs"]] |
[[Add a fang|Surgery Degradation][getSlave($AS).teeth = "fang",cashX(forceNeg($surgeryCost), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),20),$surgeryType = "fang"]] |
<</if>>
</div>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 668885da7e9cf893005b4339fb583ca45263f9c1..d84b14450243e26a2678f2c90f7815dede1841dd 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -1049,7 +1049,7 @@ As the remote surgery's long recovery cycle completes,
<<else>>
listens closely to the description of $his new face,
<</if>>
- which $he hates, though $he hopes you'll like $his new face better and punish $him less cruelly as a result. For now, @@.mediumorchid;$he seems to view this fake face as a cruel imposition.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;terribly afraid@@ of your total power over $his body.
+ which $he hates, though $he hopes you'll like $his new face better and punish $him less cruelly as a result. For now, @@.mediumorchid;$he seems to view this fake face as a cruel imposition.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;terribly afraid@@ of your total power over $his body.
<<set getSlave($AS).trust -= 10, getSlave($AS).devotion -= 5>>
<</if>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 696769d1fd89af563834f5af2f51cb52ac3c8858..72c942b2cbeb6f04a35a1b5aa7ea2618fdc16547 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -319,7 +319,7 @@ Or design your own: <<textbox "$brandDesign.primary" $brandDesign.primary "Unive
<br>
/* Correct some "bad" choices" */
-<<if ["menacing", "exotic"].includes($scarDesign.primary)>>
+<<if ["exotic", "menacing"].includes($scarDesign.primary)>>
<<if !["cheek", "left cheek", "right cheek"].includes($scarTarget.primary)>>
<<set $scarTarget.primary = "cheek">>
<</if>>