diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 28cc1c7205f96e64aa21033d6fad286a523048d8..6ac09367631d2ebb36b0cd371ba3c2086f7a5a27 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@ Pregmod
0.10.7.1-2.2.x
+03/10/2019
+
+ 1
+ -fixes
+ -code cleaning
+
03/09/2019
0
diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw
index c37234256cb1862e4b1150431a02a71a40ffd15f..b4bd0614891b390d37ea1fc80e4568c78d446b8a 100644
--- a/src/SecExp/edicts.tw
+++ b/src/SecExp/edicts.tw
@@ -28,6 +28,7 @@
<br>''Legal aid for new businesses:'' New businesses can rely on your help for legal expenses and issues.
[[Repeal|edicts][$tradeLegalAid = 0, $edictsUpkeep -= 1000]]
<</if>>
+
<<if $taxTrade == 1>>
<br>''Trade tariffs:'' all goods transitioning in your arcology have to pay a transition fee.
[[Repeal|edicts][$taxTrade = 0]]
@@ -93,7 +94,7 @@
<</if>>
<<if $hasFoughtOnce == 1>>
-<br><br>__Defense Force:__
+ <br><br>__Defense Force:__
<<if $soldierWages == 0>>
<br>''Low wages for soldiers:'' wages for soldiers are set to a low level compared to market standards.
[[Repeal|edicts][$soldierWages = 1]]
@@ -423,7 +424,7 @@
<</if>>
<<if $hasFoughtOnce == 1 || $mercenaries > 0>>
-<br><br>__Defense Force__:
+ <br><br>__Defense Force__:
<<if $soldierWages == 0>>
<br>''Average wages for soldiers:'' will set the wages paid to the soldiers of the arcology to an average amount.
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 02c30b35092600b008ae03520e6354443fe0b96b..dac9a124aee0e42d73ee7097fc2b1e6a47535fed 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -6,7 +6,7 @@
This sector of the arcology has been dedicated to weapons manufacturing. These factories supply
<<if $militiaUnits.length > 0>> your militia and<</if>>
<<if $slaveUnits.length > 0>> your slave soldiers and<</if>>
-<<if $mercenaries >0>> your mercenaries and<</if>>
+<<if $mercenaries > 0>> your mercenaries and<</if>>
many small old world nations as the advanced technology that free cities have available is hard to come by otherwise.
<br>
<<if $weapProductivity == 1>>
diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw
index 9cea530ae172d099502f8d03c29fe0528ae27731..e1aaa7b15af009ee9869d00b0b82262811cd2770 100644
--- a/src/SpecialForce/Upgrades.tw
+++ b/src/SpecialForce/Upgrades.tw
@@ -3,7 +3,7 @@
<<else>>There are no more upgrades available.<</if>>
<<if $SF.Upgrade > 0 && ($SF.Size !== _max)>>
<<set _cost = Math.ceil(Math.abs($cash*.05*(1.25+($SF.Size/1000))))>>
- <br>[[Re-unlock upgrading.|Firebase][$SF.Upgrade = 0,cashX(forceNeg(_cost), "specialForces")]] @@.red;<<print cashFormat(_cost)>> <</if>>
+ <br>[[Re-unlock upgrading.|Firebase][$SF.Upgrade = 0,cashX(forceNeg(_cost), "specialForces")]] @@.red;<<print cashFormat(_cost)>>@@ <</if>>
<<if ($SF.Size < 30||$SF.Size !== _max) && $SF.Upgrade < 1>>
<br>Which facility or equipment do you wish to upgrade this week? <br>
@@ -169,4 +169,4 @@
[[Build $SF.Lower's support facility|Firebase][$SF.Upgrade = 1, $SF.Facility.Active++, cashX(forceNeg(_cSFF), "specialForces")]]
<<else>>//Cannot afford to build $SF.Lower's support facility.//<</if>>
//Costs @@.red;<<print cashFormat(_cSFF)>>@@//
- <</if>>*/
\ No newline at end of file
+ <</if>>*/
diff --git a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
index ec7216a9b3c10838619749fd5e66e8daed2ed42b..a31efdc29ca76624ae86509997b85c8137ca6add 100644
--- a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
@@ -170,7 +170,7 @@
<<print "No Giant Clit when Dick is present, reset Clit to 0 (Normal)" >><br>
<<set $tempSlave.clit = 0>>
<</if>>
-<<if ($tempSlave.ovaries == 0) && ($tempSlave.mpreg == 0) && ($tempSlave.preg >0)>>
+<<if ($tempSlave.ovaries == 0) && ($tempSlave.mpreg == 0) && ($tempSlave.preg > 0)>>
<<print "Slave has no Ovaries and no Analwomb, Pregnancy reset to 0">><br>
<<set $tempSlave.preg = 0>>
<<set $tempSlave.pregType = 0>>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 1c728cf332cc896254d3b56b4c8d1dc89602356b..2f31c1f92ca53323524bbe2a19d83ee8dadcb03f 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -2740,7 +2740,7 @@
<<if $tempSlave.brand == 0>>
''$He has no Branding''
<<else>>
- ''@@.yellow;$He has $tempSlave.brand branded onto $his <<if $tempSlave.brandLocation == 0>>@@.red;[NEEDS TO BE SET]<<else>> $tempSlave.brandLocation @@<</if>>''
+ ''@@.yellow;$He has $tempSlave.brand branded onto $his <<if $tempSlave.brandLocation == 0>>@@.red;[NEEDS TO BE SET]<<else>> $tempSlave.brandLocation <</if>>@@''
<</if>>
<br><br>
''Branding Location:''
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index d4e358b389e6612496853e6b325b9b550de1d8aa..59a49e80b1de30a60aac6e5481e5f900e9c5a3d2 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -140,7 +140,7 @@
<<print "No Giant Clit when Dick is present, reset Clit to 0 (Normal)" >><br>
<<set $tempSlave.clit = 0>>
<</if>>
-<<if ($tempSlave.ovaries == 0) && ($tempSlave.mpreg == 0) && ($tempSlave.preg >0)>>
+<<if ($tempSlave.ovaries == 0) && ($tempSlave.mpreg == 0) && ($tempSlave.preg > 0)>>
<<print "Slave has no Ovaries and no Analwomb, Pregnancy reset to 0">><br>
<<set $tempSlave.preg = 0>>
<<set $tempSlave.pregType = 0>>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index f092aaa93cde4d1a7389adf984e1ca8b54f10e05..22517df9db9e42cd7fe1577db0c61cd3f276df20 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -3546,7 +3546,7 @@
<<if $tempSlave.brand == 0>>
''$He has no Branding''
<<else>>
- ''@@.yellow;$He has $tempSlave.brand branded onto $his <<if $tempSlave.brandLocation == 0>>@@.red;[NEEDS TO BE SET]<<else>> $tempSlave.brandLocation @@<</if>>''
+ ''@@.yellow;$He has $tempSlave.brand branded onto $his <<if $tempSlave.brandLocation == 0>>@@.red;[NEEDS TO BE SET]<<else>> $tempSlave.brandLocation <</if>>@@''
<</if>>
<br><br>
''Branding Location:''
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index 0eda81903843d86aaea0abac4bb20071c8b481d8..760106b9eeeed54014ee3ca43e64014d387b4169 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -70,7 +70,7 @@
sortButtonsByTrust();
<</script>>
<</link>>
- <br/>
+ <br>
<div id="qlWrapper" class="quicklist devotion">
<<for !_.isUndefined(_buttons[0])>>
<<set _button = _buttons.shift()>>
@@ -215,7 +215,7 @@ will
<<if ((_Pass != 'Main') || (def $Flag) || ($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))>>
<<print '<span id="slave-' + $cribs[_csi].ID + '"> </span>'>>
<</if>>
-<br/>
+<br>
<<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<run clearSummaryCache()>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 7894ccae20ca7e7f2c7a9dc0523cd52e4c39591f..82ffaf2dc8cdfe2dd613082073649b8a99bcef1f 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -183,7 +183,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<<if (0 < _SL)>>
<<set $sortNurseryList = $sortNurseryList || 'Unsorted'>>
- <br/>//Sorting:// ''<span id="qlNurserySort">$sortNurseryList</span>.''
+ <br>//Sorting:// ''<span id="qlNurserySort">$sortNurseryList</span>.''
<<link "Sort by Name">>
<<set $sortNurseryList = 'Name'>>
<<replace "#qlNurserySort">>$sortNurseryList<</replace>>
@@ -212,7 +212,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
sortNurseryPossiblesByPregnancyCount();
<</script>>
<</link>>
- <br/>
+ <br>
<</if>>
<div id="qlNursery">
<<for _u = 0; _u < _SL; _u++>>
@@ -470,7 +470,7 @@ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery
<br><br>''Children in $nurseryName''
<br>
/* FOR TESTING */
- <<for _c = 0; _c <$cribs.length; _c++>>
+ <<for _c = 0; _c < $cribs.length; _c++>>
<<link "$cribs[_c].slaveName" "Long Child Description">>
<<include "Child Summary">>
<</link>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 0b8a30061aa2d59d354e08ebebeb865341439557..7638bd8a7e74cb96d33cd6a1f4516e2d5ad55ce1 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -505,9 +505,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $dairyPregSettingChanged = 0>>
<<set $dairyRestraintsUpgrade = 0>>
<<set $dairyRestraintsSetting = 0>>
-<<silently>>
- DairyRestraintsSetting($dairyRestraintsSetting)
-<</silently>>
<<set $dairySlimMaintainUpgrade = 0>>
<<set $dairySlimMaintain = 0>>
<<set $dairyHyperPregRemodel = 0>>
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index eab6e9b9c524535197b8280c3867120966e58c91..368227ad92dde2ff3a5297f94d6dcb712645377c 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -202,24 +202,13 @@ window.isSlaveAvailable = /** @param {App.Entity.SlaveState} slave */ function (
return false;
} else if (slave.assignment === "be confined in the arcade") {
return false;
- } else if (slave.assignment === "work in the dairy" && State.variables.DairyRestraintsSetting >= 2) {
+ } else if (slave.assignment === "work in the dairy" && State.variables.dairyRestraintsSetting >= 2) {
return false;
} else {
return true;
}
};
-if (typeof DairyRestraintsSetting === "undefined") {
- var DairyRestraintsSetting = {
- setSetting: function (setting) {
- setting = Number(setting);
- return setting;
- }
- };
- // Raise namespace scope to Global.
- window.DairyRestraintsSetting = DairyRestraintsSetting;
-}
-
/* OLD
window.randomRelatedSlave = function(slave, filterFunction) {
if(!slave || !SugarCube) { return undefined; }
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 1c66d62ab5ef37eb161ba818de7639395b3e8058..42124482003092bec6d136a017f51a8eba0365fd 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -775,6 +775,22 @@ window.GenerateNewSlave = (function(){
}
function generateXXBoobs() {
+ function rollBreast(modif) {
+ const volume = [0, 300, 500, 650, 800, 1000, 1200, 1400, 1600, 1800, 2050, 2300, 2600, 2900, 3250, 3600, 3950, 4300, 4700, 5100, 5500, 5900];
+ const volume_dist = [90000, 470000, 720000, 840000, 908574, 947759, 970151, 982946, 990258, 994436, 996824, 998188, 998968, 999414, 999669, 999814, 999897, 999945, 999972, 999987, 999995, 1000000];
+ const randomRoll = Math.floor(Math.random() * 1000000) + 1;
+ let actualSize = 0;
+ let minorSizeAdjustment = 0;
+
+ while (randomRoll > volume_dist[actualSize]) {
+ actualSize = actualSize + 1;
+ }
+ if (Math.random() < 0.5) {
+ minorSizeAdjustment = (Math.floor(Math.random() * 2) + 1) * 50;
+ }
+ return Math.max(volume[actualSize] + minorSizeAdjustment + modif, 0);
+ }
+
if (slave.physicalAge <= 10) {
slave.boobs = 100;
} else if (slave.physicalAge === 11) {
@@ -790,16 +806,16 @@ window.GenerateNewSlave = (function(){
} else {
switch (slave.race) {
case "black":
- slave.boobs = BoobGenerator.rollBreast(150);
+ slave.boobs = rollBreast(150);
break;
case "white":
- slave.boobs = BoobGenerator.rollBreast(50);
+ slave.boobs = rollBreast(50);
break;
case "asian":
- slave.boobs = BoobGenerator.rollBreast(-100);
+ slave.boobs = rollBreast(-100);
break;
default:
- slave.boobs = BoobGenerator.rollBreast(0);
+ slave.boobs = rollBreast(0);
}
}
}
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 216a12bb1a72c4d4c2d7f8a27f553a2e4d22b005..ad365b27121b6131edd834ddf6669ac5da03bc9d 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -4930,18 +4930,12 @@ App.UI.slaveSummaryList = function (passageName) {
listIndexContent += '<<link "Sort by Devotion">>' +
'<<set $sortQuickList = "Devotion" >>' +
'<<replace "#qlSort">> $sortQuickList <</replace>>' +
- '<<run' +
- '$("#qlWrapper").removeClass("trust").addClass("devotion");' +
- 'sortButtonsByDevotion();' +
- '>>' +
+ '<<run' + '$("#qlWrapper").removeClass("trust").addClass("devotion");' + 'sortButtonsByDevotion();' + '>>' +
'<</link>> | ' +
'<<link "Sort by Trust">>' +
'<<set $sortQuickList = "Trust">>' +
'<<replace "#qlSort">> $sortQuickList <</replace>>' +
- '<<run' +
- '$("#qlWrapper").removeClass("devotion").addClass("trust");' +
- 'sortButtonsByTrust();' +
- '>>' +
+ '<<run' + '$("#qlWrapper").removeClass("devotion").addClass("trust");' + 'sortButtonsByTrust();' + '>>' +
'<</link>>' +
'<br/>';
listIndexContent += '<div id="qlWrapper" class="quicklist devotion">';
@@ -5227,10 +5221,10 @@ App.UI.slaveSummaryList = function (passageName) {
continue;
}
} else if ((V.dairySlimMaintainUpgrade == 1 && V.dairySlimMaintain == 1) || (V.dairyImplantsSetting == 2) || (_Slave.boobs <= 300 && _Slave.balls > 0 && (V.dairyImplantsSetting == 0 || V.dairyImplantsSetting == 3))) {
- res.push(`//${_Slave.slaveName} is not lactating` + (V.seeDicks > 0) ? 'or producing semen' : '' + `and ${V.dairyName}'s current settings forbid the automatic implantation of lactation inducing drugs or manual stimulation to induce it, so she cannot be a cow//</div>`);
+ res.push(`//${_Slave.slaveName} is not lactating ${(V.seeDicks > 0) ? 'or producing semen' : ''} and ${V.dairyName}'s current settings forbid the automatic implantation of lactation inducing drugs or manual stimulation to induce it, so she cannot be a cow//</div>`);
continue;
} else {
- res.push(`//${_Slave.slaveName} is not lactating` + (V.seeDicks > 0) ? 'or producing semen' : '' + 'and cannot be a cow//</div>');
+ res.push(`//${_Slave.slaveName} is not lactating ${(V.seeDicks > 0) ? 'or producing semen' : ''} and cannot be a cow//</div>`);
continue;
}
}
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 2bb7350e8bde02102ea6a93d8bac0d63013aabc6..1d9a97fd8aa7fc8669e6a5ad71795452e355a843 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -47,32 +47,6 @@ window.isFullyPotent = /** @param {App.Entity.SlaveState} slave */ function (sla
}
};
-/**
- * BoobGenerator namespace.
- */
-if (typeof BoobGenerator === "undefined") {
- var BoobGenerator = {
- rollBreast: function (modif) {
- var volume = [0, 300, 500, 650, 800, 1000, 1200, 1400, 1600, 1800, 2050, 2300, 2600, 2900, 3250, 3600, 3950, 4300, 4700, 5100, 5500, 5900];
- var volume_dist = [90000, 470000, 720000, 840000, 908574, 947759, 970151, 982946, 990258, 994436, 996824, 998188, 998968, 999414, 999669, 999814, 999897, 999945, 999972, 999987, 999995, 1000000];
- var randomRoll = Math.floor(Math.random() * 1000000) + 1;
- var actualSize = 0;
- while (randomRoll > volume_dist[actualSize]) {
- actualSize = actualSize + 1;
- }
- var minorSizeAdjustment = 0;
- if (Math.random()<.5) {
- minorSizeAdjustment = (Math.floor(Math.random() * 2) + 1) * 50;
- }
- var volResult = volume[actualSize] + minorSizeAdjustment + modif;
- if (volResult < 0) { volResult = 0;}
- return volResult;
- }
- };
- // Raise namespace scope to Global.
- window.BoobGenerator = BoobGenerator;
-}
-
window.removeFromArray = function(arr, val) {
for (var i = 0; i < arr.length; i++) {
if (val === arr[i])
@@ -844,6 +818,16 @@ window.removeFS = function(FS) {
FSLaw += "ME";
}
switch (FS) {
+ case "FSPaternalist":
+ arcology[FSLaw] = 0;
+ arcology[FSSMR] = 0;
+ V.slaveWatch = 0;
+ break;
+ case "FSDegradationist":
+ arcology[FSLaw] = 0;
+ arcology[FSSMR] = 0;
+ V.liveTargets = 0;
+ break;
case "FSGenderRadicalist":
arcology.FSGenderRadicalistLawBeauty = 0;
arcology.FSGenderRadicalistLawFuta = 0;
@@ -861,6 +845,7 @@ window.removeFS = function(FS) {
arcology.FSPhysicalIdealistLaw = 0;
arcology.FSPhysicalIdealistSMR = 0;
arcology.FSPhysicalIdealistStrongFat = 0;
+ V.martialSchool = 0;
break;
case "FSHedonisticDecadence":
arcology.FSHedonisticDecadenceLaw = 0;
@@ -872,12 +857,18 @@ window.removeFS = function(FS) {
arcology.FSChattelReligionistLaw = 0;
arcology.FSChattelReligionistSMR = 0;
arcology.FSChattelReligionistCreed = 0;
+ V.subsidyChurch = 0;
break;
case "FSRepopulationFocus":
arcology[FSLaw] = 0;
arcology[FSSMR] = 0;
V.universalRulesChildrenBecomeBreeders = 0;
break;
+ case "FSRestart":
+ arcology[FSLaw] = 0;
+ arcology[FSSMR] = 0;
+ V.eliteOfficers = 0;
+ break;
case "FSNull":
break;
default: /* all others have one law and one SMR */
diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw
index 75e1d4b87218446c6e6cf7d68b0f64d05483b1fd..122276c759b7b549971a4822f2837970adfbdfbb 100644
--- a/src/npc/newSlaveIncestSex.tw
+++ b/src/npc/newSlaveIncestSex.tw
@@ -1,6 +1,6 @@
:: newSlaveIncestSex [nobr]
-<br/><br/>
+<br><br>
/* setup pronouns (switch on vagina for sisters and herms regardless of genes) */
<<set _oneshe = "she" >>
@@ -88,14 +88,14 @@
<</if>>
<<if $debugMode >>
-RELATIVE SLAVE (FIRST): <br/>
-_one ($relative.relation) <br/>
-$relative.physicalAge <br/>
-_oneshe / _oneher <br/>
-RELATIVE2 SLAVE (SECOND): <br/>
-_other ($relative2.relation) <br/>
-$relative2.physicalAge <br/>
-_othershe / _otherher <br/>
+RELATIVE SLAVE (FIRST): <br>
+_one ($relative.relation) <br>
+$relative.physicalAge <br>
+_oneshe / _oneher <br>
+RELATIVE2 SLAVE (SECOND): <br>
+_other ($relative2.relation) <br>
+$relative2.physicalAge <br>
+_othershe / _otherher <br>
<</if>>
<span id="result">
@@ -103,7 +103,7 @@ _othershe / _otherher <br/>
<<replace "#result">>
Now that you own them, you want to see proof of their love for each other. You order the <<if _one == "twin">>twins<<elseif _one == _other && _one == "brother">>brothers<<elseif _one == _other && _one == "sister">>sisters<<else>>_one and _other<</if>> to perform mutual oral sex in front of you.
Hesitantly, they assume the 69 position on your couch. They have either never done this in front of a stranger or have never had sex this way before. You remind them that they are sex slaves now. They need to follow all orders, including sexual ones, so this is a relatively gentle start.
-<br/><br/>
+<br><br>
<<if _one == "twin">>One _one<<else>>The _onelong<</if>> shows more boldness as _oneshe lowers _oneher head towards _oneher _otherlong's privates.
<<if $relative2.dick == 0 >>
Carefully, _oneshe spreads _oneher _other's labia. Then _oneshe continues to give _oneher _other's exposed pussy a few experimental licks. At first, _oneher efforts seem to be futile, but after a while the _otherlong's clit becomes engorged and _otherher juices start flowing.
@@ -114,9 +114,9 @@ As the _other's arousal grows, _othershe becomes more eager to please _otherher
<<if ($relative.dick == 0) != ($relative2.dick == 0) >>
Of course, _othershe has to adapt _otherher actions <<if $relative.dick == 0 >>from the feelings on _otherher dick to the pussy pressed against _otherher lips.<<else>>from the feelings at _otherher pussy to the dick in _otherher mouth.<</if>>
<</if>>
-<br/><br/>
+<br><br>
You can tell how uncomfortable they are with you watching them, but as they become increasingly worked up, they lose their inhibitions. Soon, you are watching some fairly enthralling <<print $RecETSevent.replace("incest","") >> incest action at your office<<if _actions.length >>, including some enthusiastic <<print _actions.join(" and ")>><</if>>. Eventually, they bring each other to impressive mutual orgasms. Their lusty moans are muffled only by each others' crotches. Spent, exhausted, and with their faces covered in each others <<print _secretions.join(" and ")>>, they untangle to rest comfortably on your couch.
-<br/><br/>
+<br><br>
You indicate them to present themselves to you. Still shaking from the aftershocks of their orgasms, they stand side by side in front of you, panting, naked and with their _genitals dripping mixed juices. You simply nod, showing your approval. They are visibly relieved, and not only sexually. They are more confident of having made the right choice in enslaving themselves to you, since you seem @@.mediumaquamarine;trustworthy@@ and @@.hotpink;sympathetic.@@ They hug again, kissing and licking the sexual fluids off each others' stained faces.
<</replace>>
<<set $relative.devotion += 4>>
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index 431c7c68fe81a2406915bd6eb5b1ccbb19a89488..988a4fc63b3e265e58b408310300dc92e0f10ec2 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -502,7 +502,7 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
<<if $activeSlave.vagina >= 0>>
expose $his vagina and spreads $his <<if $activeSlave.labia == 3>>extremely large <<elseif $activeSlave.labia == 2>>large <<elseif $activeSlave.labia == 1>>pretty <<else>>minimal <</if>>pussylips to show where $he wants cum.
<<elseif $activeSlave.mpreg == 1>>
- expose $his <<if $activeSlave.anus >3 >>gaping <<elseif $activeSlave.anus >2 >>very loose <<elseif $activeSlave.anus >1 >>loose <<elseif $activeSlave.anus >0 >>tight <<else>>virgin <</if>>asshole to show where $he wants cum.
+ expose $his <<if $activeSlave.anus > 3 >>gaping <<elseif $activeSlave.anus > 2 >>very loose <<elseif $activeSlave.anus > 1 >>loose <<elseif $activeSlave.anus > 0 >>tight <<else>>virgin <</if>>asshole to show where $he wants cum.
<<else>>
hug $his stomach.
<</if>>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 0bee3b389fb5d5ef4d03588d3915f184dbd80c5f..1465fe709dac399a592597cee2e92a35f7952b9a 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -132,7 +132,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<<elseif ($activeSlave.fetish == "cumslut")>>
be your cum <<s>>ucker,
<<elseif ($activeSlave.fetish == "humiliation")>>
- be <<s>tripped bare and <<sh>>own off,
+ be <<s>>tripped bare and <<sh>>own off,
<<elseif ($activeSlave.fetish == "buttslut")>>
have thing<<s>> <<sh>>oved up my butt,
<<elseif ($activeSlave.fetish == "boobs")>>
diff --git a/src/pregmod/implantManufactory.tw b/src/pregmod/implantManufactory.tw
index b6baed36ebfcb1c7c3f9b54d1b1ca52fc5b5cc31..24817e64022c1a0ceee36303b391e4011f4cd72f 100644
--- a/src/pregmod/implantManufactory.tw
+++ b/src/pregmod/implantManufactory.tw
@@ -49,7 +49,7 @@ The manufactory is capable of producing customized fillable implants.
<<if ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep <= 6000*_PCSkillCheck)>> /* show only after belly implants already researched */
//You lack the reputation to access experimental cervix filter micropumps schematics for abdominal implants//
<br>
- <<elseif ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep >6000*_PCSkillCheck)>> /* nanotech like technology much more impressive and costly than simple implant */
+ <<elseif ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep > 6000 * _PCSkillCheck)>> /* nanotech like technology much more impressive and costly than simple implant */
[[Purchase schematics for cervix filter micropumps|Implant Manufactory][cashX(forceNeg(70000*_PCSkillCheck), "capEx"), $cervixImplants = 1]]
//Costs <<print cashFormat(70000*_PCSkillCheck)>>//
<br> //Will allow the construction of cervix filter micropumps for fillable abdominal implants using the autosurgery.//
@@ -130,4 +130,4 @@ Fluid Production Implants
<<elseif ($prostateImplants > 0)>>
The manufactory is capable of producing ejaculation enhancing prostate implants.
<br>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 15c13b48cd81d04225262d4da101efbb6400b1f6..c5efa54a29ed033b660ada6c47fac8dc5a839e6e 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -37,7 +37,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
*/
<<if (0 < _SL)>>
<<set $sortIncubatorList = $sortIncubatorList || 'Unsorted'>>
- <br/>//Sorting:// ''<span id="qlIncubatorSort">$sortIncubatorList</span>.''
+ <br>//Sorting:// ''<span id="qlIncubatorSort">$sortIncubatorList</span>.''
<<link "Sort by Name">>
<<set $sortIncubatorList = 'Name'>>
<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
@@ -66,7 +66,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
sortIncubatorPossiblesByPregnancyCount();
<</script>>
<</link>>
- <br/>
+ <br>
<</if>>
<div id="qlIncubator">
<<for _u = 0; _u < _SL; _u++>>
diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index 1427a5a3d6708d78ccffb0974bda52ba5c5734c8..d262f5433b10d100fe66716f1b30023d4ab7fbcd 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -1963,7 +1963,7 @@ __Slave specialization__
<</if>>
<</if>>
<<if $corpSpecEducation == 0>>
- <brThe corporation focuses on uneducated slaves.
+ <br>The corporation focuses on uneducated slaves.
<<if $corpSpecTimer == 0>>
<<if $corpSpecToken > 0>>
[[Basic Education|Manage Corporation][$corpSpecEducation = 1, $corpSpecTimer = 2]] |
diff --git a/src/pregmod/physicalDevelopment.tw b/src/pregmod/physicalDevelopment.tw
index 0abab9447a2e8be9ada61bc6b1c78ef3d29dae7c..14abee4477ff183fcdedf130ba2aee5c03f32f89 100644
--- a/src/pregmod/physicalDevelopment.tw
+++ b/src/pregmod/physicalDevelopment.tw
@@ -253,7 +253,7 @@
<</if>>
<</if>>
<<if $args[0].butt < 3>>
- <<if random(1,100) >80>>
+ <<if random(1,100) > 80>>
<<set $args[0].butt += 1>>
<</if>>
<</if>>
@@ -1651,7 +1651,7 @@
<</if>>
<</if>>
<<if $args[0].butt < 3>>
- <<if random(1,100) >80>>
+ <<if random(1,100) > 80>>
<<set $args[0].butt += 1>>
<</if>>
<</if>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index 01c92088eb597f7a99791cf71ec7c60df38b273b..df0c19a9ceea0d9ca128797a1d95d9d00943b131 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -541,7 +541,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) < 1>> < 1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Error if decimal or not "all" or "max" string */
@@ -564,7 +564,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) < 1>> < 1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Successful sell */
@@ -575,7 +575,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if (State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if (State.variables[$args[0]+"Assets"]/500) < 1>> < 1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>><</replace>>
/* Unsuccessful sell but have enough assets for more than 1 unit */
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index f0f15d6814a5c2ed30774e35b822262704bae6e4..a333472a98b23060096a4687c5738d94dfafb8fb 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -628,16 +628,16 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<<if $slaves[$i].mpreg == 1>>
<<if $slaves[$i].anus < 2>>
<br>
- $His tight ass @@.red;hindered $his <<if _curBabies >1>>babies<<else>>baby's<</if>> birth@@.
+ $His tight ass @@.red;hindered $his <<if _curBabies > 1>>babies<<else>>baby's<</if>> birth@@.
<</if>>
<<else>>
<<if $slaves[$i].vagina < 2>>
<br>
- $His tight vagina @@.red;hindered $his <<if _curBabies >1>>babies<<else>>baby's<</if>> birth@@.
+ $His tight vagina @@.red;hindered $his <<if _curBabies > 1>>babies<<else>>baby's<</if>> birth@@.
<</if>>
<<if $slaves[$i].vaginaLube == 0>>
<br>
- $His dry vagina made pushing $his <<if _curBabies >1>>children<<else>>child<</if>> out @@.red;painful@@.
+ $His dry vagina made pushing $his <<if _curBabies > 1>>children<<else>>child<</if>> out @@.red;painful@@.
<</if>>
<</if>>
<<if $slaves[$i].hips < 0>>
@@ -646,7 +646,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<</if>>
<<if $slaves[$i].weight < -95>>
<br>
- $His very thin body @@.red;was nearly incapable of birthing $his <<if _curBabies >1>>children<<else>>child<</if>>@@.
+ $His very thin body @@.red;was nearly incapable of birthing $his <<if _curBabies > 1>>children<<else>>child<</if>>@@.
<<set _compoundCondition = 1>>
<<elseif $slaves[$i].weight <= -30>>
<br>
@@ -662,10 +662,10 @@ This decriptions can be expanded with more outcomes later. But it's not practica
$His very young body was @@.red;not designed to be able pass a baby@@.
<<elseif $slaves[$i].physicalAge < 9>>
<br>
- $His young body had @@.red;a lot of trouble@@ birthing $his <<if _curBabies >1>>babies<<else>>baby<</if>>.
+ $His young body had @@.red;a lot of trouble@@ birthing $his <<if _curBabies > 1>>babies<<else>>baby<</if>>.
<<elseif $slaves[$i].physicalAge < 13>>
<br>
- $His young body had @@.red;trouble birthing@@ $his <<if _curBabies >1>>babies<<else>>baby<</if>>.
+ $His young body had @@.red;trouble birthing@@ $his <<if _curBabies > 1>>babies<<else>>baby<</if>>.
<<set _compoundCondition = 1>>
<</if>>
<<if $slaves[$i].tired > 0>>
@@ -675,15 +675,15 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<</if>>
<<if $slaves[$i].muscles < -95>>
<br>
- $He tried and tried but $his frail body @@.red;could not push $his <<if _curBabies >1>>children<<else>>child<</if>> out@@.
+ $He tried and tried but $his frail body @@.red;could not push $his <<if _curBabies > 1>>children<<else>>child<</if>> out@@.
<<set _compoundCondition = 1>>
<<elseif $slaves[$i].muscles < -30>>
<br>
- $His very weak body @@.red;barely managed to push@@ out $his <<if _curBabies >1>>children<<else>>child<</if>>.
+ $His very weak body @@.red;barely managed to push@@ out $his <<if _curBabies > 1>>children<<else>>child<</if>>.
<<set _compoundCondition = 1>>
<<elseif $slaves[$i].muscles < -5>>
<br>
- $His weak body @@.red;struggled to push@@ out $his <<if _curBabies >1>>children<<else>>child<</if>>.
+ $His weak body @@.red;struggled to push@@ out $his <<if _curBabies > 1>>children<<else>>child<</if>>.
<</if>>
<<if $slaves[$i].preg > $slaves[$i].pregData.normalBirth*1.25>>
<br>
@@ -698,16 +698,16 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<<if $slaves[$i].mpreg == 1>>
<<if $slaves[$i].anus >= 2>>
<br>
- $His @@.green;loose ass@@ made birthing $his <<if _curBabies >1>>children<<else>>child<</if>> easier.
+ $His @@.green;loose ass@@ made birthing $his <<if _curBabies > 1>>children<<else>>child<</if>> easier.
<</if>>
<<else>>
<<if $slaves[$i].vagina >= 2>>
<br>
- $His @@.green;loose vagina@@ made birthing $his <<if _curBabies >1>>children<<else>>child<</if>> easier.
+ $His @@.green;loose vagina@@ made birthing $his <<if _curBabies > 1>>children<<else>>child<</if>> easier.
<</if>>
<<if $slaves[$i].vaginaLube > 0>>
<br>
- $His @@.green;moist vagina@@ hastened $his <<if _curBabies >1>>children's<<else>>child's<</if>> birth.
+ $His @@.green;moist vagina@@ hastened $his <<if _curBabies > 1>>children's<<else>>child's<</if>> birth.
<</if>>
<</if>>
<<if $slaves[$i].laborCount > 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index d1c9351cbb0c738e19c76c154f057b494a1b1ffc..df4aea1cd0773340183d93f297feefeb7c27bf5b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2067,7 +2067,13 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgment<</if>>, $he
<</if>>
<</if>>
<<if canPenetrate($activeSlave) && $activeSlave.scrotum > 0 && $activeSlave.balls < 10>>
- <<set _possibleDrugs.push({type: "balls", text: "te<<s>>ticle enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to <<if canHear($activeSlave)>>hear her grunt<<else>>feel her <<sh>>ake<</if>> every <<s>>ingle time the weight of my ball<<s>> <<s>>lap<<s>> again<<s>>t her body."})>>
+ <<set _possibleDrugs.push({type: "balls", text: "te<<s>>ticle enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to
+ <<if canHear($activeSlave)>>
+ hear her grunt
+ <<else>>
+ feel her <<sh>>ake
+ <</if>>
+ every <<s>>ingle time the weight of my ball<<s>> <<s>>lap<<s>> again<<s>>t her body."})>>
<</if>>
<<if $activeSlave.dick == 0 && $activeSlave.clit < 5>>
<<set _possibleDrugs.push({type: "clit", text: "clit enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but I want to teach tho<<s>>e cocky <<s>>lut<<s>> a le<<ss>>on they'll never forget."})>>
@@ -12530,7 +12536,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.dick-->>
<</if>>
<<if $activeSlave.balls > 1 && random(1,100) > 70>>
- As a side effect, $his @@orange:lime;balls have also atrophied,@@ which $he sees as an added benefit.
+ As a side effect, $his @@.orange;balls have also atrophied,@@ which $he sees as an added benefit.
<<set $activeSlave.balls-->>
<<if (($activeSlave.geneMods.NCS == 1) && ($activeSlave.balls > 1) && (random(1,100) > 50))>>
<<set $activeSlave.balls-->>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index abaca9fbff5752918a680a026ad857ad1f2c4e61..07e87aab34915d2f436d42067ec2ac876b990f31 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -226,7 +226,7 @@
<<case "bovine patterns">>
$He stares at $his new cow's anus. Finally, $he focuses on the upsides of being permanently transformed like this. "<<Master>>, I hope thi<<s>> mean<<s>> I'll have to be fed up the butt a lot," $he <<say>>s, referencing the milking systems' anal feeders.
<<case "possessive">>
- $He stares, realizing that the ring of numbers around $his anus give the date $he was enslaved by you. "Be<<s>t pla<<c>>e for that date, <<Master>>," $he <<say>>s. "Being a butt <<s>>lut i<<s>> my life now."
+ $He stares, realizing that the ring of numbers around $his anus give the date $he was enslaved by you. "Be<<s>>t pla<<c>>e for that date, <<Master>>," $he <<say>>s. "Being a butt <<s>>lut i<<s>> my life now."
<<case "paternalist">>
$He stares, $his mouth working as $he spells out '<<= WrittenMaster($activeSlave)>> Helped Me Love Anal.' "Oh <<Master>>, you did," $he coos. "You did! Thank you <<s>>o much for helping me become the anal <<s>>lut I wa<<s>> alway<<s>> meant to be!"
<</switch>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 1d095d4ff85eb03eccd1e08aee9b99db18bdb771..61d23fbbe0b80b9b4f892a9e0dd4a3f0534a2046 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -174,7 +174,7 @@
<</if>>
<<if $slaves[$i].preg >= $slaves[$i].pregData.minLiveBirth && $slaves[$i].pregControl == "speed up">>
<<set $slaves[$i].pregControl = "none">>
- ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of _his2 womb, ''@@.yellow;_his2 course of rapid gestation agents is finished''.
+ ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of _his2 womb, ''@@.yellow;_his2 course of rapid gestation agents is finished@@''.
<</if>>
<<elseif $slaves[$i].preg > 2 && $slaves[$i].pregKnown == 0>>
During $his tests, $he discovers that $slaves[$i].slaveName @@.lime;is pregnant.@@
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 7521b71e27d22f5730890664b7bfff6f4ba346a8..cbf65d2d6a231700579a31978eaf38c729cd8918 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -184,7 +184,8 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
Since you are used to a fairly normal life, your personal living expenses are:
<</if>>")>>
- <<print budgetLine("PCtraining", "<<if ($personalAttention == \"trading\")>>
+ <<print budgetLine("PCtraining", "
+ <<if ($personalAttention == \"trading\")>>
[[Trading trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
<<elseif ($personalAttention == \"warfare\")>>
[[Warfare trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
@@ -194,16 +195,19 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
[[Engineering trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
<<elseif ($personalAttention == \"medicine\")>>
[[Medicine trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
- <</if>>")>>
+ <</if>>
+ ")>>
<<print budgetLine("PCmedical", "Your medical expenses")>>
<<print budgetLine("PCskills", "Your skills")>>
- <<print budgetLine("rents", "Your rents
+ <<print budgetLine("rents",
+ "Your rents
<<if $lastWeeksCashExpenses.rents < 0>>
and bribes
- <</if>>")>>
+ <</if>>
+ ")>>
<<print budgetLine("stocks", ">Stock dividends on ($personalShares/<<print ($publicShares + $personalShares)>> shares).")>>
@@ -246,15 +250,18 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<elseif $HA.schoolPresent == 1>>[[Hippolyta Academy|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] branch campus upkeep
<<elseif $NUL.schoolPresent == 1>>[[Nueva Universidad de Libertad|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] branch campus upkeep
<<else>> Unknown school expense
- <</if>>")>>
+ <</if>>
+ ")>>
<<print budgetLine("citizenOrphanage", "Education of $citizenOrphanageTotal of your slaves\' children in citizen schools")>>
<<print budgetLine("privateOrphanage", "Private tutelage of $privateOrphanageTotal of your slaves\' children")>>
- <<print budgetLine("mercenaries", "Security: [[$mercenariesTitle|Barracks][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]
- <<if $barracks>><<else>><br>//@@.red;Cost increased by the lack of an armory to house them.@@//<</if>>
- <<if ($PC.warfare >= 100) || ($PC.career == \"arcology owner\")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>>")>>
+ <<print budgetLine("mercenaries",
+ "Security: <<if $barracks>>[[$mercenariesTitle|Barracks][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]
+ <<else>>Mercenaries<br>//@@.red;Cost increased by the lack of an armory to house them.@@//<</if>>
+ <<if ($PC.warfare >= 100) || ($PC.career == \"arcology owner\")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>>
+ ")>>
<<print budgetLine("securityExpansion", "Security expansion")>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 714058846198be1fe1c4dc681482ea73f6042067..b2724f12dda02ed73c16b74b0e21414177031114 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -2,10 +2,6 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Dairy", _SL = $slaves.length>>
-<<silently>>
-DairyRestraintsSetting($dairyRestraintsSetting)
-<</silently>>
-
<<SlaveSort $DairyiIDs>>
<<set _DL = $DairyiIDs.length, $dairySlaves = _DL>>
<<dairyAssignmentFilter>>
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index b9e929d30d30dcca54fd02b495ed3cadc408141a..30678a8c4ace4b11ea817531be21c2ad896d5b69 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -142,7 +142,7 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
$His _assayType _assayedSlave.slaveName is at the dairy, too. _He2 is in the adjacent stall. The two of them are going to be milked right next to each other.
<</if>>
-The only "furniture" in the stall looks like a dentist's chair. It looks very medical, but it turns out to be quite comfortable actually. $He <<if $activeSlave.devotion >90>>eagerly<<elseif $activeSlave.slaveName < 40>>hesitantly<</if>> gets into the chair.
+The only "furniture" in the stall looks like a dentist's chair. It looks very medical, but it turns out to be quite comfortable actually. $He <<if $activeSlave.devotion > 90>>eagerly<<elseif $activeSlave.slaveName < 40>>hesitantly<</if>> gets into the chair.
<<if $Milkmaid == 0 >>
Automated machinery springs to life, preparing $him for milking.
<<else>>
@@ -164,14 +164,14 @@ Suction cups are attached <<if $activeSlave.nipples == "fuckable">>over<<else>>t
A suction cup is attached over $his hidden cumhole.
<</if>>
<</if>>
-<br/>
+<br>
<<if $dairyFeedersSetting == 1>>
Near the headrest of the chair, an artificial phallus is installed. The cow can easily reach it with $his mouth. The phallus provides hydration and nutrition when sucked. The supplement consists of excess or low-quality milk and cum from the dairy itself as well as aphrodisiacs and hormones enhancing lactation and semen production.
<<if $activeSlave.sexualFlaw == "cum addict" || $activeSlave.fetish == "cumslut">>
$activeSlave.slaveName eagerly shoves the artificial phallus into $his mouth. $He gives it an experimental suckle. To $his joy, $he soon is rewarded with a fresh spurt of semen-like nutrition supplement. Then $he readjusts the holder to keep the phallus lodged in $his mouth, effectively forcing $himself to keep sucking the artificial dick.
<</if>>
<</if>>
-<br/>
+<br>
The milking chair comes with a small screen, providing mental stimulation for the cow. It is highly pornographic, of course. It also includes live-streams of close-ups from the cows being milked or their orifices being penetrated. $activeSlave.slaveName selects $his favorite program<<if canSee($activeSlave)>> to watch<<elseif canHear($activeSlave)>> to listen to<<else>> to feel the vibrations from<</if>>. It features
<<if $activeSlave.attrXY > $activeSlave.attrXX || $activeSlave.behavioralQuirk == "adores men">>
men
@@ -217,7 +217,7 @@ The milking chair comes with a small screen, providing mental stimulation for th
<br><br>
Sexual stimulation increases product output.
<<if $Milkmaid == 0 && $dairyStimulatorsSetting == 0>>
- Unfortunately, there is neither a milkmaid providing personal assistance nor automatic sodomizers installed in your dairy.<br/>
+ Unfortunately, there is neither a milkmaid providing personal assistance nor automatic sodomizers installed in your dairy.<br>
<<else>>
<<if $Milkmaid != 0>>
<<setLocalPronouns $Milkmaid 2>>
@@ -231,7 +231,7 @@ Sexual stimulation increases product output.
<<if $milkmaidImpregnates == 1 && canPenetrate($Milkmaid) && $Milkmaid.pubertyXY == 1 && $Milkmaid.ballType == "human">>
If at all possible, it is _his2 duty to thoroughly knock up _his2 charges.
<</if>>
- <br/>
+ <br>
<</if>>
<<if $dairyStimulatorsSetting > 0>>
Automated sodomizers help the cows produce by penetrating their anuses. The milking chairs built-in sensors measure $activeSlave.slaveName's anal capacity.
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index b1366d32524fbdfc68648007e614b4350a66a6b9..bc3bb32de5ddb0df144f98e13bc71503f367a161 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -205,7 +205,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
$He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> You teasingly ask if $he'd like to feel it sometime, eliciting a delighted squeal from the $girl. @@.green;$He's a pregnancy fetishist!@@
<<set $activeSlave.fetishKnown = 1>>
<<else>>
- $He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> As you inspect $him, you take care to gently brush your pregnancy across $him as you move. $He is practically bursting with lust by the end and @color:hotpink;eager to please you@@ so $he can be close to that belly.
+ $He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> As you inspect $him, you take care to gently brush your pregnancy across $him as you move. $He is practically bursting with lust by the end and @@.hotpink;eager to please you@@ so $he can be close to that belly.
<<set $activeSlave.devotion += 5>>
<</if>>
<<else>>
@@ -221,7 +221,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
$He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> You teasingly ask if $he'd like to feel it sometime, eliciting a delighted squeal from the $girl. @@.green;$He's an impregnation fetishist!@@
<<set $activeSlave.fetishKnown = 1>>
<<else>>
- $He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> As you inspect $him, you take care to gently brush your pregnancy across $him as you move. $He is practically bursting with lust by the end and @color:hotpink;eager to please you@@ so $he can be close to that belly.
+ $He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> As you inspect $him, you take care to gently brush your pregnancy across $him as you move. $He is practically bursting with lust by the end and @@.hotpink;eager to please you@@ so $he can be close to that belly.
<<set $activeSlave.devotion += 5>>
<</if>>
<<else>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 9deb03ba6a93f8c58c5f3e9484796c1cfbe8108b..9fe7d356935aaf5189cdba5785a61adfae774c5d 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -273,7 +273,7 @@
<<else>>
fostering devotion.
<<set $personalAttention[_ptwi].trainingRegimen = "build her devotion">>
- <</if>>
+ <</if>>@@
<<default>>
has something. You should probably report this as nobody knows what is currently happening. $His flaw was supposed to be $activeSlave.sexualFlaw.
<</switch>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 9b25c096d1218ed56bcc0b54587a3c58a54768d4..a312b69e5e27dc4ca58658ac575785f81c36a451 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -194,7 +194,7 @@
<<elseif $slaves[$i].hormoneBalance >= 300>>
<<if ($slaves[$i].faceShape == "masculine")>>
- Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>><childlike <</if>>androgyny.@@
+ Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
<<elseif ($slaves[$i].faceShape == "androgynous")>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
@@ -294,7 +294,7 @@
<<elseif $slaves[$i].hormoneBalance >= 250>>
<<if ($slaves[$i].faceShape == "masculine")>>
- Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>><childlike <</if>>androgyny.@@
+ Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
<<elseif ($slaves[$i].faceShape == "androgynous")>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
@@ -394,7 +394,7 @@
<<elseif $slaves[$i].hormoneBalance >= 200>>
<<if ($slaves[$i].faceShape == "masculine")>>
- Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>><childlike <</if>>androgyny.@@
+ Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
<<elseif ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].faceShape == "androgynous")>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 48c91388ded5a0668cb83bb5595f95b959c71c14..0312fa83bccdf030d3cb425b3427fea72b93b930 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -319,7 +319,7 @@
<<case "a string bikini">>
$His string bikini covers only $his nipples, leaving the remainder of $his <<if $activeSlave.boobs < 300>>flat chest<<else>>breasts<</if>> naked.
<<case "a scalemail bikini">>
- $His scalemail bikini covers <<if $activeSlave.boobs < 300>>all of $his flat chest.<<elseif $activeSlave.boobs < 700>>$his breasts entirely.<<elseif $activeSlave.boobs <1500>>much of $his breasts, while still emphasizing them.<<else>>the front of $his breasts.<</if>> .
+ $His scalemail bikini covers <<if $activeSlave.boobs < 300>>all of $his flat chest.<<elseif $activeSlave.boobs < 700>>$his breasts entirely.<<elseif $activeSlave.boobs < 1500>>much of $his breasts, while still emphasizing them.<<else>>the front of $his breasts.<</if>> .
<<case "striped panties">>
$His cute panties covers only $his crotch, leaving $his <<if $activeSlave.boobs < 300>>flat chest<<else>>breasts<</if>> bare.
<<case "clubslut netting">>
@@ -3863,4 +3863,4 @@
<</switch>>
<</if>>
</span>
-//
\ No newline at end of file
+//
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 820c05ee616ca5027a3b36da285f3c24376d8b0a..0548a3081b6e070eea73f5cdebf2c09d680bb131 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -876,7 +876,7 @@
<<if $j < $children.length-1>>
$children[$j].slaveName,
<<else>>
- and $children[$j].slaveName@@.
+ and $children[$j].slaveName.
<</if>>
<</for>>@@
are your half-sisters.
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index e2e29a416f18587973563e050c76935475c41328..ad4a6170a1dd8f759702f208d3e9e91ab988ce74 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -438,7 +438,7 @@
%/
<<widget "SlaveInteractDickGropeOption">>
<<replace #dickgropeoption>>
- <<if ($activeSlave.dick >0)>>
+ <<if ($activeSlave.dick > 0)>>
<<if !($activeSlave.chastityPenis)>>
| <<link "Grope $his dick">><<replace "#miniscene">><<include "FondleDick">><br> <</replace>><</link>>
<<if canPenetrate($activeSlave) && $sexualOpeness == 1>>