diff --git a/src/cheats/PCCheatMenu.tw b/src/cheats/PCCheatMenu.tw
index f8c2f8c9290f60d8bc1b9c5c64f00c84db7872c1..b8a6182d3c2778933c977b4d7b1b3f99a4294e92 100644
--- a/src/cheats/PCCheatMenu.tw
+++ b/src/cheats/PCCheatMenu.tw
@@ -10,6 +10,7 @@
Title: ''<<if $tempSlave.title == 1>>Master<<else>>Mistress<</if>>''
<br><<radiobutton "$tempSlave.title" 1>> Master
<<radiobutton "$tempSlave.title" 0>> Mistress
+<br>
Sex: ''$tempSlave.genes''
<br><<radiobutton "$tempSlave.genes" "XY">> XY
<<radiobutton "$tempSlave.genes" "XX">> XX
diff --git a/src/cheats/mod_EditNeighborArcologyCheat.tw b/src/cheats/mod_EditNeighborArcologyCheat.tw
index 546fe6f10ebad98ab355680cd51ea9564b75ecd0..b9bbeabf9659c7fc0bb7e81adc9b4f4492542ea7 100644
--- a/src/cheats/mod_EditNeighborArcologyCheat.tw
+++ b/src/cheats/mod_EditNeighborArcologyCheat.tw
@@ -12,11 +12,11 @@
<<if $arcologies.length <= 8>>
<<link "Add neighbor">>
- <<set _seed = ["north", "northeast", "east", "southeast", "south", "southwest", "west", "northwest"]>>
+ <<set _seed = ["east", "north", "northeast", "northwest", "south", "southeast", "southwest", "west"]>>
<<for _eca = 0; _eca < $arcologies.length; _eca++>>
<<set _seed.delete($arcologies[_eca].direction)>> /* remove directions already in use */
<</for>>
- <<set _govtypes = ["elected officials", "a committee", "an oligarchy", "an individual", "a corporation", "direct democracy"]>>
+ <<set _govtypes = ["a committee", "a corporation", "an individual", "an oligarchy", "direct democracy", "elected officials"]>>
<<set $activeArcology = {name: "Arcology X-", direction: _seed.random(), government: _govtypes.random(), honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor:0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSRepopulationFocus: "unset", FSHedonisticDecadence: "unset", FSCummunism: "unset", FSIncestFetishist: "unset", FSRestart: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
<<if $arcologies.length < 4>> /* X-4 is reserved for player's arcology, so X-1 is available */
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 88506ed64e4fa44338bf8ff9f9c28c76d398a522..8b1b2e3e80d4cb7de59b7d413f89d89829e70c36 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -171,13 +171,13 @@ window.saChoosesOwnClothes = (function() {
selection = {text: `${he} commonly sees others wearing normal clothing and is drawn to doing so ${himself}.`, clothes: "conservative clothing"};
break;
case 'degradationist':
- selection = {text: `${he} commonly sees others wearing chains and is drawn to doing so ${himself}.`, clothes: jsEither(['chains', 'uncomfortable straps', 'shibari ropes'])};
+ selection = {text: `${he} commonly sees others wearing chains and is drawn to doing so ${himself}.`, clothes: jsEither(['chains', 'shibari ropes', 'uncomfortable straps'])};
break;
case 'mature':
- selection = {text: `${he} commonly sees others wearing suits and is drawn to doing so ${himself}.`, clothes: jsEither(['slutty business attire', 'a nice maid outfit', 'nice business attire'])};
+ selection = {text: `${he} commonly sees others wearing suits and is drawn to doing so ${himself}.`, clothes: jsEither(['a nice maid outfit', 'nice business attire', 'slutty business attire'])};
break;
case 'youth':
- selection = {text: `${he} commonly sees schoolgirls around and instinctually follows along.`, clothes: jsEither(['a schoolgirl outfit', 'a cheerleader outfit'])};
+ selection = {text: `${he} commonly sees schoolgirls around and instinctually follows along.`, clothes: jsEither(['a cheerleader outfit', 'a schoolgirl outfit'])};
break;
case 'physicalIdealist':
selection = {text: `${he} commonly sees naked girls around and seldom realizes they are coated in oil.`, clothes: jsEither(['body oil', 'no clothing', 'no clothing'])};
@@ -186,7 +186,7 @@ window.saChoosesOwnClothes = (function() {
selection = {text: `${he} commonly sees cowgirls around and instinctually follows along.`, clothes: "Western clothing"};
break;
case 'bodyPurist':
- selection = {text: `${he} commonly sees others wearing tight, form-fitting clothes and is drawn to doing so ${himself}.`, clothes: jsEither(['a leotard', 'a string bikini', 'a slave gown', 'a comfortable bodysuit', 'restrictive latex', 'clubslut netting', 'a leotard', 'a halter top dress'])};
+ selection = {text: `${he} commonly sees others wearing tight, form-fitting clothes and is drawn to doing so ${himself}.`, clothes: jsEither(['a comfortable bodysuit', 'a halter top dress', 'a leotard', 'a leotard', 'a slave gown', 'a string bikini', 'clubslut netting', 'restrictive latex'])};
break;
default:
selection = {text: `${he} chooses to put on underwear, the reasons lost to ${him}, and moves on.`, clothes: jsEither(['attractive lingerie', 'panties'])};
@@ -945,9 +945,9 @@ window.saChoosesOwnClothes = (function() {
if(slave.fetish == 'mindbroken') {
if(slave.amp != 1 && slave.heels == 1) {
- shoes.push({text: `${He} finds ${he} can inexplicably walk if ${he} wears heels; a daily lesson for ${him}, as ${he} forgets shortly after leaving.`, shoes: jsEither(["heels", "pumps", "extreme heels", "boots"])});
+ shoes.push({text: `${He} finds ${he} can inexplicably walk if ${he} wears heels; a daily lesson for ${him}, as ${he} forgets shortly after leaving.`, shoes: jsEither(["boots", "extreme heels", "heels", "pumps"])});
}
- shoes.push({text: `${He} vaguely remembers putting things on ${his} feet, so ${he} does.`, shoes: jsEither(["heels", "pumps", "extreme heels", "boots", "flats"])});
+ shoes.push({text: `${He} vaguely remembers putting things on ${his} feet, so ${he} does.`, shoes: jsEither(["boots", "extreme heels", "flats", "heels", "pumps"])});
shoes.push({text: `${He} entered without shoes, and will leave the same.`, shoes: "none"});
} else if(slave.devotion <= 20) {
if(slave.heels == 0) {
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index ae153a588a43c557bb11e61cbf47af7e4b38c6df..2cc3db4d35d54dc14d868e9bdf0010b2d9e788f3 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -578,12 +578,14 @@ window.Enunciate = /** @param {App.Entity.SlaveState} slave */ function Enunciat
V.SEnunciate = "Th";
V.ssEnunciate = "th";
V.cEnunciate = "th";
- V.CEnunciate = "Ch";
+ V.CEnunciate = "Th";
V.ccEnunciate = "kth";
V.zEnunciate = "th";
V.ZEnunciate = "Th";
V.chEnunciate = "th";
V.ChEnunciate = "Th";
+ V.psEnunciate = "th";
+ V.PsEnunciate = "Th";
V.shEnunciate = "th";
V.ShEnunciate = "Th";
V.scEnunciate = "th";
@@ -654,6 +656,8 @@ window.Enunciate = /** @param {App.Entity.SlaveState} slave */ function Enunciat
V.ZEnunciate = "Z";
V.chEnunciate = "ch";
V.ChEnunciate = "Ch";
+ V.psEnunciate = "ps";
+ V.PsEnunciate = "Ps";
V.shEnunciate = "sh";
V.ShEnunciate = "Sh";
V.scEnunciate = "sc";
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 1c54d146f835e9493ef6988269a7809f4fa5bd67..8ff0a13d03aba12d52a4d6588aa10f27f9de72e8 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1378,7 +1378,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
}
- } else if (["serve in the master suite", "be your Concubine"].includes(eventSlave.assignment)) {
+ } else if (["be your Concubine", "serve in the master suite"].includes(eventSlave.assignment)) {
if (eventSlave.devotion > 20) {
if (eventSlave.trust >= -20) {
if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
@@ -2949,7 +2949,7 @@ window.generateRandomEventPoolServant = 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");
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 7e57eb50a8405f99098cdcf0c7e52c0517c75178..1803b3c8c5be57682b256c5e8a2c3f6c04a14fed 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -260,10 +260,10 @@ window.generateGenetics = (function() {
eyeColor = mother.origEye;
}
} else {
- eyeColor = jsEither([mother.origEye, father.origEye]);
+ eyeColor = jsEither([father.origEye, mother.origEye]);
}
} else if (actor2 === -2 || actor2 === 0 || actor2 === -5) {
- eyeColor = jsEither([mother.origEye, "brown", "blue", "brown", "green", "hazel", "green"]);
+ eyeColor = jsEither(["blue", "brown", "brown", "green", "green", "hazel", mother.origEye]);
} else {
eyeColor = mother.origEye;
}
@@ -274,7 +274,7 @@ window.generateGenetics = (function() {
break;
case "milky white":
case "implant":
- eyeColor = jsEither(["blue", "green", "brown", "hazel", "light blue", "light green", "dark green", "dark blue"]);
+ eyeColor = jsEither(["blue", "brown", "dark blue", "dark green", "green", "hazel", "light blue", "light green"]);
break;
}
return eyeColor;
@@ -327,18 +327,18 @@ window.generateGenetics = (function() {
} else if (father.origHColor === "white") {
hairColor = jsRandom(1,100) === 69 ? father.origHColor : mother.origHColor;
} else if (mother.origHColor === "black") {
- hairColor = jsEither([mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, father.origHColor]);
+ hairColor = jsEither([father.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor]);
} else if (father.origHColor === "black") {
hairColor = jsEither([father.origHColor, father.origHColor, father.origHColor, father.origHColor, father.origHColor, father.origHColor, father.origHColor, mother.origHColor]);
} else if (mother.origHColor === "brown") {
- hairColor = jsEither([mother.origHColor, mother.origHColor, mother.origHColor, father.origHColor]);
+ hairColor = jsEither([father.origHColor, mother.origHColor, mother.origHColor, mother.origHColor]);
} else if (father.origHColor === "brown") {
hairColor = jsEither([father.origHColor, father.origHColor, father.origHColor, mother.origHColor]);
} else {
- hairColor = jsEither([mother.origHColor, father.origHColor]);
+ hairColor = jsEither([father.origHColor, mother.origHColor]);
}
} else if (actor2 === -2 || actor2 === 0 || actor2 === -5) {
- hairColor = jsEither([mother.origHColor, "brown", "blonde", "black", "brown", "black", "brown", "black"]);
+ hairColor = jsEither(["black", "black", "black", "blonde", "brown", "brown", "brown", mother.origHColor]);
} else {
hairColor = mother.origHColor;
}
@@ -393,9 +393,9 @@ window.generateGenetics = (function() {
}
if (markings === "none") {
if (father !== 0) {
- markings = jsEither([mother.markings, father.markings, "none", "none"]);
+ markings = jsEither(["none", "none", father.markings, mother.markings]);
} else {
- markings = jsEither([mother.markings, mother.markings, "none", "none"]);
+ markings = jsEither(["none", "none", mother.markings, mother.markings]);
}
}
return markings;
@@ -405,9 +405,9 @@ window.generateGenetics = (function() {
function setSexualFlaw(father, mother) {
let flaw;
if (father !== 0) {
- flaw = jsEither([mother.sexualFlaw, father.sexualFlaw, "none", "none"]);
+ flaw = jsEither(["none", "none", father.sexualFlaw, mother.sexualFlaw]);
} else {
- flaw = jsEither([mother.sexualFlaw, mother.sexualFlaw, "none", "none"]);
+ flaw = jsEither(["none", "none", mother.sexualFlaw, mother.sexualFlaw]);
}
return flaw;
}
@@ -416,9 +416,9 @@ window.generateGenetics = (function() {
function setBehavioralFlaw(father, mother) {
let flaw;
if (father !== 0) {
- flaw = jsEither([mother.behavioralFlaw, father.behavioralFlaw, "none", "none"]);
+ flaw = jsEither(["none", "none", father.behavioralFlaw, mother.behavioralFlaw]);
} else {
- flaw = jsEither([mother.behavioralFlaw, mother.behavioralFlaw, "none", "none"]);
+ flaw = jsEither(["none", "none", mother.behavioralFlaw, mother.behavioralFlaw]);
}
return flaw;
}
diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js
index 7ad31f4b449986c2b923afc7635820d116f3ef01..9c62e34d070e2848366709ca1caf85cd7714f34d 100644
--- a/src/js/removeActiveSlave.js
+++ b/src/js/removeActiveSlave.js
@@ -327,7 +327,6 @@ window.removeNonNGPSlave = function removeNonNGPSlave(removedSlave) {
}
});
-
const _geneIndex = V.genePool.findIndex(function(s) { return s.ID === ID; });
if (_geneIndex !== -1) {
let keep = false;
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index b27b8649b8a329ac7e4d4f2b32fb3e7c43066ebe..0fafa0681ffe4bbc49b2482b685b04584e1dd788 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -776,7 +776,7 @@ window.rulesAssistantOptions = (function() {
class AssignmentInclusion extends ButtonList {
constructor() {
super("Apply to assignments and facilities");
- const items = ["Rest", "Fucktoy", "Subordinate Slave", "House Servant", "Confined", "Whore", "Public Servant", "Classes", "Milked", "Gloryhole"];
+ const items = ["Classes", "Confined", "Fucktoy", "Gloryhole", "House Servant", "Milked", "Public Servant", "Rest", "Subordinate Slave", "Whore"];
if (V.HGSuite > 0) items.push("Head Girl Suite");
if (V.brothel > 0) items.push("Brothel");
if (V.club > 0) items.push("Club");
@@ -2184,7 +2184,7 @@ window.rulesAssistantOptions = (function() {
class LensesList extends Element {
constructor() {
super(current_rule.set.eyeColor);
- this.appendChild(new OptionsItem("No default Setting", () => this.setValue("no default setting")));
+ this.appendChild(new OptionsItem("No default setting", () => this.setValue("no default setting")));
this.colorlist = new LensesColorList();
this.shapelist = new LensesShapeList();
this.appendChild(this.colorlist);
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 378b619c2d0a598eaed13e2112f1c23f06a45bb2..920e579d867fe47654e99febba7a4f0b9c512dfe 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1081,7 +1081,7 @@ window.Beauty = (function() {
}
}
if (arcology.FSChattelReligionist > 40 && arcology.FSBodyPurist === "unset") {
- let tats = ["shouldersTat", "lipsTat", "boobsTat", "armsTat", "backTat", "stampTat", "buttTat", "vaginaTat", "dickTat", "anusTat", "legsTat"];
+ let tats = ["anusTat", "armsTat", "backTat", "boobsTat", "buttTat", "dickTat", "legsTat", "lipsTat", "shouldersTat", "stampTat", "vaginaTat"];
let sacrilegeCount = 0;
for (var index in tats) {
if (slave[index] === "sacrilege") {
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index 306876e502865cae23f5f505761552135a2360fd..ca94f7894a36f25aa1e743c9db3aae23c0f72e7e 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -50,7 +50,7 @@
<<elseif ($activeSlave.sexualFlaw == "hates anal")>>
"<<S>>o, no taking dick<<s>> up my a<<ss>> for a week, right? It will be hard, but I'll do it to plea<<s>>e the godde<<ss>>." A coy little smile appears on $his face when $he thinks you aren't looking.
<<elseif ($activeSlave.sexualFlaw == "shamefast")>>
- "That loin cloth <<s>>eem<<s>> <<s>>o <<s>>mall..." $He stutters while turning red.
+ "That loin cloth <<s>>eem<<s>> <<s>>o <<s>>mall..." $His face turns red as $he stutters.
<<elseif ($activeSlave.sexualFlaw == "repressed")>>
"<<S>>o, no <<s>>e<<x>> at all for a week, right? It will be hard, but I'll do it to plea<<s>>e the godde<<ss>>. A coy little smile appears on $his face when $he thinks you aren't looking.
<<else>>