From 827841ac0e17e46cec3e3630df0fb9bd2d5f7b93 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 10 Mar 2019 00:19:30 -0600
Subject: [PATCH] JustCurious
---
player variables documentation - Pregmod.txt | 16 ----------------
slave variables documentation - Pregmod.txt | 2 --
src/init/dummy.tw | 2 +-
src/js/SlaveState.js | 2 +-
src/js/assayJS.js | 6 +++---
src/js/generateGenetics.js | 8 ++++----
src/js/generateNewSlaveJS.js | 4 ++--
src/js/rulesAssistantOptions.js | 10 +++++-----
src/uncategorized/surgeryDegradation.tw | 3 +--
9 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 4ad5b9c2c2b..b3be0fbf964 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -337,14 +337,6 @@ your father
Accepts ID
Values between 0 and -20 are reserved.
0 - unknown
--1 - you
--2 - citizen of your arcology
--3 - former master
--4 - male arc owner
--5 - client
--6 - Societal Elite
--7 - designer baby
--8 - an animal
mother:
@@ -352,14 +344,6 @@ your mother
Accepts ID
Values between 0 and -20 are reserved.
0 - unknown
--1 - you
--2 - citizen of your arcology
--3 - former master
--4 - male arc owner
--5 - client
--6 - Societal Elite
--7 - designer baby
--8 - an animal
sisters:
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index b0e091b13d8..a1d9d6cba8a 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3252,7 +3252,6 @@ Values between 0 and -20 are reserved.
-5 - player's client
-6 - Societal Elite
-7 - designer baby
--8 - an animal
father:
@@ -3267,7 +3266,6 @@ Values between 0 and -20 are reserved.
-5 - player's client
-6 - Societal Elite
-7 - designer baby
--8 - an animal
sisters:
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 4d711a08a2e..8230cb84b61 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -17,7 +17,7 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames
$ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence
$LurcherSpeed
$$i
-$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory, $activeSlave.slaveCost, $activeSlave.premature, $activeSlave.missingEyes, $activeSlave.missingArms, $activeSlave.missingLegs,
+$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory, $activeSlave.slaveCost, $activeSlave.premature, $activeSlave.missingEyes, $activeSlave.missingArms, $activeSlave.missingLegs,
$activeSlave.noun, $activeSlave.pronoun, $activeSlave.possessive, $activeSlave.possessivePronoun, $activeSlave.object, $activeSlave.objectReflexive
$drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs
$PC.origRace, $PC.origSkin
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 66d695a22bb..8f71836abf2 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1752,7 +1752,7 @@ App.Entity.SlaveState = class SlaveState {
* * "size queen": prefers big cocks
*/
this.sexualQuirk = "none";
- /** 0: does not have; 1: carrier; 2: active
+ /** 0: does not have; 1: carrier; 2: active
* * heterochromia is an exception. String = active
*/
this.geneticQuirks = {
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 2cc3db4d35d..e766c252991 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -378,7 +378,7 @@ window.newSlave = /** @param {App.Entity.SlaveState} slave */ function newSlave(
V.genePool.push(slave);
}
}
-
+
/* add to facilities array if needed */
if (slave.assignment !== "rest") {
assignJob(slave, slave.assignment);
@@ -1337,7 +1337,7 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
r = "loli " + r;
}
}
-
+
if (slave.geneticQuirks.albinism === 2) {
r = "albino " + r;
}
@@ -1391,7 +1391,7 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
} else if (slave.births >= 3) {
r = r + " breeder";
}
-
+
if (slave.indenture > -1) {
r = "indentured " + r;
}
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 1803b3c8c5b..71328849036 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -666,7 +666,7 @@ window.generateGenetics = (function() {
}
}
}
-
+
//perfect face
if (father !== 0) {
if (mother.geneticQuirks.pFace + father.geneticQuirks.pFace >= 4) {
@@ -677,7 +677,7 @@ window.generateGenetics = (function() {
} else if (mother.geneticQuirks.pFace === 2) {
quirks.pFace = 1;
}
-
+
//ugly face
if (father !== 0) {
if (mother.geneticQuirks.uFace + father.geneticQuirks.uFace >= 4) {
@@ -688,7 +688,7 @@ window.generateGenetics = (function() {
} else if (mother.geneticQuirks.uFace === 2) {
quirks.uFace = 1;
}
-
+
//albinism
if (father !== 0) {
// Add treatment to force albinism
@@ -720,7 +720,7 @@ window.generateGenetics = (function() {
}
}
}
-
+
//heterochromia
if (father !== 0) {
if (mother.geneticQuirks.heterochromia === 2 && father.geneticQuirks.heterochromia === 2) {
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index f51d123a66b..5c5abb46c0f 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -805,7 +805,7 @@ window.GenerateNewSlave = (function(){
}
function generateXYBoobs() {
-
+
if (slave.physicalAge <= 10) {
slave.boobs = 100;
} else if (slave.physicalAge === 11) {
@@ -1473,7 +1473,7 @@ window.GenerateNewSlave = (function(){
V.oneTimeDisableDisability = 0;
}
}
-
+
function generateGeneticQuirkTweaks() {
if (slave.geneticQuirks.albinism === 2) {
slave.albinismOverride = {skin: slave.skin, eyeColor: slave.eyeColor, hColor: slave.hColor};
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 0fafa0681ff..3db45055863 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1308,7 +1308,7 @@ window.rulesAssistantOptions = (function() {
this.setValue(current_rule.set.chastityVagina);
this.onchange = (value) => current_rule.set.chastityVagina = value;
}
- }
+ }
class VagAccVirginsList extends List {
constructor() {
@@ -1366,7 +1366,7 @@ window.rulesAssistantOptions = (function() {
this.setValue(current_rule.set.chastityPenis);
this.onchange = (value) => current_rule.set.chastityPenis = value;
}
- }
+ }
class DickAccVirginsList extends List {
constructor() {
@@ -1395,7 +1395,7 @@ window.rulesAssistantOptions = (function() {
this.setValue(current_rule.set.chastityAnus);
this.onchange = (value) => current_rule.set.chastityAnus = value;
}
- }
+ }
class ButtplugsVirginsList extends List {
constructor() {
@@ -3341,7 +3341,7 @@ window.rulesAssistantOptions = (function() {
this.onchange = (value) => current_rule.set.surgery_hears = value;
}
}
-
+
class SmellSurgeryList extends List {
constructor() {
const items = [
@@ -3354,7 +3354,7 @@ window.rulesAssistantOptions = (function() {
this.onchange = (value) => current_rule.set.surgery_smells = value;
}
}
-
+
class TasteSurgeryList extends List {
constructor() {
const items = [
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 78a17b6f279..e7aeb004af5 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -504,7 +504,7 @@ As the remote surgery's long recovery cycle completes,
<<set $activeSlave.trust -= 4, $activeSlave.devotion -= 4>>
<</if>>
<</if>>
-
+
<<case "retaste">>
The oral surgery is brief, with @@.red;nothing more than minor health effects.@@ In the sterile environment of the autosurgery, $he's unable to notice any improvement to $his sense of taste, and so must wait to discover the change when $he's released much later on.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
@@ -693,7 +693,6 @@ As the remote surgery's long recovery cycle completes,
<<set $activeSlave.trust -= 15, $activeSlave.devotion -= 15>>
<</if>>
-
<<case "freshOvaries">>
<<if $activeSlave.ovaryAge >= 45 && $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<<if (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "She sold herself to you in the hope of someday bearing children.">>
--
GitLab