diff --git a/devNotes/AnatomyOfAFreeCitiesEvent.txt b/devNotes/AnatomyOfAFreeCitiesEvent.txt
index 97c4d085fa3a401e042243eb0d3ff6881f49c6e6..8bf208cfb0dd97f69a7af49fde7ea1048d2cc284 100644
--- a/devNotes/AnatomyOfAFreeCitiesEvent.txt
+++ b/devNotes/AnatomyOfAFreeCitiesEvent.txt
@@ -81,7 +81,7 @@ Choices should also be hidden when they run against the game rules, like for exa
''inactive.'' [[Active|Dairy][$dairyFeedersSetting = 1]]
<</if>>
<<else>>
- $dairyNameCaps is equipped to feed and clean slaves normally. [[Upgrade the milking machines with intubators|Dairy][cashX(forceNeg(_Tmult1), "capEx"), $dairyFeedersUpgrade = 1]] //Costs ¤_Tmult1 and will increase upkeep costs. cashX is the proper way to handle cash payments. The forceNeg part just means "make sure what comes next is negative if it isn't already, because I want it to cost the player money." "capEx" is the budget category you want this transaction recorded under. You can search through the game files to find similar transactions. //
+ $dairyNameCaps is equipped to feed and clean slaves normally. [[Upgrade the milking machines with intubators|Dairy][cashX(forceNeg(_Tmult1), "capEx"), $dairyFeedersUpgrade = 1]] //Costs ¤_Tmult1 and will increase upkeep costs. cashX is the proper way to handle cash payments. The forceNeg part just means "make sure what comes next is negative if it isn't already, because I want it to cost the player money." "capEx" is the budget category you want this transaction recorded under. You can search through the game files to find similar transactions. //
<</if>>
In order to enable the industrial feeder option both any of the see extreme content options has be enabled and the restraint's have to be already set to industrial.
diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 5860fa2665f6511ef396d3e2e10c65969df37271..a5d9dba0246a4f70b1657edb3863e59348feaf19 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -344,7 +344,7 @@ UtilJS [script]
capFirstChar() - Capitalizes the first character of a given string.
- addA() - Adds an `a ` or, if the first character is a vocal, an `an ` in front of a given string.
+ addA() - Adds an `a ` or, if the first character is a vocal, an `an ` in front of a given string.
cmToInchString() - takes an integer e.g. $activeSlave.hLength, returns a string in the format 10 inches
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index dda317f5728c1d66089dfe677ce079cff68cd70c..1389cdef5c65527fc42de38cf180316159e47b5b 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -645,7 +645,7 @@ App.Desc.brand = function(slave, surface) {
// matching places and marks
// note that the slave.brand object won't have slave.brand["upper armS"] with an S defined, just the left and right, so we just use the left since we know they match.
r += `${He} has ${slave.brand[surface.left]} branded into the flesh of both ${his} ${surface.both}. `;
- } else if (slave.brand[surface.left] && slave.brand[surface.right]) {
+ } else if (slave.brand[surface.left] && slave.brand[surface.right]) {
// matching places but different marks
r += `${He} has both ${slave.brand[surface.left]} branded into the flesh of ${his} ${surface.left}, and ${slave.brand[surface.right]} branded into ${his} ${surface.right}. `;
} else if (slave.brand[surface.left]) {
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 68e8099de605f02863284984b4e4800fe9b535e3..57afc9c9f752472b8a765f79dc92e857b0330a55 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1709,7 +1709,7 @@ window.GenerateNewSlave = (function() {
}
}
}
-
+
function generateHormones() {
// PubertyXX and PubertyXY == 1 at this point should guarantee functioning sex organs of the appropriate type
if (slave.genes === "XX") {
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index eceae2c615bb942d261321de7cc19e612812a438..20366c30186358fac21afbd06b78f91d5cc793e1 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -1755,6 +1755,7 @@ window.walkPasts = function(slave, _seed) {
case "milk":
case "cum":
case "food":
+ case "urine":
t += `${slave.inflationType}; `;
break;
default:
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index 0daa9bfed482d2dfc6ad71aae205340612fb0b1a..5128fa89d7ef6613b1f67f600c93784226ac38ee 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -348,9 +348,9 @@ $activeSlave.slaveName and $impregnatrix.slaveName are likely to produce
a mestizo,
<<elseif ($activeSlave.race == "white") && ($impregnatrix.race == "amerindian")>>
a mestizo,
- <<elseif ($activeSlave.race == $impregnatrix.race) && ($activeSlave.race !== "mixed race") && ($impregnatrix.race !== "mixed race")>>
+ <<elseif ($activeSlave.race == $impregnatrix.race) && ($activeSlave.race != "mixed race") && ($impregnatrix.race != "mixed race")>>
an ethnically pure,
- <<elseif ($activeSlave.race !== $impregnatrix.race) && ($activeSlave.race !== "mixed race") && ($impregnatrix.race !== "mixed race")>>
+ <<elseif ($activeSlave.race != $impregnatrix.race) && ($activeSlave.race != "mixed race") && ($impregnatrix.race != "mixed race")>>
a biracial,
<<else>>
mixed ethnicity,
diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index 63e129768e646c3ba3cbadf353540aa792f22dbd..70555ea105126a5b2e4b76d1c2c91de706ef2a02 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -1380,25 +1380,25 @@ __Shares__
<br>The corporation can buyback 1000 shares for @@.red;<<print cashFormat(corpSharePrice(-1000))>>@@ or issue 1000 shares and net @@.yellowgreen;<<print cashFormat(corpSharePrice(1000))>>.@@ The corporation will prefer to round shares to the nearest 1000 and will issue or buy shares toward that goal first.
<<if $corpCash > corpSharePrice(-1000)>>
<<if $publicShares <= $personalShares - 2000 && $publicShares > 0>> /*It won't buy back player shares if the corporation is entirely owned by the player*/
- <<set _persExtraShares = $personalShares % 1000 || 1000>>
- <br>The corporation can buyback some of your shares.
- <<= "[[Buyback "+ _persExtraShares + "|Manage Corporation][cashX(corpSharePrice(-"+_persExtraShares+"), 'stocksTraded'), $corpCash -= corpSharePrice(-"+_persExtraShares+"), $personalShares -= "+_persExtraShares+"]]">>
+ <<set _persExtraShares = $personalShares % 1000 || 1000>>
+ <br>The corporation can buyback some of your shares.
+ <<= "[[Buyback "+ _persExtraShares + "|Manage Corporation][cashX(corpSharePrice(-"+_persExtraShares+"), 'stocksTraded'), $corpCash -= corpSharePrice(-"+_persExtraShares+"), $personalShares -= "+_persExtraShares+"]]">>
<<elseif $publicShares >= 1000>>
- <<set _pubExtraShares = $publicShares % 1000 || 1000>>
+ <<set _pubExtraShares = $publicShares % 1000 || 1000>>
<br>The corporation can buyback some of the public shares.
- <<= "[[Buyback "+ _pubExtraShares + "|Manage Corporation][$corpCash -= corpSharePrice(-"+_pubExtraShares+"), $publicShares -= "+_pubExtraShares+"]]">>
+ <<= "[[Buyback "+ _pubExtraShares + "|Manage Corporation][$corpCash -= corpSharePrice(-"+_pubExtraShares+"), $publicShares -= "+_pubExtraShares+"]]">>
<</if>>
<</if>>
<<set _persLeftoverShares = 1000 - ($personalShares % 1000)>>
<<if $cash > corpSharePrice(_persLeftoverShares)>>
- <br>The corporation can issue <<=_persLeftoverShares>> shares to you.
- <<= "[[Issue " + _persLeftoverShares + "|Manage Corporation][cashX(forceNeg(corpSharePrice("+_persLeftoverShares+")), 'stocksTraded'), $corpCash += corpSharePrice("+_persLeftoverShares+"), $personalShares += "+_persLeftoverShares+"]]">>
+ <br>The corporation can issue <<=_persLeftoverShares>> shares to you.
+ <<= "[[Issue " + _persLeftoverShares + "|Manage Corporation][cashX(forceNeg(corpSharePrice("+_persLeftoverShares+")), 'stocksTraded'), $corpCash += corpSharePrice("+_persLeftoverShares+"), $personalShares += "+_persLeftoverShares+"]]">>
<</if>>
<<set _pubLeftoverShares = 1000 - ($publicShares % 1000)>>
<<if $publicShares <= $personalShares - 2000>>
- <br>The corporation can issue <<=_pubLeftoverShares>> shares onto the stock market.
- <<= "[[Issue " + _pubLeftoverShares + "|Manage Corporation][$corpCash += corpSharePrice("+_pubLeftoverShares+"), $publicShares += "+_pubLeftoverShares+"]]">>
+ <br>The corporation can issue <<=_pubLeftoverShares>> shares onto the stock market.
+ <<= "[[Issue " + _pubLeftoverShares + "|Manage Corporation][$corpCash += corpSharePrice("+_pubLeftoverShares+"), $publicShares += "+_pubLeftoverShares+"]]">>
<</if>>
<<if $publicShares <= $personalShares - 3000>>
<br>You can sell some of your shares on the stock market. [[Sell 1000|Manage Corporation][cashX(corpSharePrice(), "stocksTraded"), $personalShares -= 1000, $publicShares += 1000]]
@@ -1413,67 +1413,67 @@ __Shares__
<<set _splitFeeValue = _splitFeeInitial - Math.floor((_splitFeeInitial * ($PC.trading / 100.0) / 2.0) / 1000) * 1000>>
<<set _splitStockConstants = [
{
- 'newStocks': 3,
- 'oldStocks': 2,
- 'weeks': 1,
- 'cost': 7.5
+ 'newStocks': 3,
+ 'oldStocks': 2,
+ 'weeks': 1,
+ 'cost': 7.5
},
{
- 'newStocks': 2,
- 'weeks': 1,
- 'cost': 10
+ 'newStocks': 2,
+ 'weeks': 1,
+ 'cost': 10
},
{
- 'newStocks': 3,
- 'weeks': 2,
- 'cost': 12.5
+ 'newStocks': 3,
+ 'weeks': 2,
+ 'cost': 12.5
},
{
- 'newStocks': 4,
- 'weeks': 3,
- 'cost': 15
+ 'newStocks': 4,
+ 'weeks': 3,
+ 'cost': 15
},
{
- 'oldStocks': 4,
- 'weeks': 1,
- 'cost': 15
+ 'oldStocks': 4,
+ 'weeks': 1,
+ 'cost': 15
},
{
- 'oldStocks': 10,
- 'weeks': 2,
- 'cost': 25
+ 'oldStocks': 10,
+ 'weeks': 2,
+ 'cost': 25
},
]>>
- <br>The corporation can perform a stock split to increase the number of stocks while maintaining the same owned value. This requires paying a market fee of @@.red;<<= cashFormat(_splitFeeValue)>>@@ plus a per-share fee depending on the type of split being done.
- <<if _splitFeeValue < _splitFeeInitial>>
- //You negotiated lower fees due to your @@.springgreen;business acumen@@.//
- <</if>>
+ <br>The corporation can perform a stock split to increase the number of stocks while maintaining the same owned value. This requires paying a market fee of @@.red;<<= cashFormat(_splitFeeValue)>>@@ plus a per-share fee depending on the type of split being done.
+ <<if _splitFeeValue < _splitFeeInitial>>
+ //You negotiated lower fees due to your @@.springgreen;business acumen@@.//
+ <</if>>
<<if $corpSpecTimer > 0>>
- <br>//The corporation has restructured too recently.//
+ <br>//The corporation has restructured too recently.//
<</if>>
<ul>
<<for _stockType range _splitStockConstants>>
- <<set _splitInitial = _stockType['cost']>>
- <<set _splitValue = _splitInitial>>
- <<set _splitDenom = _stockType['oldStocks'] || 1>>
- <<set _splitNumerator = _stockType['newStocks'] || 1>>
- <<set _splitMultiplier = _splitNumerator / _splitDenom>>
- <<set _splitTotal = _splitValue * ($publicShares + $personalShares) + _splitFeeValue>>
- <<set _splitWeek = _stockType['weeks']>>
- <li><<= _splitNumerator >>-for-<<= _splitDenom>> <<if _splitDenom > _splitNumerator>>inverse<</if>> stock split at @@.red;<<= cashFormat(_splitValue) >>@@ per share.
- Including market fees, this will cost the corporation a total of @@.red;<<= cashFormat(_splitTotal)>>@@,
- leaving the going rate for stock at @@.yellowgreen;<<= cashFormat(Math.floor(corpSharePrice(0, $personalShares * _splitMultiplier, $publicShares * _splitMultiplier))) >>@@ per 1000 shares.
- <<if $corpSpecTimer == 0>>
- <<if $publicShares % _splitDenom != 0 || $personalShares % _splitDenom != 0>>
- //The number of shares cannot be evenly split//
- <<elseif $corpCash > _splitTotal>>
- <<= "[[Split Shares|Manage Corporation][$corpCash -= " + _splitTotal + ", $publicShares *= " + _splitMultiplier + ", $personalShares *= " + _splitMultiplier + ", $corpSpecTimer="+_splitWeek+"]]" >>
- <<else>>
- //The corporation cannot afford the fees.//
- <</if>>
- <</if>>
- </li>
+ <<set _splitInitial = _stockType['cost']>>
+ <<set _splitValue = _splitInitial>>
+ <<set _splitDenom = _stockType['oldStocks'] || 1>>
+ <<set _splitNumerator = _stockType['newStocks'] || 1>>
+ <<set _splitMultiplier = _splitNumerator / _splitDenom>>
+ <<set _splitTotal = _splitValue * ($publicShares + $personalShares) + _splitFeeValue>>
+ <<set _splitWeek = _stockType['weeks']>>
+ <li><<= _splitNumerator >>-for-<<= _splitDenom>> <<if _splitDenom > _splitNumerator>>inverse<</if>> stock split at @@.red;<<= cashFormat(_splitValue) >>@@ per share.
+ Including market fees, this will cost the corporation a total of @@.red;<<= cashFormat(_splitTotal)>>@@,
+ leaving the going rate for stock at @@.yellowgreen;<<= cashFormat(Math.floor(corpSharePrice(0, $personalShares * _splitMultiplier, $publicShares * _splitMultiplier))) >>@@ per 1000 shares.
+ <<if $corpSpecTimer == 0>>
+ <<if $publicShares % _splitDenom != 0 || $personalShares % _splitDenom != 0>>
+ //The number of shares cannot be evenly split//
+ <<elseif $corpCash > _splitTotal>>
+ <<= "[[Split Shares|Manage Corporation][$corpCash -= " + _splitTotal + ", $publicShares *= " + _splitMultiplier + ", $personalShares *= " + _splitMultiplier + ", $corpSpecTimer="+_splitWeek+"]]" >>
+ <<else>>
+ //The corporation cannot afford the fees.//
+ <</if>>
+ <</if>>
+ </li>
<</for>>
</ul>
<br><br>
@@ -2067,14 +2067,14 @@ __Slave specialization__
<<if $corpSpecTimer == 0>>
<<link "No Focus">><<unset $corpSpecCosmetics>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
<</if>>
- <<elseif $corpSpecCosmetics == 0>>
- <br>The corporation doesn't apply cosmetic procedures.
- <<if $corpSpecTimer == 0>>
- <<if $corpSpecToken > 0>>
- [[Applied|Manage Corporation][$corpSpecCosmetics = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] |
- <</if>>
- <<link "No Focus">><<unset $corpSpecCosmetics>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
- <</if>>
+ <<elseif $corpSpecCosmetics == 0>>
+ <br>The corporation doesn't apply cosmetic procedures.
+ <<if $corpSpecTimer == 0>>
+ <<if $corpSpecToken > 0>>
+ [[Applied|Manage Corporation][$corpSpecCosmetics = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] |
+ <</if>>
+ <<link "No Focus">><<unset $corpSpecCosmetics>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
+ <</if>>
<</if>>
<<if $corpSpecImplants == 1>>
<br>The corporation applies tasteful implants to all slaves.
@@ -2091,12 +2091,12 @@ __Slave specialization__
<</if>>
<<elseif $corpSpecImplants == 0>>
<br>The corporation keeps their slaves entirely implant free.
- <<if $corpSpecTimer == 0>>
- <<if $corpSpecToken > 0>>
- [[Tasteful Implants|Manage Corporation][$corpSpecImplants = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] |
- <</if>>
- <<link "No Focus">><<unset $corpSpecImplants>><<set $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
- <</if>>
+ <<if $corpSpecTimer == 0>>
+ <<if $corpSpecToken > 0>>
+ [[Tasteful Implants|Manage Corporation][$corpSpecImplants = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] |
+ <</if>>
+ <<link "No Focus">><<unset $corpSpecImplants>><<set $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
+ <</if>>
<</if>>
<<if ndef $corpSpecPussy && ndef $corpSpecDick && ndef $corpSpecBalls && $corpSpecGenitalia == 1>>
<<set ndef $corpSpecGenitalia,
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index a801d627cdcfee91db08ee851eecbdd5bf715f2c..b0b8bbb5b7369ad2cbcc04e0ba552da186b5cf36 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -85,7 +85,7 @@ PC.pregSource documentation
<<set _babiesReduced = removeDuplicates(_babies)>>
<<if (_elite > 0 || _self > 0) && $arcologies[0].FSRestart != "unset">> /* for simplicity's sake, not going to allow other embryos to be added during an elite pregnancy */
- Since you are heavily pregnant with <<if (_elite > 1 || _self > 1 || _elite + _self > 1)>>children<<else>>a child<</if>> of the Societal Elite, you are quickly taken to the finest clinic the arcology has to offer. After a quick sedation, you awake to find your belly no longer round with child; that, and a note stating your next breeding partner and a notice that <<print cashFormat(50000)>> has been added to your account. The Societal Elite are @@.green;very pleased@@ at their new addition to the ranks. You just wish you could have seen your <<if _curBabies == 1>>little <<if _gender == "XX">>girl<<else>>boy<</if>> before they took <<if _gender == "XX">>her<<else>>him<</if>><<else>>babies before they took them<</if>> away to be raised into <<if _curBabies > 1>>proper members<<else>>a proper member<</if>> of the future world.
+ Since you are heavily pregnant with <<if (_elite + _self >= 2)>>children<<else>>a child<</if>> of the Societal Elite, you are quickly taken to the finest clinic the arcology has to offer. After a quick sedation, you awake to find your belly no longer round with child; that, and a note stating your next breeding partner and a notice that <<print cashFormat(50000)>> has been added to your account. The Societal Elite are @@.green;very pleased@@ at their new addition to the ranks. You just wish you could have seen your <<if _curBabies == 1>>little <<if _gender == "XX">>girl<<else>>boy<</if>> before they took <<if _gender == "XX">>her<<else>>him<</if>><<else>>babies before they took them<</if>> away to be raised into <<if _curBabies > 1>>proper members<<else>>a proper member<</if>> of the future world.
<<set $PC.birthElite += _elite>>
<<if $PC.ovaryAge >= 55 && $playerAging == 2>>
You are getting too old to have children; you feel like <<if _curBabies > 1>>they<<else>>this<</if>> may be your last.
@@ -503,7 +503,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<if _gender == "XX">>
daughters will be taught the joys of motherhood up until they are around <<if $minimumSlaveAge > $fertilityAge>>$minimumSlaveAge<<else>>$fertilityAge<</if>> years old, when they will be impregnated for the first time.<<if _curBabies > 1>> They say multiples run in families, so your daughters should blossom into quite the fertile breeders.<</if>>
<<else>>
- sons will be taught it is their duty to fuck every slavegirl they sees without a baby bump pregnant.
+ sons will be taught it is their duty to fuck every slavegirl they see without a baby bump pregnant.
<</if>>
<</if>>
<</if>>