diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c6e65c66f62fe43f2b71c045019300ee825355f2..9e8ea911f123ba6b02b4f53b0e23492ea694ec4c 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -6625,7 +6625,7 @@
24
-fixed slaveInteract.tw
@@ -620,6 +620,7 @@ Contraception: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<
- <</if>>
+ <</if>>
<</if>>
<</if>>
+<</if>>
diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index ce419a59b869bb63d616aebe7f453cbfb925590f..2793efa643e70fe63fa99c6045407fb0187d247e 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -6,51 +6,51 @@ body {
/* makes HR colorflip compatible */
hr {
- background:#ccc;
- border:0;
+ background:#ccc;
+ border:0;
}
/* clears SugarCube's default transition */
.passage {
- transition: none;
- -webkit-transition: none;
+ transition: none;
+ -webkit-transition: none;
}
.passage-in {
- opacity: 1 !important;
+ opacity: 1 !important;
}
/* default is 54em */
#passages {
- max-width: 100%;
+ max-width: 100%;
}
/* small trick to hide broken images */
img {
- text-indent: -10000px;
+ text-indent: -10000px;
}
.imageRef {
- display: flex;
- flex-direction: column;
- flex-wrap: wrap;
- align-items: flex-start;
- position: relative;
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ align-items: flex-start;
+ position: relative;
background-color: rgba(80, 80, 80, 0.5);
margin: 2px;
}
.tinyImg {
- height: 120px;
- width: 120px;
- float: left;
+ height: 120px;
+ width: 120px;
+ float: left;
}
.smlImg {
- height: 150px;
- width: 150px;
- float: left;
+ height: 150px;
+ width: 150px;
+ float: left;
}
.smlImg > img, .smlImg > video {
@@ -58,9 +58,9 @@ img {
}
.medImg {
- height: 300px;
- width: 300px;
- float: right;
+ height: 300px;
+ width: 300px;
+ float: right;
}
.medImg > img, .medImg > video {
@@ -68,20 +68,20 @@ img {
}
.lrgRender {
- height: 531px;
- width: 531px;
+ height: 531px;
+ width: 531px;
margin-right: -50px;
margin-left: -50px;
- float: right;
+ float: right;
z-index: -1;
}
.lrgVector {
- height: 600px;
- width: 600px;
+ height: 600px;
+ width: 600px;
margin-right: -125px;
margin-left: -125px;
- float: right;
+ float: right;
z-index: -1;
}
@@ -113,20 +113,20 @@ img {
}
.lrgVector svg {
- width: 336px;
- height: 600px;
+ width: 336px;
+ height: 600px;
}
object {
- object-fit: scale-down;
- position: absolute;
- top: 0;
+ object-fit: scale-down;
+ position: absolute;
+ top: 0;
left: 0;
}
img.paperdoll {
- position: absolute;
- top: 0;
+ position: absolute;
+ top: 0;
left: 0;
margin-left: 0;
}
@@ -174,7 +174,7 @@ span.minusButton > a:hover { text-decoration: none; }
span.zeroButton > a:hover { text-decoration: none; }
/* Colors are made as css classes, to allow them to be
- changed for a light color scheme (for example). */
+ changed for a light color scheme (for example). */
.link { color: #68D } /* link color */
.aquamarine { color: aquamarine }
.coral { color: coral }
@@ -306,7 +306,7 @@ button.accordion {
}
button.accordion.active, button.accordion:hover {
- background-color: transparent;
+ background-color: transparent;
}
button.accordion:before {
@@ -318,10 +318,10 @@ button.accordion:before {
}
.unStaffed {
- background-color: transparent;
- padding: .5em .2em;
- margin-bottom: 1em;
- border-bottom: thin inset grey;
+ background-color: transparent;
+ padding: .5em .2em;
+ margin-bottom: 1em;
+ border-bottom: thin inset grey;
}
.unStaffed:before {
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index f8cd437f843ed1a1d2457a898c13bc213352a664..b4b3e671d542bb3505a713a619eda383cb06b697 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1773,7 +1773,7 @@ window.setPregType = function(actor) {
/* Suggestion for better animal pregnancy support - usage of another variable then ovum for fertility drugs bonus, and then adding actor.pregData.drugsEffect multiplier to it before adding to ovum. Example:
var bonus = 0;
-
+
... (code below where ovum changed to bonus)
bonus *= actor.pregData.drugsEffect;
@@ -1944,7 +1944,7 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
}
window.getIncubatorReserved = function(slaves) {
-
+
return FetusGlobalReserveCount("incubator");
}
@@ -1956,7 +1956,7 @@ window.getNurseryReserved = function (slaves) {
window.findFather = function(fatherID) {
let father;
let V = State.variables;
-
+
father = V.slaves[V.slaveIndices[fatherID]];
if (father === undefined) {
if (V.incubator > 0) {
@@ -1968,7 +1968,7 @@ window.findFather = function(fatherID) {
father = V.cribs.find(function(s) { return s.ID == fatherID; });
}
}
-
+
return father;
}
@@ -1982,7 +1982,7 @@ window.adjustFatherProperty = function(actor, property, newValue) {
window.adjustFatherProperty = function(actor, property, newValue) {
let V = State.variables;
let fatherIndex;
-
+
fatherIndex = V.slaves.findIndex(function(s) { return s.ID == actor.ID; });
if (fatherIndex > 0) {
V.slaves[fatherIndex][property] = newValue;
@@ -9640,7 +9640,7 @@ window.Deadliness = function Deadliness(slave) {
deadliness -= 1;
}
}
-
+
if (slave.labor === 1) {
deadliness -= 15;
} else if (slave.preg >= slave.pregData.normalBirth && slave.pregControl !== "labor suppressors") {
@@ -11222,12 +11222,12 @@ window.WombInit = function(actor) {
actor.readyOva = 0;
}
- if ( actor.pregData == undefined)
- {
- actor.pregData = deepCopy( setup.pregData.human );
- //Setup should be through deep copy, so in future, if we like, these values can be changed individually. Gameplay expansion posibilities. But for dev time to simplify debugging:
- //actor.pregData = setup.pregData.human; // any changes in setup pregData template will be applied immideatly to all. But can't be made seperate changes.
- }
+ if ( actor.pregData == undefined)
+ {
+ actor.pregData = deepCopy( setup.pregData.human );
+ //Setup should be through deep copy, so in future, if we like, these values can be changed individually. Gameplay expansion posibilities. But for dev time to simplify debugging:
+ //actor.pregData = setup.pregData.human; // any changes in setup pregData template will be applied immideatly to all. But can't be made seperate changes.
+ }
//backward compatibility setup. Fully accurate for normal pregnancy only.
if (actor.womb.length > 0 && actor.womb[0].genetics == undefined) {
@@ -11368,148 +11368,148 @@ window.WombBirthReady = function(actor, readyAge) {
};
window.WombGetVolume = function(actor) { //most legacy code from pregJS.tw with minor adaptation.
-
-
- if (actor.pregData.sizeType == 0)
- return getVolByLen(actor);
- else if (actor.pregData.sizeType == 1)
- return getVolByWeight(actor);
- else if (actor.pregData.sizeType == 2)
- return getVolByRaw(actor);
- else
- return 0;
-
- function getCurData(actor, age)
- {
- let i = 0;
- let min, max, ageMin, ageMax, rateMin, rateMax, one, rateOne, rate, cage, csize;
- let data = {};
-
- while (actor.pregData.fetusWeek[i+1] < age && i < actor.pregData.fetusWeek.length-1)
- i++;
-
- min = actor.pregData.fetusSize[i];
- max = actor.pregData.fetusSize[i+1];
- ageMin = actor.pregData.fetusWeek[i];
- ageMax = actor.pregData.fetusWeek[i+1];
- rateMin = actor.pregData.fetusRate[i];
- rateMax = actor.pregData.fetusRate[i+1];
-
- cage = age - ageMin;
-
- one = (max - min) / (ageMax - ageMin);
- rateOne = (rateMax - rateMin) / (ageMax - ageMin);
-
- rate = rateMin + (rateOne * cage);
-
- csize = (min + (one * cage));
- //console.log("min:"+min+" max:"+max+" ageMin:"+ageMin+" ageMax:"+ageMax+" one:"+one+" rateOne:"+rateOne+" cage:"+cage+" rate:"+rate+" csize:"+csize+" final size:"+csize*rate);
-
- data.size = csize;
- data.rate = rate;
-
- return data; //csize * rate;
- //maybe not very effective code, but simple and easy to debug. May be optimized more in future.
- }
-
-
- function getVolByLen(actor){
-
- try {
-
- var phi = 1.618;
- var targetData, targetLen;
- var wombSize = 0;
-
- actor.womb.forEach(ft => {
-
- /* legacy block for debug only
- let gestastionWeek = ft.age;
- let oldLen;
- let oldVol;
- if (gestastionWeek <= 32) {
- oldLen = (0.00006396 * Math.pow(gestastionWeek, 4)) -
- (0.005501 * Math.pow(gestastionWeek, 3)) +
- (0.161 * Math.pow(gestastionWeek, 2)) -
- (0.76 * gestastionWeek) +
- 0.208;
- } else if (gestastionWeek <= 106) {
- oldLen = (-0.0000004675 * Math.pow(gestastionWeek, 4)) +
- (0.0001905 * Math.pow(gestastionWeek, 3)) -
- (0.029 * Math.pow(gestastionWeek, 2)) +
- (2.132 * gestastionWeek) -
- 16.575;
- } else {
- oldLen = (-0.00003266 * Math.pow(gestastionWeek,2)) +
- (0.076 * gestastionWeek) +
- 43.843;
- }
- */
-
- targetData = getCurData(actor, ft.age);
- targetLen = targetData.size * targetData.rate;
-
- ft.volume = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)));
- wombSize += ft.volume;
-
- //oldVol = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((oldLen / 2), 3))); //for debug
-
- //console.log("fetus.age:" + ft.age + " oldLen:"+oldLen+" targetLen:"+targetLen+" ft.volume:"+ft.volume+ " old volume:"+oldVol );
- /*
- I found, that previous targetLen calculation not exactly accurate if compared to the actual medical data chart for fetal length. It's been rough aproximation based only on pregnancy week (giving smaller fetus size then it should in most cases). So I need all this debug code to compare data and verify calculations. After final tweaking I will remove or comment out legacy code. Please not touch this before it.
- Pregmodfan.
- */
- });
- } catch(err){
- WombInit(actor);
- alert("WombGetVolume warning - " + actor.slaveName + " " + err);
- }
- if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
- wombSize = 0;
-
- return wombSize;
-
- }
-
-
- function getVolByWeight(actor)
- {
- var targetData;
- var wombSize = 0;
-
- actor.womb.forEach(ft => {
- targetData = getCurData(actor, ft.age);
-
- wombSize += targetData.size * targetData.rate;
- });
+ if (actor.pregData.sizeType == 0)
+ return getVolByLen(actor);
+ else if (actor.pregData.sizeType == 1)
+ return getVolByWeight(actor);
+ else if (actor.pregData.sizeType == 2)
+ return getVolByRaw(actor);
+ else
+ return 0;
+
+ function getCurData(actor, age)
+ {
+ let i = 0;
+ let min, max, ageMin, ageMax, rateMin, rateMax, one, rateOne, rate, cage, csize;
+ let data = {};
+
+ while (actor.pregData.fetusWeek[i+1] < age && i < actor.pregData.fetusWeek.length-1)
+ i++;
+
+ min = actor.pregData.fetusSize[i];
+ max = actor.pregData.fetusSize[i+1];
+ ageMin = actor.pregData.fetusWeek[i];
+ ageMax = actor.pregData.fetusWeek[i+1];
+ rateMin = actor.pregData.fetusRate[i];
+ rateMax = actor.pregData.fetusRate[i+1];
+
+ cage = age - ageMin;
+
+ one = (max - min) / (ageMax - ageMin);
+ rateOne = (rateMax - rateMin) / (ageMax - ageMin);
+
+ rate = rateMin + (rateOne * cage);
- if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
- wombSize = 0;
+ csize = (min + (one * cage));
+ //console.log("min:"+min+" max:"+max+" ageMin:"+ageMin+" ageMax:"+ageMax+" one:"+one+" rateOne:"+rateOne+" cage:"+cage+" rate:"+rate+" csize:"+csize+" final size:"+csize*rate);
+
+ data.size = csize;
+ data.rate = rate;
+
+ return data; //csize * rate;
+ //maybe not very effective code, but simple and easy to debug. May be optimized more in future.
+ }
- return wombSize;
- }
-
- function getVolByRaw(actor)
- {
- var targetData;
- var wombSize = 0;
+ function getVolByLen(actor){
- actor.womb.forEach(ft => {
+ try {
- targetData = getCurData(actor, ft.age);
+ var phi = 1.618;
+ var targetData, targetLen;
+ var wombSize = 0;
+
+ actor.womb.forEach(ft => {
+
+ /* legacy block for debug only
+ let gestastionWeek = ft.age;
+ let oldLen;
+ let oldVol;
+ if (gestastionWeek <= 32) {
+ oldLen = (0.00006396 * Math.pow(gestastionWeek, 4)) -
+ (0.005501 * Math.pow(gestastionWeek, 3)) +
+ (0.161 * Math.pow(gestastionWeek, 2)) -
+ (0.76 * gestastionWeek) +
+ 0.208;
+ } else if (gestastionWeek <= 106) {
+ oldLen = (-0.0000004675 * Math.pow(gestastionWeek, 4)) +
+ (0.0001905 * Math.pow(gestastionWeek, 3)) -
+ (0.029 * Math.pow(gestastionWeek, 2)) +
+ (2.132 * gestastionWeek) -
+ 16.575;
+ } else {
+ oldLen = (-0.00003266 * Math.pow(gestastionWeek,2)) +
+ (0.076 * gestastionWeek) +
+ 43.843;
+ }
+ */
- wombSize += targetData.size;
+ targetData = getCurData(actor, ft.age);
+ targetLen = targetData.size * targetData.rate;
- });
+ ft.volume = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)));
+ wombSize += ft.volume;
- if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
- wombSize = 0;
+ //oldVol = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((oldLen / 2), 3))); //for debug
- return wombSize;
- }
+ //console.log("fetus.age:" + ft.age + " oldLen:"+oldLen+" targetLen:"+targetLen+" ft.volume:"+ft.volume+ " old volume:"+oldVol );
+ /*
+ I found, that previous targetLen calculation not exactly accurate if compared to the actual medical data chart for fetal length. It's been rough aproximation based only on pregnancy week (giving smaller fetus size then it should in most cases). So I need all this debug code to compare data and verify calculations. After final tweaking I will remove or comment out legacy code. Please not touch this before it.
+ Pregmodfan.
+ */
+ });
+ } catch(err){
+ WombInit(actor);
+ alert("WombGetVolume warning - " + actor.slaveName + " " + err);
+ }
+ if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
+ wombSize = 0;
+
+ return wombSize;
+
+ }
+
+
+ function getVolByWeight(actor)
+ {
+ var targetData;
+ var wombSize = 0;
+
+ actor.womb.forEach(ft => {
+
+ targetData = getCurData(actor, ft.age);
+
+ wombSize += targetData.size * targetData.rate;
+
+ });
+
+ if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
+ wombSize = 0;
+
+ return wombSize;
+ }
+
+
+ function getVolByRaw(actor)
+ {
+ var targetData;
+ var wombSize = 0;
+
+ actor.womb.forEach(ft => {
+
+ targetData = getCurData(actor, ft.age);
+
+ wombSize += targetData.size;
+
+ });
+
+ if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
+ wombSize = 0;
+
+ return wombSize;
+ }
};
@@ -11791,7 +11791,7 @@ window.WombSetGenericReserve = function(actor, type, count)
window.WombAddToGenericReserve = function(actor, type, count)
{
-
+
WombSetGenericReserve(actor, type, (WombReserveCount(actor, type)+count));
}
@@ -11910,7 +11910,7 @@ window.BCReserveInit = function()
try {
if (slave.reservedChildren > 0)
WombSetGenericReserve(slave, "incubator", reservedChildren);
-
+
if (slave.reservedChildrenNursery > 0)
WombSetGenericReserve(slave, "nursery", reservedChildren);
} catch (err) {
diff --git a/readme.txt b/readme.txt
index 27fdcbe2559c1d61d0e80be2ad784ec1a3df6d26..e6806595ec54353d87c29945ef5e28e47f53ca8a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -14,58 +14,58 @@ I wish to report a sanityCheck issue.
[MissingClosingAngleBracket]src/art/vector/Generate_Stylesheet.tw:11:<<print "<style>."+_art_display_class+" {
<<print "<style>."+_art_display_class+" {
- position: absolute;
- height: 100%;
- margin-left: auto;
- margin-right: auto;
- left: 0;
- right: 0;
- }
+ position: absolute;
+ height: 100%;
+ margin-left: auto;
+ margin-right: auto;
+ left: 0;
+ right: 0;
+ }
How to mod (basic doc):
1. All sources now in the src subdir, in separate files. 1 passage = 1 file.
2. Special files and dir's:
- - src/config - configuration of the story is here.
- - src/config/start.tw - contains list of .tw passage files, regenerated automatic, by building scripts. Do not change by hands. (origial passage Start from pregmod renamed and moved to src/events/intro/introSummary.tw)
- - src/js/storyJS.tw - special passage with [script] tag - contain all native JavaScript from pregmod.
- - devTools/tweeGo/targets/sugarcube-2/userlib.js - on original FC JS moved here (I deleted it after moving JS to storyJS.tw). Compare to storyJS.tw but do not copy file here. May conflict with src/js/storyJS.tw if copied.
- - src/pregmod - I put all pregmod-only passages here.
- - .gitignore - special file for git - to ignore some files. For example - compilation results.
+ - src/config - configuration of the story is here.
+ - src/config/start.tw - contains list of .tw passage files, regenerated automatic, by building scripts. Do not change by hands. (original passage Start from pregmod renamed and moved to src/events/intro/introSummary.tw)
+ - src/js/storyJS.tw - special passage with [script] tag - contain all native JavaScript from pregmod.
+ - devTools/tweeGo/targets/sugarcube-2/userlib.js - on original FC JS moved here (I deleted it after moving JS to storyJS.tw). Compare to storyJS.tw but do not copy file here. May conflict with src/js/storyJS.tw if copied.
+ - src/pregmod - I put all pregmod-only passages here.
+ - .gitignore - special file for git - to ignore some files. For example - compilation results.
3. Compilation:
- Windows:
- Run compile.bat - result will be file bin/FC_pregmod.html
- Second run of compile.but will overwrite bin/FC_pregmod.html without prompt.
+ Windows:
+ Run compile.bat - result will be file bin/FC_pregmod.html
+ Second run of compile.but will overwrite bin/FC_pregmod.html without prompt.
- Linux:
- Ensure executable permission on file "devTools/tweeGo/tweego" (not tweego.exe!)
- Ensure executable permission on file "compile"
- In the root dir of sources (where you see src, devTools, bin...) run command "./compile" from console
- compile-git will produce the same result file but with current commit hash in filename.
+ Linux:
+ Ensure executable permission on file "devTools/tweeGo/tweego" (not tweego.exe!)
+ Ensure executable permission on file "compile"
+ In the root dir of sources (where you see src, devTools, bin...) run command "./compile" from console
+ compile-git will produce the same result file but with current commit hash in filename.
- Mac:
- Not supported directly (I don't have access to Mac for testing).
- But you can use linux compilation script if you download tweego for mac from here: https://bitbucket.org/tmedwards/tweego/downloads/ and replace linux executable with mac executable in ./devTools/tweeGo/ folder. This is not tested though, so be warned.
+ Mac:
+ Not supported directly (I don't have access to Mac for testing).
+ But you can use linux compilation script if you download tweego for mac from here: https://bitbucket.org/tmedwards/tweego/downloads/ and replace linux executable with mac executable in ./devTools/tweeGo/ folder. This is not tested though, so be warned.
4. Simple comparing and merging with original FC:
- Use meld tool. Place folder FreeCities (original FC sources tree) near FreeCitiesPregmod (this sources tree) and use command:
- meld FreeCities FreeCitiesPregmod
- or just select these folders in meld's GUI.
+ Use meld tool. Place folder FreeCities (original FC sources tree) near FreeCitiesPregmod (this sources tree) and use command:
+ meld FreeCities FreeCitiesPregmod
+ or just select these folders in meld's GUI.
5. All modders will be very grateful if anyone who makes some changes to game with .html file also post his/her resulting src folder tree.
6. For contributors to pregmod: if you don't use git, then you need to post your version of src folder tree, not just produced FC_pregmod.html file!!! This html file can't be reverted to proper sources, and useless as contribution!
7. Git workflow:
- - Master branch is pregmod-master. Only Pregmodder can add something to it directly. Always contain his last public changes.
- - pregmod-dev - branch with experimental code mainly by pregmodfan.
- - Any contributions will be placed in separate branches like pregmod-mod-<something> (if it's ready to merge with master complete feature/mod) or pregmod-contrib-<something> if it's partial work until contributions is reviewed.
+ - Master branch is pregmod-master. Only Pregmodder can add something to it directly. Always contain his last public changes.
+ - pregmod-dev - branch with experimental code mainly by pregmodfan.
+ - Any contributions will be placed in separate branches like pregmod-mod-<something> (if it's ready to merge with master complete feature/mod) or pregmod-contrib-<something> if it's partial work until contributions is reviewed.
- Typical cycle with git:
+ Typical cycle with git:
1. Make account on gitgud if you don't have usable one.
2. Fork main repository through gitgud interface. (Or pull changes from main repo if you already have fork.)
3. Clone your fork to local machine with git client (Or pull changes if already cloned.)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 575341f8042bcdff8f0f955c13d5906c81a3c9a2..3dde1804e581e80d2ed074dc908dabda2b572200 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3193,7 +3193,7 @@ How many of her children are tagged to be put in the Nursery. Highly likely to b
Reserve type ("incubator", "nursery", etc) do not affect each other types, and can be safely used without any checks.
- Also if you try to reserve more then available and not already reserved fetuses in slave womb, will be reserved only actually existing free fetuses. If you try to clean reserve more then present - wil be cleaned only actually existing reserve.
+ Also if you try to reserve more then available and not already reserved fetuses in slave womb, will be reserved only actually existing free fetuses. If you try to clean reserve more then present - will be cleaned only actually existing reserve.
These reserve functions always use first available fetus(es) - this will be most ready to birth fetuses (older).
WombCleanAllReserve(slave) - will clean all reserves for slave (any type).
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index da1f65eaecaa4d32a51e067cda47cf3f4270ffcf..22286e0bb5d237ceac581ad2f0ebbedee3522dd6 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -450,9 +450,9 @@
<<else>>
//madam//,
<</if>>
- //you trained a fine obedient slave. _He2 certainly understands _his2 position well."// You grit your teeth faking a smile, repeating the old the old adage: @@.yellow;revenge is dish best served cold@@. You have made some enemies tonight; you begin to plan a military conquest of them all. You will enjoy storming their arcologies and making them pay for this insult.
+ //you trained a fine obedient slave. _He2 certainly understands _his2 position well."// You grit your teeth faking a smile, mentally repeating the old adage: @@.yellow;revenge is dish best served cold@@. You have made some enemies tonight; you begin to plan a military conquest of them all. You will enjoy storming their arcologies and making them pay for this insult.
<br><br>
- The abuse your head girl suffers had @@.red;decreased _his2 health@@ and _he2 is @@.mediumorchid;less devoted@@ to you as you allowed _him2 to be abused.
+ The abuse your head girl suffers had @@.red;decreased _his2 health@@ and _he2 is @@.mediumorchid;less devoted@@ to you, as you allowed _him2 to be abused.
<br>
<<set $HeadGirl.health -= 20>>
<<set $HeadGirl.devotion -= 20>>
diff --git a/src/art/vector/Generate_Stylesheet.tw b/src/art/vector/Generate_Stylesheet.tw
index d8df98daab47f8ab7aa97a7ca6fb8210231bbe63..05c134a91085f9710b642d045641166688eaf344 100644
--- a/src/art/vector/Generate_Stylesheet.tw
+++ b/src/art/vector/Generate_Stylesheet.tw
@@ -17,27 +17,27 @@
right: 0;
}
."+_art_display_class+" .white { fill:#FFFFFF; }
-."+_art_display_class+" .skin { fill:"+_skinColour+"; }
-."+_art_display_class+" .head { "+_headSkinStyle+"; }
+."+_art_display_class+" .skin { fill:"+_skinColour+"; }
+."+_art_display_class+" .head { "+_headSkinStyle+"; }
."+_art_display_class+" .torso { "+_torsoSkinStyle+"; }
-."+_art_display_class+" .boob { "+_boobSkinStyle+"; }
+."+_art_display_class+" .boob { "+_boobSkinStyle+"; }
."+_art_display_class+" .penis { "+_penisSkinStyle+"; }
."+_art_display_class+" .scrotum { "+_scrotumSkinStyle+"; }
."+_art_display_class+" .belly { "+_bellySkinStyle+"; }
."+_art_display_class+" .areola { fill:"+_areolaStyle+"; }
."+_art_display_class+" .bellybutton { fill:"+_bellybuttonStyle+"; }
."+_art_display_class+" .labia { fill:"+_labiaStyle+"; }
-."+_art_display_class+" .hair { fill:"+_hairColour+"; }
-."+_art_display_class+" .pubic_hair { fill:"+_pubicHairColour+"; }
+."+_art_display_class+" .hair { fill:"+_hairColour+"; }
+."+_art_display_class+" .pubic_hair { fill:"+_pubicHairColour+"; }
."+_art_display_class+" .underarm_hair { fill:"+_underarmHairColour+"; }
."+_art_display_class+" .eyebrow_hair { fill:"+_eyebrowHairColour+"; }
-."+_art_display_class+" .shoe { fill:"+_shoeColour+"; }
-."+_art_display_class+" .shoe_shadow { fill:"+_shoeShadowColour+"; }
+."+_art_display_class+" .shoe { fill:"+_shoeColour+"; }
+."+_art_display_class+" .shoe_shadow { fill:"+_shoeShadowColour+"; }
."+_art_display_class+" .smart_piercing { fill:#4DB748; }
."+_art_display_class+" .steel_piercing { fill:#787878; }
."+_art_display_class+" .steel_chastity { fill:#BABABA; }
."+_art_display_class+" .outfit_base { fill:"+_outfitBaseColour+"; }
-."+_art_display_class+" .gag { fill:#BF2126; }
+."+_art_display_class+" .gag { fill:#BF2126; }
."+_art_display_class+" .shadow { fill:#010101; }
."+_art_display_class+" .glasses { fill:"+_glassesColor+"; }
."+_art_display_class+" .eye { fill:"+_eyeColor+"; }
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 3dd3100fbafbea22e9a0ad9d027866f62929ddce..ebe39a8acaa994c16bbcdab8eab3739b6a4373be 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2599,10 +2599,10 @@ LORE: INTERVIEWS
<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework, the Hippolyta Academy, and the Security Expansion Mod.
<br>''sensei'' for coding in support for commas and an excellent family tree rework.
<br>''laziestman'' for sexy spats.
- <br>''SFanon (blank)'' for SF related work, passive player skill gain, fulfillment order, player into summary rewrite, updating and re-organising the in-game wiki in addition to the joint Eugenics bad end rework.
+ <br>''SFanon (blank)'' for SF related work, passive player skill gain, fulfillment order, player into summary rewrite, updating and re-organizing the in-game wiki in addition to the joint Eugenics bad end rework.
<br>''anon'' for extending FCGudder's economy reports to the other facilities.
<br>''MilkAnon'' for his contributions to FCTV and the FC world in general.
- <br>''valen102938'' for dealing with vector art, both creating new art and utilising unused art.
+ <br>''valen102938'' for dealing with vector art, both creating new art and utilizing unused art.
<br>''anon'' for making slaves seed their own fields.
<br>''Ansopedi'' for slave career skills.
<br>''Emuis'' for various compiler tweaks
@@ -2618,7 +2618,7 @@ LORE: INTERVIEWS
<br>''editoranon'' for cleaning text and drafting up bodyswap reactions.
<br>''anon'' for the wetware CPU market.
<br>''Autistic Boi'' for Mediterranean market preset.
- <br>''anon'' for the PA subjugationsist and supremacist FS appearances.
+ <br>''anon'' for the PA subjugationist and supremacist FS appearances.
<br>''Editoranon and Milkanon?'' for prison markets and the nursing handjob scene.
<br>''DCoded'' for creating the favicon and adding animals to the Pit, as well as nursery and bestiality content, scenes, facilities and fixes. Also added a pussy licking scene and created and fixed a number of bugs.
<br>''HiveBro'' for giving hyperpregnant slaves some serious loving.
diff --git a/src/js/slaveGenerationJS.tw b/src/js/slaveGenerationJS.tw
index 34bdb344d5a7a80f210128d23d3ff88cec6deb61..be4a9256396460d47effce2377981a14a4e3acb2 100644
--- a/src/js/slaveGenerationJS.tw
+++ b/src/js/slaveGenerationJS.tw
@@ -6,12 +6,12 @@ window.nationalityToRace = function nationalityToRace(slave) {
window.raceToNationality = function raceToNationality(slave) {
/* Maximum of 100 attempts */
- for (var i = 0; setup.raceSelector[s.nationality] && !(s.race in setup.raceSelector[s.nationality]) && i < 100; i++) {
- s.nationality = hashChoice($nationalities);
+ for (var i = 0; setup.raceSelector[slave.nationality] && !(slave.race in setup.raceSelector[slave.nationality]) && i < 100; i++) {
+ slave.nationality = hashChoice($nationalities);
}
/* No success after 100 attempts, so just randomize according to race */
- if (setup.raceSelector[s.nationality] && !(s.race in setup.raceSelector[s.nationality]) && i == 100) {
- s.nationality = Object.keys(setup[s.race.toLowerCase().replace(/[ -]/g, '')+'Nationalities']).random();
+ if (setup.raceSelector[slave.nationality] && !(slave.race in setup.raceSelector[slave.nationality]) && i == 100) {
+ slave.nationality = Object.keys(setup[slave.race.toLowerCase().replace(/[ -]/g, '')+'Nationalities']).random();
}
};
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index b830ec7c8d00ac37c966d8d83748f4d958e72161..03ade034d8c335c7edfddb986983d24003484d1e 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -45,12 +45,12 @@ window.WombInit = function(actor) {
actor.readyOva = 0;
}
- if ( actor.pregData == undefined)
- {
- actor.pregData = deepCopy( setup.pregData.human );
- //Setup should be through deep copy, so in future, if we like, these values can be changed individually. Gameplay expansion posibilities. But for dev time to simplify debugging:
- //actor.pregData = setup.pregData.human; // any changes in setup pregData template will be applied immideatly to all. But can't be made seperate changes.
- }
+ if ( actor.pregData == undefined)
+ {
+ actor.pregData = deepCopy( setup.pregData.human );
+ //Setup should be through deep copy, so in future, if we like, these values can be changed individually. Gameplay expansion posibilities. But for dev time to simplify debugging:
+ //actor.pregData = setup.pregData.human; // any changes in setup pregData template will be applied immideatly to all. But can't be made seperate changes.
+ }
//backward compatibility setup. Fully accurate for normal pregnancy only.
if (actor.womb.length > 0 && actor.womb[0].genetics == undefined) {
@@ -193,146 +193,146 @@ window.WombBirthReady = function(actor, readyAge) {
window.WombGetVolume = function(actor) { //most legacy code from pregJS.tw with minor adaptation.
- if (actor.pregData.sizeType == 0)
- return getVolByLen(actor);
- else if (actor.pregData.sizeType == 1)
- return getVolByWeight(actor);
- else if (actor.pregData.sizeType == 2)
- return getVolByRaw(actor);
- else
- return 0;
-
- function getCurData(actor, age)
- {
- let i = 0;
- let min, max, ageMin, ageMax, rateMin, rateMax, one, rateOne, rate, cage, csize;
- let data = {};
-
- while (actor.pregData.fetusWeek[i+1] < age && i < actor.pregData.fetusWeek.length-1)
- i++;
+ if (actor.pregData.sizeType == 0)
+ return getVolByLen(actor);
+ else if (actor.pregData.sizeType == 1)
+ return getVolByWeight(actor);
+ else if (actor.pregData.sizeType == 2)
+ return getVolByRaw(actor);
+ else
+ return 0;
- min = actor.pregData.fetusSize[i];
- max = actor.pregData.fetusSize[i+1];
- ageMin = actor.pregData.fetusWeek[i];
- ageMax = actor.pregData.fetusWeek[i+1];
- rateMin = actor.pregData.fetusRate[i];
- rateMax = actor.pregData.fetusRate[i+1];
+ function getCurData(actor, age)
+ {
+ let i = 0;
+ let min, max, ageMin, ageMax, rateMin, rateMax, one, rateOne, rate, cage, csize;
+ let data = {};
- cage = age - ageMin;
+ while (actor.pregData.fetusWeek[i+1] < age && i < actor.pregData.fetusWeek.length-1)
+ i++;
- one = (max - min) / (ageMax - ageMin);
- rateOne = (rateMax - rateMin) / (ageMax - ageMin);
+ min = actor.pregData.fetusSize[i];
+ max = actor.pregData.fetusSize[i+1];
+ ageMin = actor.pregData.fetusWeek[i];
+ ageMax = actor.pregData.fetusWeek[i+1];
+ rateMin = actor.pregData.fetusRate[i];
+ rateMax = actor.pregData.fetusRate[i+1];
- rate = rateMin + (rateOne * cage);
+ cage = age - ageMin;
- csize = (min + (one * cage));
- //console.log("min:"+min+" max:"+max+" ageMin:"+ageMin+" ageMax:"+ageMax+" one:"+one+" rateOne:"+rateOne+" cage:"+cage+" rate:"+rate+" csize:"+csize+" final size:"+csize*rate);
+ one = (max - min) / (ageMax - ageMin);
+ rateOne = (rateMax - rateMin) / (ageMax - ageMin);
- data.size = csize;
- data.rate = rate;
+ rate = rateMin + (rateOne * cage);
- return data; //csize * rate;
- //maybe not very effective code, but simple and easy to debug. May be optimized more in future.
- }
+ csize = (min + (one * cage));
+ //console.log("min:"+min+" max:"+max+" ageMin:"+ageMin+" ageMax:"+ageMax+" one:"+one+" rateOne:"+rateOne+" cage:"+cage+" rate:"+rate+" csize:"+csize+" final size:"+csize*rate);
+ data.size = csize;
+ data.rate = rate;
- function getVolByLen(actor){
+ return data; //csize * rate;
+ //maybe not very effective code, but simple and easy to debug. May be optimized more in future.
+ }
- try {
- var phi = 1.618;
- var targetData, targetLen;
- var wombSize = 0;
+ function getVolByLen(actor){
- actor.womb.forEach(ft => {
+ try {
- /* legacy block for debug only
- let gestastionWeek = ft.age;
- let oldLen;
- let oldVol;
- if (gestastionWeek <= 32) {
- oldLen = (0.00006396 * Math.pow(gestastionWeek, 4)) -
- (0.005501 * Math.pow(gestastionWeek, 3)) +
- (0.161 * Math.pow(gestastionWeek, 2)) -
- (0.76 * gestastionWeek) +
- 0.208;
- } else if (gestastionWeek <= 106) {
- oldLen = (-0.0000004675 * Math.pow(gestastionWeek, 4)) +
- (0.0001905 * Math.pow(gestastionWeek, 3)) -
- (0.029 * Math.pow(gestastionWeek, 2)) +
- (2.132 * gestastionWeek) -
- 16.575;
- } else {
- oldLen = (-0.00003266 * Math.pow(gestastionWeek,2)) +
- (0.076 * gestastionWeek) +
- 43.843;
- }
- */
+ var phi = 1.618;
+ var targetData, targetLen;
+ var wombSize = 0;
+
+ actor.womb.forEach(ft => {
+
+ /* legacy block for debug only
+ let gestastionWeek = ft.age;
+ let oldLen;
+ let oldVol;
+ if (gestastionWeek <= 32) {
+ oldLen = (0.00006396 * Math.pow(gestastionWeek, 4)) -
+ (0.005501 * Math.pow(gestastionWeek, 3)) +
+ (0.161 * Math.pow(gestastionWeek, 2)) -
+ (0.76 * gestastionWeek) +
+ 0.208;
+ } else if (gestastionWeek <= 106) {
+ oldLen = (-0.0000004675 * Math.pow(gestastionWeek, 4)) +
+ (0.0001905 * Math.pow(gestastionWeek, 3)) -
+ (0.029 * Math.pow(gestastionWeek, 2)) +
+ (2.132 * gestastionWeek) -
+ 16.575;
+ } else {
+ oldLen = (-0.00003266 * Math.pow(gestastionWeek,2)) +
+ (0.076 * gestastionWeek) +
+ 43.843;
+ }
+ */
- targetData = getCurData(actor, ft.age);
- targetLen = targetData.size * targetData.rate;
+ targetData = getCurData(actor, ft.age);
+ targetLen = targetData.size * targetData.rate;
- ft.volume = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)));
- wombSize += ft.volume;
+ ft.volume = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)));
+ wombSize += ft.volume;
- //oldVol = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((oldLen / 2), 3))); //for debug
+ //oldVol = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((oldLen / 2), 3))); //for debug
- //console.log("fetus.age:" + ft.age + " oldLen:"+oldLen+" targetLen:"+targetLen+" ft.volume:"+ft.volume+ " old volume:"+oldVol );
- /*
- I found, that previous targetLen calculation not exactly accurate if compared to the actual medical data chart for fetal length. It's been rough aproximation based only on pregnancy week (giving smaller fetus size then it should in most cases). So I need all this debug code to compare data and verify calculations. After final tweaking I will remove or comment out legacy code. Please not touch this before it.
- Pregmodfan.
- */
- });
- } catch(err){
- WombInit(actor);
- alert("WombGetVolume warning - " + actor.slaveName + " " + err);
- }
- if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
- wombSize = 0;
+ //console.log("fetus.age:" + ft.age + " oldLen:"+oldLen+" targetLen:"+targetLen+" ft.volume:"+ft.volume+ " old volume:"+oldVol );
+ /*
+ I found, that previous targetLen calculation not exactly accurate if compared to the actual medical data chart for fetal length. It's been rough aproximation based only on pregnancy week (giving smaller fetus size then it should in most cases). So I need all this debug code to compare data and verify calculations. After final tweaking I will remove or comment out legacy code. Please not touch this before it.
+ Pregmodfan.
+ */
+ });
+ } catch(err){
+ WombInit(actor);
+ alert("WombGetVolume warning - " + actor.slaveName + " " + err);
+ }
+ if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
+ wombSize = 0;
- return wombSize;
+ return wombSize;
- }
+ }
- function getVolByWeight(actor)
- {
- var targetData;
- var wombSize = 0;
+ function getVolByWeight(actor)
+ {
+ var targetData;
+ var wombSize = 0;
- actor.womb.forEach(ft => {
+ actor.womb.forEach(ft => {
- targetData = getCurData(actor, ft.age);
+ targetData = getCurData(actor, ft.age);
- wombSize += targetData.size * targetData.rate;
+ wombSize += targetData.size * targetData.rate;
- });
+ });
- if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
- wombSize = 0;
+ if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
+ wombSize = 0;
- return wombSize;
- }
+ return wombSize;
+ }
- function getVolByRaw(actor)
- {
- var targetData;
- var wombSize = 0;
+ function getVolByRaw(actor)
+ {
+ var targetData;
+ var wombSize = 0;
- actor.womb.forEach(ft => {
+ actor.womb.forEach(ft => {
- targetData = getCurData(actor, ft.age);
+ targetData = getCurData(actor, ft.age);
- wombSize += targetData.size;
+ wombSize += targetData.size;
- });
+ });
- if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
- wombSize = 0;
+ if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
+ wombSize = 0;
- return wombSize;
- }
+ return wombSize;
+ }
};
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 4a3b41cf82566bf94fd8ee76c2cf6efdc3283aaf..fb4d6cccf19a234aa1b97a271e99f05aa90ff751 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -951,8 +951,8 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<br>Lower Class Citizens | <<print $lowerClass>> | <<print _percLowerClass>>%
<br>Middle Class Citizens | <<print $middleClass>> | <<print _percMiddleClass>>%
<br>Upper Class Citizens | <<print $upperClass>> | <<print _percUpperClass>>%
-<br>Millionaires | <<print $topClass>> | <<print _percTopClass>>%
-<br>Slaves | <<print $ASlaves>> | <<print _percASlaves>>%
+<br>Millionaires | <<print $topClass>> | <<print _percTopClass>>%
+<br>Slaves | <<print $ASlaves>> | <<print _percASlaves>>%
<br>
<br><<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>>
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>The citizens take pride in their martial duties, preferring to wear utilitarian clothing even when off duty.<</if>>
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index a275ebbcae8d32aaafa92c1f4342f112ffdec84e..88c0313d193e5217a26e11d355c786d35bc298b3 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -57,7 +57,7 @@ gets milked this week.
<<if ($slaves[$i].boobsMilk > 0)>>
$He was in need of a good milking, too.
<</if>>
-
+
<<if ($slaves[$i].devotion > 50)>>
$He's such a happy cow that $his mental state has a positive impact on $his production.
<<elseif ($slaves[$i].devotion < -50)>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index bf9c8ce7ce335d5be6b0bbc6baa805a5b5270101..7e553ea66af2414bed62e77b4cecd22b7aa7b96f 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -1081,14 +1081,14 @@ serves you this week.
<</if>>
<</if>>
<</if>>
-
+
<<if $slaves[$i].lactation > 0 && _mammaryUse > 0>>
<<set $slaves[$i].lactationDuration = 2>>
<<if $slaves[$i].boobsMilk > 0>>
<<set $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>>
<</if>>
<</if>>
-
+
<</if>>
<<if $slaves[$i].need>>
diff --git a/src/uncategorized/saServeYourOtherSlaves.tw b/src/uncategorized/saServeYourOtherSlaves.tw
index d776ea38117ab70a9ce7965ce6b8287778d04f13..18644819444dc1cfe43e226193b1f73b7bc8abf9 100644
--- a/src/uncategorized/saServeYourOtherSlaves.tw
+++ b/src/uncategorized/saServeYourOtherSlaves.tw
@@ -66,7 +66,7 @@
With little competition for $his body and so many slaves eager to use $him, $his dreams of being the center of attention are @@.hotpink;have come true.@@
<<if $slaves[$i].weight < 10 && $slaves[$i].belly < 100>>
<<if canDoVaginal($slaves[$i]) && $slaves[$i].vagina > 0 && canDoAnal($slaves[$i]) && $slaves[$i].anus > 0>>
- $He ends each day cradling $his cum swollen stomach, marvelling at the "attention" bestowed upon $him.
+ $He ends each day cradling $his cum swollen stomach, marveling at the "attention" bestowed upon $him.
<<elseif (canDoVaginal($slaves[$i]) && $slaves[$i].vagina > 0) || (canDoAnal($slaves[$i]) && $slaves[$i].anus > 0)>>
By the end of the day, $his stomach has a noticeable bulge to it from all the "attention" bestowed upon $him.
<</if>>
@@ -102,7 +102,7 @@
With little competition for $his body and so many slaves eager to use $him, $his dreams of being the center of attention are @@.hotpink;have come true.@@
<<if $slaves[$i].weight < 10 && $slaves[$i].belly < 100>>
<<if canDoVaginal($slaves[$i]) && $slaves[$i].vagina > 0 && canDoAnal($slaves[$i]) && $slaves[$i].anus > 0>>
- $He ends each day cradling $his cum swollen stomach, marvelling at the "attention" bestowed upon $him.
+ $He ends each day cradling $his cum swollen stomach, marveling at the "attention" bestowed upon $him.
<<elseif (canDoVaginal($slaves[$i]) && $slaves[$i].vagina > 0) || (canDoAnal($slaves[$i]) && $slaves[$i].anus > 0)>>
By the end of the day, $his stomach has a noticeable bulge to it from all the "attention" bestowed upon $him.
<</if>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index e4fde321faf77635ab1dea7cf17d1a6f756acb6c..85328a79883399232d08fd56c206966cbbbc2167 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -28,7 +28,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<case "wetware">>
- You're in the corner of the slave market occupied by scientists and programmers, pioneers in perfecting the skills of slaves by removing all external stimuli and subjecting them to an inhumane regimen of simulated sexual and career training. Although their bodies are ruined, these slaves are guarranteed to be intelligent, skilled and trained in a variety of jobs. If you're willing to perform extensive repairs<<if $bodyswapAnnounced>>, or have a spare body ready<</if>>, these slaves have high potential in almost any role in your arcology.
+ You're in the corner of the slave market occupied by scientists and programmers, pioneers in perfecting the skills of slaves by removing all external stimuli and subjecting them to an inhumane regimen of simulated sexual and career training. Although their bodies are ruined, these slaves are guaranteed to be intelligent, skilled and trained in a variety of jobs. If you're willing to perform extensive repairs<<if $bodyswapAnnounced>>, or have a spare body ready<</if>>, these slaves have high potential in almost any role in your arcology.
<<set _wetware = random(1,4)>>
<<if _wetware == 1>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 5bb0980c29e44ebf9033b6a9f81c905458375d9c..83c2a67ce464deb5ca16e039a21c757de6dc6608 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -486,7 +486,7 @@ As the remote surgery's long recovery cycle completes,
<<case "preg1hack">>
The hacking process is brief, being little more than inserting the actuator into $his vagina, and leaves $him with @@.red;nothing more than minor health effects@@ from the altered implant functions. $He leaves the surgery without any specific feeling, but $he knows that something has been done to $his implant.
- <<set $activeSlave.broodmotherFetuses = either(2,2,2,2,3,3,4)>> /*My testing show that 2 or 3 relatively safe for generic adult slave with effective curvatives or clinic, 4 - high risk of bursting. So there is a catch with it.*/
+ <<set $activeSlave.broodmotherFetuses = either(2, 2, 2, 2, 3, 3, 4)>> /*My testing show that 2 or 3 relatively safe for generic adult slave with effective curatives or clinic, 4 - high risk of bursting. So there is a catch with it.*/
<<if $activeSlave.fetish == "mindbroken">>
/*nothing*/
<<elseif ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
@@ -879,13 +879,13 @@ As the remote surgery's long recovery cycle completes,
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
When $he exits the room, $he feels that $his face is numb,
<<if $activeSlave.devotion > 50>>
- $he <<if canSee($activeSlave)>>throws a glance at the mirror<<else>>listens closely to your description<</if>>, and seems to be @@.hotpink;in awe@@ of how much $his face has been beautified by a small scar.
+ $he <<if canSee($activeSlave)>>throws a glance at the mirror<<elseif canHear($activeSlave)>>listens closely to your description<<else>>gets the feel of $his facial alteration<</if>>, and seems to be @@.hotpink;in awe@@ of how much $his face has been beautified by a small scar.
<<set $activeSlave.devotion += 5>>
<<elseif $activeSlave.devotion > 20>>
- and when $he <<if canSee($activeSlave)>>looks at the mirror<<else>>listens to your description<</if>>, $he seems @@.hotpink;pleased@@ with $his new exotic scar.
+ and when $he <<if canSee($activeSlave)>>throws a glance at the mirror<<elseif canHear($activeSlave)>>listens closely to your description<<else>>gets the feel of $his facial alteration<</if>>, $he seems @@.hotpink;pleased@@ with $his new exotic scar.
<<set $activeSlave.devotion += 5>>
<<else>>
- and, <<if canSee($activeSlave)>>looking at $himself in the mirror<<else>>listening to the description of $his new look<</if>>, $he seems @@.hotpink;thankful@@ for the distinguishing scar, but @@.gold;scared@@ that it might only be some way to brand $him.
+ and, <<if canSee($activeSlave)>>looking at $himself in the mirror<<elseif canHear($activeSlave)>>listening to the description of $his new look<<else>>getting the feel of $his facial alteration<</if>>, $he seems @@.hotpink;thankful@@ for the distinguishing scar, but @@.gold;scared@@ that it might only be some way to brand $him.
<<set $activeSlave.devotion += 5>>
<<set $activeSlave.trust -= 5>>
<</if>>
@@ -1819,7 +1819,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<case "beautyPLimbs">>
- $His Limb upgrades took place in the surgery, since its manipulators are well suited to delicate work on circuitry and ceramics as well as on flesh. $He exits the surgery <<if canSee($activeSlave)>>marvelling at the beautiful, natural appearance of $his new arms and legs<<else>>thanking you for $his new arms and legs, unaware of how natural they look<</if>>.
+ $His Limb upgrades took place in the surgery, since its manipulators are well suited to delicate work on circuitry and ceramics as well as on flesh. $He exits the surgery <<if canSee($activeSlave)>>marveling at the beautiful, natural appearance of $his new arms and legs<<else>>thanking you for $his new arms and legs, unaware of how natural they look<</if>>.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<<if $activeSlave.devotion <= 20>>
$He's @@.mediumaquamarine;more willing to trust you@@ after this. If $he doubts that you have some sort of long term plan for $him, all $he has to do is <<if canSee($activeSlave)>>look down and examine<<else>>feel<</if>> $his elegant, natural prosthetics, which are often mistaken for the genuine article. Even $he makes the mistake at times as $he gets used to them.
@@ -1849,7 +1849,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<case "cyberPLimbs">>
- $His Limb upgrades were performed in the surgery, since its manipulators are well suited to delicate work on their circuitry as well as on flesh. $He exits the surgery marvelling <<if canSee($activeSlave)>>at the shiny artificial skin of $his new arms and legs<<else>>at the feel of the artificial skin of $his new arms and legs under $his new fingers<</if>>.
+ $His Limb upgrades were performed in the surgery, since its manipulators are well suited to delicate work on their circuitry as well as on flesh. $He exits the surgery marveling <<if canSee($activeSlave)>>at the shiny artificial skin of $his new arms and legs<<else>>at the feel of the artificial skin of $his new arms and legs under $his new fingers<</if>>.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<<if $activeSlave.devotion <= 20>>
$He's @@.gold;frightened,@@ once $he discovers what $he can do, and what $he is. $His cybernetic limbs are restricted by the arcology systems, for now, but $he quickly realizes what they are. $He is not, to say the least, thrilled by the revelation that $he is now a living weapon, and is kept awake by thoughts of what you might be planning for $him.
@@ -1979,7 +1979,7 @@ As the remote surgery's long recovery cycle completes,
$He was already an anal slut, but $he can now experience anal pleasure along an entirely new dimension. $He's @@.hotpink;extremely grateful,@@ and @@.lightsalmon;a more eager buttslut than ever.@@
<<set $activeSlave.devotion += 5, $activeSlave.fetishStrength = Math.clamp($activeSlave.fetishStrength+20,0,100)>>
<<else>>
- As a sex slave, $he has of course heard of the pleasure of prostate stimulation,<<if $activeSlave.genes == "XY">> not to mention having once had one $himself,<</if>> and $he's @@.hotpink;duly grateful@@ that you've altered $him in a way that will make sexual duties more enjoyable.
+ As a sex slave, $he <<if canHear($activeSlave)>>has of course heard of<<else>>is of course familiar with<</if>> the pleasure of prostate stimulation,<<if $activeSlave.genes == "XY">> not to mention having once had one $himself,<</if>> and $he's @@.hotpink;duly grateful@@ that you've altered $him in a way that will make sexual duties more enjoyable.
<</if>>
<<set $activeSlave.devotion += 5>>
<<elseif ($activeSlave.devotion > 20)>>
@@ -2506,7 +2506,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<</if>>
<<if _physicalChanges.length > 0>>
- $He can <<if ((_genitalChanges.length > 0) || (_hairChanges > 0))>>also<</if>> _sense that $his body has some physical changes, it seems to $his that
+ $He can <<if ((_genitalChanges.length > 0) || (_hairChanges > 0))>>also<</if>> _sense that $his body has some physical changes, it seems to $him that
<<if _physicalChanges.length > 2>>
<<for _sd = 0; _sd < _physicalChanges.length; _sd++>>
<<if _sd < _physicalChanges.length-1>>
@@ -2520,7 +2520,7 @@ As the remote surgery's long recovery cycle completes,
<<else>>
_physicalChanges[0]
<</if>>
- <<set _reaction = either('comes as a bit of a surprise', 'comes as quite a shock', "doesn't seem to phase " + $him, "confirms " + $his + " suspicions", $he + ' finds interesting', $he + " can't get over") + '.'>>
+ <<set _reaction = either('comes as a bit of a surprise', 'comes as quite a shock', "confirms " + $his + " suspicions", "doesn't seem to phase " + $him, $he + ' finds interesting', $he + " can't get over") + '.'>>
which _reaction
<</if>>
<<if _statusChanges.length > 0>>
@@ -2558,9 +2558,9 @@ As the remote surgery's long recovery cycle completes,
<</switch>>
-<<if ($PC.medicine >= 100) && !["basicPLimbs", "sexPLimbs", "beautyPLimbs", "combatPLimbs", "cyberPLimbs"].includes($surgeryType)>>
+<<if ($PC.medicine >= 100) && !["basicPLimbs", "beautyPLimbs", "combatPLimbs", "cyberPLimbs", "sexPLimbs"].includes($surgeryType)>>
<br><br>
- <<if !["insemination", "braces", "removeBraces", "chem castrate", "body hair removal", "hair removal", "eyebrow removal"].includes($surgeryType)>>
+ <<if !["body hair removal", "braces", "chem castrate", "eyebrow removal", "hair removal", "insemination", "removeBraces"].includes($surgeryType)>>
Since you @@.springgreen;performed the surgery yourself,@@ and you do artist's work, $his health is @@.green;less affected@@ by the surgery than it would have been if you'd paid some hack to do it remotely.
<<set $activeSlave.health += 5>>
<</if>>
@@ -2576,7 +2576,7 @@ As the remote surgery's long recovery cycle completes,
$He is @@.mediumorchid;even more hateful@@ of you afterward than $he would otherwise be. It must seem to $him that $he's nothing more than a test subject to you.
<<set $activeSlave.devotion -= 5>>
<</if>>
- <<elseif !["insemination", "braces", "removeBraces"].includes($surgeryType)>>
+ <<elseif !["braces", "insemination", "removeBraces"].includes($surgeryType)>>
<<if ($activeSlave.devotion > 50)>>
Since $he's happy with the results, $he's almost beside $himself with @@.hotpink;gratitude,@@ and filled with @@.mediumaquamarine;admiration@@ of your skill.
<<set $activeSlave.devotion += 4, $activeSlave.trust += 4>>