diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index a56a520f908a7cd93b188f4dc681bc3ba40168d4..d0b72382bff1994a18167ffb4787ba3f16fddea6 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3155,6 +3155,20 @@ Slave has a tattoo that is only recognizable when she has a big belly.
"a star"
"a butterfly"
+abortionTat:
+
+Slave has a series of tattoos to denote how many abortions she has had.
+-1: no tattoo
+ 0: assigned to have tattoo, may not have one yet
+1+: number of abortion tattoos she has
+
+birthsTat:
+
+Slave has a series of tattoos to denote how many times she has given birth.
+-1: no tattoo
+ 0: assigned to have tattoo, may not have one yet
+1+: number of birth tattoos she has
+
bellySag:
How saggy her belly is after being distended for too long.
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index cef5ebbe08e216d33a5c61369ad8a8ca8a065558..1bc85472b47026ea2386a96533f92c9ca35f1870 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -193,7 +193,7 @@ window.saServeThePublic = (function saServeThePublic() {
r += ` leadership.`;
if (V.DJ.face > 40 && (V.DJ.intelligence + V.DJ.intelligenceImplant > 50)) {
if (slave.devotion > 20) {
- r += ` The DJ is such a gorgeous diva that ${he}'s swept along by ${DJpronouns.his} charisma, and does ${his} best to be a worthy part of ${DJpronouns.his} entourage.`;
+ r += ` The DJ is such a gorgeous diva that ${he}'s swept along by ${DJpronouns.possessive} charisma, and does ${his} best to be a worthy part of ${DJpronouns.possessive} entourage.`;
}
}
if (V.DJignoresFlaws !== 1) {
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 3554944697d05b69931d5a87eec0014b443ec15a..31dafd4a64e0b8b1c1a705f687b0ad5fcb1f9a5b 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -2017,6 +2017,13 @@ App.Entity.SlaveState = class SlaveState {
* * 1+: number of abortion tattoos she has
*/
this.abortionTat = -1;
+ /**
+ * Slave has a series of tattoos to denote how many times she has given birth.
+ * * -1: no tattoo
+ * * 0: assigned to have tattoo, may not have one yet
+ * * 1+: number of birth tattoos she has
+ */
+ this.birthsTat = -1;
/** Slave will give birth this week.
*
* 1: true; 0: false */
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 8ee83b2c2c72056b82abed35e0cf88075ff2c171..f40af8ce07d8e249c32729370e8e04b646b57b21 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -969,16 +969,16 @@ window.slaveJobValues = function() {
// Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little.
} else if (V.DJ.skill.entertainment <= 30) {
DJRepBonus += 0.05;
- // $DJ.slaveName's basic skills marginally <span class="green">improve</span> the atmosphere on $clubName.
+ // $DJ.slaveName's basic skills marginally <span class="green">improve</span> the atmosphere in $clubName.
} else if (V.DJ.skill.entertainment <= 60) {
DJRepBonus += 0.1;
- // $DJ.slaveName's skills <span class="green">improve</span> the atmosphere on $clubName.
+ // $DJ.slaveName's skills <span class="green">improve</span> the atmosphere in $clubName.
} else if (V.DJ.skill.entertainment < 100) {
DJRepBonus += 0.15;
- // $DJ.slaveName's skills greatly <span class="green">improve</span> the atmosphere on $clubName.
+ // $DJ.slaveName's skills greatly <span class="green">improve</span> the atmosphere in $clubName.
} else if (V.DJ.skill.entertainment >= 100) {
DJRepBonus += 0.20;
- // $DJ.slaveName's mastery immensely <span class="green">;improves</span> the atmosphere on $clubName.
+ // $DJ.slaveName's mastery immensely <span class="green">;improves</span> the atmosphere in $clubName.
}
if (V.DJ.muscles > 5 && V.DJ.muscles <= 95) {
V.DJRepBonus += 0.05;
diff --git a/src/js/physicalDevelopment.js b/src/js/physicalDevelopment.js
index bff64241ff9589307f9c54d8a879c827d0a2ef9b..5b601c9885e181755e20fd546a43f0d3de036491 100644
--- a/src/js/physicalDevelopment.js
+++ b/src/js/physicalDevelopment.js
@@ -1,19 +1,18 @@
window.physicalDevelopment = (function physicalDevelopment() {
"use strict";
-
+
let gigantomastiaMod;
let rearQuirk;
let rearQuirkDivider;
let dickMod;
-
+
return physicalDevelopment;
-
+
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function physicalDevelopment(slave) {
-
- if (slave.geneMods.NCS != 1) {
+ if (slave.geneMods.NCS !== 1) {
/* NCS completely blocks all natural physical growth: no height increases. It also blocks all hormonal secondary sexual * characteristics. So, on the female side: no boobs, no butt, no hips, and no labia. And on the male side: no dick, no clit, no balls, no scrotum, no shoulders. */
/* so this is a big old NO-OP to skip the physical development. */
if (slave.genes === "XX") { /* loli becoming a woman */
@@ -21,7 +20,7 @@ window.physicalDevelopment = (function physicalDevelopment() {
if (slave.physicalAge === 13) {
increaseFaceXX(slave);
if (slave.voice > 0) {
- increaseVoiceXX(slave);
+ increaseVoiceXX(slave);
}
}
increaseBoobsXX(slave);
@@ -37,7 +36,7 @@ window.physicalDevelopment = (function physicalDevelopment() {
if (slave.physicalAge === 13) {
increaseFaceXY(slave);
if (slave.voice > 1) {
- increaseVoiceXY(slave);
+ increaseVoiceXY(slave);
}
}
increaseBoobsXY(slave);
@@ -54,10 +53,10 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
}
}
-
+
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseHeightXX(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.physicalAge === 3) {
@@ -513,8 +512,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseHeightXY(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.physicalAge === 3) {
@@ -980,8 +979,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseBoobsXX(slave) {
if (slave.geneticQuirks.gigantomastia === 2 && slave.geneticQuirks.macromastia === 2) {
gigantomastiaMod = 3;
@@ -1189,9 +1188,9 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
}
- /**
- * @param {App.Entity.SlaveState} slave
- */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseBoobsXY(slave) {
if (slave.geneticQuirks.gigantomastia === 2 && slave.geneticQuirks.macromastia === 2) {
gigantomastiaMod = 3;
@@ -1330,8 +1329,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseHipsXX(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.physicalAge === 8) {
@@ -1555,10 +1554,10 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
}
}
-
+
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseHipsXY(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.physicalAge === 8) {
@@ -1722,13 +1721,13 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
}
}
-
+
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseButtXX(slave) {
rearQuirk = slave.geneticQuirks.rearLipedema === 2 ? 2 : 0;
- rearQuirkDivider = rearQuirk === 0 ? 1 : _rearQuirk;
+ rearQuirkDivider = rearQuirk === 0 ? 1 : rearQuirk;
if (slave.hormoneBalance >= 200) {
if (slave.physicalAge === 8) {
@@ -1888,11 +1887,11 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseButtXY(slave) {
rearQuirk = slave.geneticQuirks.rearLipedema === 2 ? 2 : 0;
- rearQuirkDivider = rearQuirk === 0 ? 1 : _rearQuirk;
+ rearQuirkDivider = rearQuirk === 0 ? 1 : rearQuirk;
if (slave.hormoneBalance >= 200) {
if (slave.physicalAge === 8) {
if (slave.butt < (3 + rearQuirk)) {
@@ -1983,8 +1982,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseDick(slave) {
dickMod = (slave.geneticQuirks.wellHung === 2 ? 2 : 1);
@@ -2261,8 +2260,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseBalls(slave) {
if (slave.hormoneBalance >= 200) {
} else if (slave.hormoneBalance >= 100) {
@@ -2492,8 +2491,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseClit(slave) {
if (slave.hormoneBalance <= -200) {
if (slave.physicalAge === 8) {
@@ -2638,8 +2637,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseWaistXX(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.physicalAge >= 12) {
@@ -2685,8 +2684,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseWaistXY(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.physicalAge >= 12) {
@@ -2732,8 +2731,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseFaceXX(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.face > 60) {
@@ -2781,8 +2780,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseFaceXY(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.face > 60) {
@@ -2804,8 +2803,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseVoiceXX(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.voice === 3) {
@@ -2841,8 +2840,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increaseVoiceXY(slave) {
if (slave.hormoneBalance >= 200) {
if (slave.voice < 2) {
@@ -2878,8 +2877,8 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
/**
- * @param {App.Entity.SlaveState} slave
- */
+ * @param {App.Entity.SlaveState} slave
+ */
function increasePregAdpatationXX(slave) {
if (slave.physicalAge === 3) {
if (slave.pregAdaptation < 5) {
@@ -2946,11 +2945,11 @@ window.physicalDevelopment = (function physicalDevelopment() {
slave.pregAdaptation += 8;
}
}
- }
+ }
- /**
- * @param {App.Entity.SlaveState} slave
- */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ */
function increasePregAdpatationXY(slave) {
if (slave.physicalAge === 3) {
if (slave.pregAdaptation < 5) {
@@ -3018,5 +3017,4 @@ window.physicalDevelopment = (function physicalDevelopment() {
}
}
}
-
})();
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index fc9e637560ebaaf65a625f3892d35dd9e04b4307..262a14851168907cf54903e5b2f83888b79e07ba 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -141,6 +141,9 @@ window.SlaveStatsChecker = (function() {
if (slave.abortionTat > 0 || (slave.abortionTat === 0 && slave.pregKnown === 1)) {
score += 1;
}
+ if (slave.birthsTat > 0 || (slave.birthsTat === 0 && slave.pregKnown === 1)) {
+ score += 1;
+ }
return score;
}
diff --git a/src/npc/abort.tw b/src/npc/abort.tw
index aa35a0583a0cafc0a1c241785a15a9a0b3f7469a..cb590ca54be9543a18b18737cdc6b0bcd169bb69 100644
--- a/src/npc/abort.tw
+++ b/src/npc/abort.tw
@@ -37,8 +37,8 @@ The remote surgery makes aborting a pregnancy quick and efficient.
<</if>>
<<if $activeSlave.abortionTat > -1>>
- The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($activeSlave.abortionTat)>> crossed out infant.
<<set $activeSlave.abortionTat++>>
+ The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($activeSlave.abortionTat)>> crossed out infant.
<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
<</if>>
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index f563dc30320c9164a98a5cfd6b794341828dd57c..11624a4127533daef834bb56dcfc14513c219c17 100644
--- a/src/pregmod/birthStorm.tw
+++ b/src/pregmod/birthStorm.tw
@@ -43,6 +43,12 @@ The remote surgery allows the removal of the pregnancy generator through convent
<<set $activeSlave.devotion += 4>>
<</if>>
+<<if $slaves[$i].birthsTat > -1>>
+ <<set $activeSlave.birthsTat++>>
+ The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($activeSlave.birthsTat)>> permanent infant.
+ <<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
+<</if>>
+
<<set _babyPrice = random(-20,20)>>
<<if $activeSlave.broodmother == 2>>
<<set $activeSlave.preg = -3>>
diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw
index 3b2226747cb1b00c149ad0fd1b8bc5b34a88325d..a127c9ab3a3d7a88fcf3593997d146571535c961 100644
--- a/src/pregmod/saAgent.tw
+++ b/src/pregmod/saAgent.tw
@@ -462,6 +462,9 @@
<<else>>
<<set $slaves[$i].pregWeek = -4>>
<</if>>
+ <<if $slaves[$i].birthsTat > -1>>
+ <<set $slaves[$i].birthsTat++>>
+ <</if>>
<<elseif ($slaves[$i].preg > $slaves[$i].pregData.normalBirth) && ($slaves[$i].broodmother == 0)>>
<<set $slaves[$i].counter.birthsTotal += WombBirthReady($slaves[$i], $slaves[$i].pregData.minLiveBirth), WombBirth($slaves[$i], $slaves[$i].pregData.minLiveBirth), WombFlush($slaves[$i]), $slaves[$i].preg = 0, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0>>
<<if $slaves[$i].geneticQuirks.fertility+$slaves[$i].geneticQuirks.hyperFertility >= 4>>
@@ -471,10 +474,16 @@
<<else>>
<<set $slaves[$i].pregWeek = -4>>
<</if>>
+ <<if $slaves[$i].birthsTat > -1>>
+ <<set $slaves[$i].birthsTat++>>
+ <</if>>
<<elseif ($slaves[$i].preg > 37) && ($slaves[$i].broodmother > 0)>>
<<if $slaves[$i].broodmother > 0>>
<<set $slaves[$i].counter.birthsTotal += WombBirthReady($slaves[$i], 37), WombBirth($slaves[$i], 37), $slaves[$i].preg = WombMaxPreg($slaves[$i])>>
<</if>>
+ <<if $slaves[$i].birthsTat > -1>>
+ <<set $slaves[$i].birthsTat++>>
+ <</if>>
<</if>>
<<run SetBellySize($slaves[$i])>> /*Actually it's now better to set belly size without checking of any conditions. Just to be sure. Should correct forgotten variables too. */
diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw
index 83f0f74c83c61be9f421819d49f88a88f7835146..335f87c904c055266dfb97d2cd87bbf2881ad9bd 100644
--- a/src/pregmod/saClothes.tw
+++ b/src/pregmod/saClothes.tw
@@ -458,8 +458,8 @@
<</if>>
<</if>>
<<if $slaves[$i].abortionTat > -1>>
- The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant.
<<set $slaves[$i].abortionTat++>>
+ The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant.
<<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>>
<</if>>
<<else>>
@@ -821,8 +821,8 @@
<<set $slaves[$i].devotion += 4>>
<</if>>
<<if $slaves[$i].abortionTat > -1>>
- The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant.
<<set $slaves[$i].abortionTat++>>
+ The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant.
<<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>>
<</if>>
<</if>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 0444fc2aa337f7d1013e7f392219384d071c6532..2b15432488912ceab710541552a99bdd302534a9 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -128,6 +128,7 @@
<<set $args[0].custom.tattoo = $args[1].custom.tattoo>>
<<set $args[0].bellyTat = $args[1].bellyTat>>
<<set $args[0].abortionTat = $args[1].abortionTat>>
+<<set $args[0].birthsTat = $args[1].birthsTat>>
<<set $args[0].pubertyAgeXX = $args[1].pubertyAgeXX>>
<<set $args[0].pubertyXX = $args[1].pubertyXX>>
<<set $args[0].pubertyAgeXY = $args[1].pubertyAgeXY>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index e44d5bdbf2a916d96b333f50e1157449d9289bc6..738dd3d4ca4f5e72ebca5d3898196857e4c0f798 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -162,6 +162,9 @@
<<if ndef $args[0].abortionTat>>
<<set $args[0].abortionTat = -1>>
<</if>>
+<<if ndef $args[0].birthsTat>>
+ <<set $args[0].birthsTat = -1>>
+<</if>>
<<if def $args[0].reservedChildren>>
<<run delete $args[0].reservedChildren>>
<</if>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 5aede5b61944e6f76072226c4eaad52a0de8d4e3..74bd2ff683f981625fe9e0682bfd07829b7beb90 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -1123,6 +1123,13 @@ All in all,
<<run SetBellySize($slaves[$i])>>
+<<if $slaves[$i].birthsTat > -1>>
+ <br><br>
+ <<set $slaves[$i].birthsTat++>>
+ The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].birthsTat)>> permanent infant.
+ <<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>>
+<</if>>
+
<</widget>>
/*===============================================================================================*/
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 30481a40b5cad399241a8990c200a2bc9a511f80..6113dd83a6f27f7b691a12f45b73f6a0301e05a9 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -764,6 +764,27 @@ Choose a tattoo style:
$His middle isn't large enough to be a suitable canvas for a navel focused tattoo.
<</if>>
+<br>
+<<if $activeSlave.birthsTat > 0>>
+ <<if $activeSlave.birthsTat > 1>>
+ $He has a series of num($activeSlave.birthsTat) baby-shaped tattoos adorning $his stomach; one for each successful pregnancy<<if $activeSlave.pregKnown == 1>> and a temporary one for $his current pregnancy<</if>>.
+ <<else>>
+ $He has a single baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one temporary one,<</if>> adorning $his stomach.
+ <</if>>
+ //[[Remove tattoos|Body Modification][$activeSlave.birthsTat = -1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]//
+<<elseif $activeSlave.birthsTat == 0>>
+ <<if $activeSlave.pregKnown == 1>>
+ $He has a single baby-shaped temporary tattoo adorning $his stomach.
+ //[[Remove it|Body Modification][$activeSlave.birthsTat = -1]]//
+ <<if $activeSlave.abortionTat > -1>> //This will only remove birth tracking//<</if>>
+ <<else>>
+ $He is scheduled to receive a tattoo each time $he gives birth.
+ //[[Cancel|Body Modification][$activeSlave.birthsTat = -1]]//
+ <</if>>
+<<else>>
+ Have $him receive a tattoo each time $he gives birth.
+ //[[Begin keeping track|Body Modification][$activeSlave.birthsTat = 0]]//
+<</if>>
<br>
<<if $activeSlave.abortionTat > 0>>
<<if $activeSlave.abortionTat > 1>>
@@ -776,6 +797,7 @@ Choose a tattoo style:
<<if $activeSlave.pregKnown == 1>>
$He has a single baby-shaped temporary tattoo adorning $his stomach.
//[[Remove it|Body Modification][$activeSlave.abortionTat = -1]]//
+ <<if $activeSlave.birthsTat > -1>> //This will only remove abortion tracking//<</if>>
<<else>>
$He is scheduled to receive a tattoo each time $he gets an abortion or miscarries.
//[[Cancel|Body Modification][$activeSlave.abortionTat = -1]]//
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 48cc7bbde6aae880a3c679004238347b3467e370..ba064f2a268b80c4532e841ecd0921e2350ca688 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -62,13 +62,13 @@
<<if ($DJ.skill.entertainment <= 10)>>
Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little.
<<elseif ($DJ.skill.entertainment <= 30)>>
- $DJ.slaveName's basic skills marginally @@.green;improve@@ the atmosphere on $clubName.
+ $DJ.slaveName's basic skills marginally @@.green;improve@@ the atmosphere in $clubName.
<<elseif ($DJ.skill.entertainment <= 60)>>
- $DJ.slaveName's skills @@.green;improve@@ the atmosphere on $clubName.
+ $DJ.slaveName's skills @@.green;improve@@ the atmosphere in $clubName.
<<elseif ($DJ.skill.entertainment < 100)>>
- $DJ.slaveName's skills greatly @@.green;improve@@ the atmosphere on $clubName.
+ $DJ.slaveName's skills greatly @@.green;improve@@ the atmosphere in $clubName.
<<elseif ($DJ.skill.entertainment >= 100)>>
- $DJ.slaveName's mastery immensely @@.green;improves@@ the atmosphere on $clubName.
+ $DJ.slaveName's mastery immensely @@.green;improves@@ the atmosphere in $clubName.
<</if>>
<<if ($DJ.muscles > 5) && ($DJ.muscles <= 95)>>
$His toned body helps $him lead $his fellow club girls by letting $him dance all night.
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index aa4383667d008d9ebae297c0862a11ea8ce7008e..4361dd9e2448d484c2e2ccde50ccf55241f1193a 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1890,13 +1890,13 @@ $He is
<<if $activeSlave.amp == 0>>
<<if $activeSlave.weight > 190>>
- $He has hugely thick arms with sagging fat rolls and
+ $He has hugely thick arms with sagging fat rolls<<if $activeSlave.muscles > 5>> and<<else>>.<</if>>
<<elseif $activeSlave.weight > 160>>
- $He has thick arms with drooping fat folds and
+ $He has thick arms with drooping fat folds<<if $activeSlave.muscles > 5>> and<<else>>.<</if>>
<<elseif $activeSlave.weight > 130>>
- $He has plump arms with
+ $He has plump arms<<if $activeSlave.muscles > 5>> with<<else>>.<</if>>
<<elseif $activeSlave.weight > 97>>
- $He has chubby arms with
+ $He has chubby arms<<if $activeSlave.muscles > 5>> with<<else>>.<</if>>
<<elseif $activeSlave.muscles > 5>>
$He has normal arms with
<</if>>
@@ -1934,15 +1934,15 @@ $He is
<<if $activeSlave.amp == 0>>
<<if $activeSlave.weight > 190>>
- $He has extremely fat legs with immense soft, rather uneven thighs and
+ $He has extremely fat legs with immense soft, rather uneven thighs<<if $activeSlave.muscles > 5>> and<<else>>.<</if>>
<<elseif $activeSlave.weight > 160>>
- $He has very fat legs with massively thick, soft, somewhat uneven thighs and
+ $He has very fat legs with massively thick, soft, somewhat uneven thighs<<if $activeSlave.muscles > 5>> and<<else>>.<</if>>
<<elseif $activeSlave.weight > 130>>
- $He has fat legs with hugely thick, soft thighs and
+ $He has fat legs with hugely thick, soft thighs<<if $activeSlave.muscles > 5>> and<<else>>.<</if>>
<<elseif $activeSlave.weight > 97>>
- $He has fat legs with thick, soft thighs and
+ $He has fat legs with thick, soft thighs<<if $activeSlave.muscles > 5>> and<<else>>.<</if>>
<<elseif $activeSlave.weight > 95>>
- $He has normal legs with thick, soft thighs and
+ $He has normal legs with thick, soft thighs<<if $activeSlave.muscles > 5>> and<<else>>.<</if>>
<<elseif $activeSlave.muscles > 5>>
$He has relatively normal legs and thighs with
<</if>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index f2aef459850762cd6d68043151dd66bfeeb707cb..8c4fe76b60931eb89e3001f4677a97b8271085ea 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -443,7 +443,7 @@
Your
<<if passage() == "P rivalry actions">>
- target is quickly delivered. Politely dismissing the head of your <<if $mercenariesTitle != "mercenaries">> $mercenariesTitle<<else>> mercenaries<</if>>, you savor
+ target is quickly delivered. Politely dismissing the head of your $mercenariesTitle, you savor
<<else>>
bounty is quickly claimed, and you are treated to
<</if>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index c3022fdad8df5ce60c46b74bc030ad7a439b05d7..13010bff4e47da0ff01f7714b8d7bb12efe0856c 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -1159,8 +1159,8 @@
<</if>>
<</if>>
<<if $slaves[$i].abortionTat > -1>>
- The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant.
<<set $slaves[$i].abortionTat++>>
+ The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant.
<<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 222dd062aaed44082a2a04454c4fe99cde33b707..ec3a43af2ebb299b7bbbc879ed7eed4785a3a64f 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5397,6 +5397,10 @@
Society @@.red;is disgusted@@ by the tally of aborted children adorning $his skin.
<<= FSChangePorn("Repopulationist", -1)>>
<</if>>
+ <<if $slaves[$i].birthsTat > 0>>
+ Society @@.green;is pleased@@ by the tally of succesful births adorning $his skin.
+ <<= FSChangePorn("Repopulationist", 1)>>
+ <</if>>
<<elseif $arcologies[0].FSRepopulationFocusPregPolicy == 1>>
<<if $slaves[$i].preg > 30>>
Society @@.green;loves@@ $slaves[$i].slaveName's advanced pregnancy. It's very trendy.
@@ -8424,8 +8428,8 @@
<</if>>
<<set $slaves[$i].pregType = 0, WombFlush($slaves[$i]), $slaves[$i].pregKnown = 0, $slaves[$i].pregWeek = -4>>
<<if $slaves[$i].abortionTat > -1>>
- The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant.
<<set $slaves[$i].abortionTat++>>
+ The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant.
<<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>>
<</if>>
<<run SetBellySize($slaves[$i])>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index 01a3de988cbed51de0e8598f7f51ceb920848053..525b7f7613894018f678390f66cd7ca9bbcce930 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -119,10 +119,8 @@ I need to break single passage to several widgets, as it's been overcomplicated
<</switch>>
<</if>>
<<seBirthPostpartum>>
- <<seBirthCritical>>
- <<set $slaves[$i].labor = 0>>
- <<set $slaves[$i].induce = 0>>
<<set $slaves[$i].counter.laborCount++>>
+ <<seBirthCritical>>
<<else>>
<<set $activeSlave = $slaves[$i]>>
<<= removeActiveSlave() >>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 57d6cd2ebf38701e0f35d0f8cfae9fc750e4a3a2..752b9f670d5584a623661b04ee082e21b3395cca 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -16544,13 +16544,22 @@ $He has
$He has an unrecognizable tattoo scrunched around $his navel.
<</if>>
<</if>>
+ <<if $activeSlave.birthsTat > 0>>
+ <<if $activeSlave.birthsTat > 1>>
+ $He has a series of $activeSlave.birthsTat baby-shaped tattoos adorning $his stomach; one for each successful pregnancy<<if $activeSlave.pregKnown == 1>> and a temporary one for $his current pregnancy<</if>>.
+ <<else>>
+ $He has a single baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one temporary one,<</if>> adorning $his stomach.
+ <</if>>
+ <<elseif $activeSlave.birthsTat == 0 && $activeSlave.abortionTat == -1 && $activeSlave.pregKnown == 1>>
+ $He has a single baby-shaped temporary tattoo adorning $his stomach.
+ <</if>>
<<if $activeSlave.abortionTat > 0>>
<<if $activeSlave.abortionTat > 1>>
$He has a series of $activeSlave.abortionTat crossed out baby-shaped tattoos<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach; one for each pregnancy $he's failed to complete.
<<else>>
$He has a single crossed out, baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach.
<</if>>
- <<elseif $activeSlave.abortionTat == 0 && $activeSlave.pregKnown == 1>>
+ <<elseif $activeSlave.abortionTat == 0 && $activeSlave.birthsTat == -1 && $activeSlave.pregKnown == 1>>
$He has a single baby-shaped temporary tattoo adorning $his stomach.
<</if>>
<<if ($activeSlave.brand != 0) && ($activeSlave.brandLocation == "belly")>>
@@ -19517,16 +19526,28 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
$He has an unrecognizable tattoo scrunched around $his navel.
<</if>>
<</if>>
-
+
+ <<if $activeSlave.birthsTat > 0>>
+ <<if $activeSlave.birthsTat > 1>>
+ $He has a series of $activeSlave.birthsTat baby-shaped tattoos adorning $his stomach; one for each successful pregnancy<<if $activeSlave.pregKnown == 1>> and a temporary one for $his current pregnancy<</if>>.
+ <<else>>
+ $He has a single baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one temporary one,<</if>> adorning $his stomach.
+ <</if>>
+ <<elseif $activeSlave.birthsTat == 0 && $activeSlave.abortionTat == -1 && $activeSlave.pregKnown == 1>>
+ $He has a single baby-shaped temporary tattoo adorning $his stomach.
+ <</if>>
<<if $activeSlave.abortionTat > 0>>
<<if $activeSlave.abortionTat > 1>>
$He has a series of $activeSlave.abortionTat crossed out baby-shaped tattoos<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach; one for each pregnancy $he's failed to complete.
<<else>>
$He has a single crossed out, baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach.
<</if>>
- <<elseif $activeSlave.abortionTat == 0 && $activeSlave.pregKnown == 1>>
+ <<elseif $activeSlave.abortionTat == 0 && $activeSlave.birthsTat == -1 && $activeSlave.pregKnown == 1>>
$He has a single baby-shaped temporary tattoo adorning $his stomach.
<</if>>
+ <<if ($activeSlave.brand != 0) && ($activeSlave.brandLocation == "belly")>>
+ $He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation.
+ <</if>>
<<if ($activeSlave.brand != 0) && ($activeSlave.brandLocation == "belly")>>
$He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation.