diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 57ccadd175d7cc1fd3999cb82226fe6fb7bde256..3c31b0d4e4a7922d602a3326055462d0500142a6 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,22 @@
0.10.7.1-0.1.x
+5/12/2018
+
+ 94
+ -slaves may now birth identical twins
+ -anon's quick find slave index ui now works on tabbed penthouse and supports sort boxes
+ -fixes
+
+5/10/2018
+
+ 93
+ -fixes to vector art and potential custom image issues in RESS
+ -fixes
+
+ 91 - 92
+ -more tweaks to anon's quick find slave index ui
+
5/08/2018
90
diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index ff811dbe2e625af3a4d9238f87cf314f404ab3e5..54d41b71a390b25659e3d0244c65eae228f9bbff 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -406,3 +406,108 @@ button.accordion.active:before {
/* end extended family css */
config.history.tracking = false;
+
+/*:: Quick List stylesheet [stylesheet]*/
+
+.hidden
+{
+ display:none;
+}
+
+div.quicklist.devotion button.mindbroken
+{
+ background-color:red;
+}
+div.quicklist.devotion button.very-hateful
+{
+ background-color:darkviolet;
+}
+div.quicklist.devotion button.hateful
+{
+ background-color:darkviolet;
+}
+div.quicklist.devotion button.resistant
+{
+ background-color:mediumorchid;
+}
+div.quicklist.devotion button.ambivalent
+{
+ background-color: yellow;
+ color: #444444;
+}
+div.quicklist.devotion button.accepting
+{
+ background-color: hotpink;
+}
+div.quicklist.devotion button.devoted
+{
+ background-color: deeppink;
+}
+div.quicklist.devotion button.worshipful
+{
+ background-color: magenta;
+}
+div.quicklist.trust button.mindbroken
+{
+ background-color:red;
+}
+div.quicklist.trust button.extremely-terrified
+{
+ background-color: darkgoldenrod;
+}
+div.quicklist.trust button.terrified
+{
+ background-color: goldenrod;
+}
+div.quicklist.trust button.frightened
+{
+ background-color: gold;
+ color: coral;
+}
+div.quicklist.trust button.fearful
+{
+ background-color: yellow;
+ color: green;
+}
+div.quicklist.trust button.hate-careful
+{
+ background-color: orange;
+}
+div.quicklist.trust button.careful
+{
+ background-color: mediumaquamarine;
+ color: forestgreen;
+}
+div.quicklist.trust button.bold
+{
+ background-color: orangered;
+}
+div.quicklist.trust button.trusting
+{
+ background-color: mediumseagreen;
+}
+div.quicklist.trust button.defiant
+{
+ background-color: darkred;
+}
+div.quicklist.trust button.profoundly-trusting
+{
+ background-color: seagreen;
+}
+div.quicklist
+{
+ table-layout: fixed;
+ text-align: center;
+ border-collapse: separate;
+ border-spacing: 2px;
+ border-style: hidden;
+ empty-cells: hide;
+ width: 70%;
+}
+div.quicklist button
+{
+ margin-top: 15px;
+ margin-right: 20px;
+ white-space: nowrap;
+}
+
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 67d319da6c9b3f3db39cbfe41ec7f75f3e1bf4cb..84080ca0d175917f02ab0f111d0d3d8a4bf08c12 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -3692,6 +3692,79 @@ window.capFirstChar = function capFirstChar(string) {
return string.charAt(0).toUpperCase() + string.substr(1);
}
+window.getSlaveDisplayName = function (slave)
+{
+ if ( (!slave)
+ || (!State)
+ )
+ {
+ return undefined;
+ }
+ var surnamesFirstCountries = [ "Cambodian", "Chinese", "Hungarian", "Japanese", "Korean",
+ "Mongolian", "Taiwanese", "Vietnamese"
+ ]
+ , names = [ slave.slaveName, slave.slaveSurname || ""
+ ];
+ ;
+ if ( (1 != State.variables.surnameOrder)
+ && (surnamesFirstCountries.includes(slave.nationality))
+ )
+ {
+ names.reverse();
+ }
+ return names.join(" ").trim();
+}
+
+window.getSlaveDevotionClass = function (slave)
+{
+ if ( (!slave)
+ || (!State)
+ )
+ {
+ return undefined;
+ }
+ if ('mindbroken' == slave.fetish) return 'mindbroken';
+
+ if (-95 > slave.devotion) return 'very-hateful';
+ else if (-50 > slave.devotion) return 'hateful';
+ else if (-20 > slave.devotion) return 'resistant';
+ else if (20 >= slave.devotion) return 'ambivelent';
+ else if (50 >= slave.devotion) return 'accepting';
+ else if (95 >= slave.devotion) return 'devoted';
+ else return 'worshipful';
+}
+
+window.getSlaveTrustClass = function (slave)
+{
+ if ( (!slave)
+ || (!State)
+ )
+ {
+ return undefined;
+ }
+ if ('mindbroken' == slave.fetish) return '';
+
+ if (-95 > slave.trust) return 'extremely-terrified';
+ else if (-50 > slave.trust) return 'terrified';
+ else if (-20 > slave.trust) return 'frightened';
+ else if (20 >= slave.trust) return 'fearful';
+ else if (50 >= slave.trust)
+ {
+ if (-20 > slave.devotion) return 'hate-careful';
+ else return 'careful';
+ }
+ else if (95 >= slave.trust)
+ {
+ if (-20 > slave.devotion) return 'bold';
+ else return 'trusting';
+ }
+ else
+ {
+ if (-20 > slave.devotion) return 'defiant';
+ else return 'profoundly-trusting';
+ }
+}
+
/*:: Span Macro JS [script]*/
/*
@@ -6953,9 +7026,10 @@ $isReady = WombBirthReady($slave, $birth_ready_age) - how many children ready to
$children = WombBirth($slave, $birth_ready_age) - for actual birth. Return array with fetuses objects that birthed (can be used in future) and remove them from womb array of $slave. Should be called at actual birth code in sugarcube. fetuses that not ready remained in womb (array).
-WombFlush($slave) - clean womb (array). Can be used at broodmother birthstorm or abortion situations in game. But birthstorm logicaly should use WombBirth($slave, 35) or so before - some children in this event is live capable, others is not.
+WombFlush($slave) - clean womb (array). Can be used at broodmother birthstorm or abortion situations in game. But birthstorm logically should use WombBirth($slave, 35) or so before - some children in this event is live capable, others is not.
$slave.bellyPreg = WombGetWolume($slave) - return double, with current womb volume in CC - for updating $slave.bellyPreg, or if need to update individual fetuses sizes.
+
*/
window.WombInit = function(actor) //Init womb system.
@@ -7019,6 +7093,7 @@ window.WombImpregnate = function(actor, fCount, fatherID, age)
tf.fatherID = fatherID; //We can store who is father too.
tf.sex = Math.round(Math.random())+1; // 1 = male, 2 = female. For possible future usage, just as concept now.
tf.volume = 1; //Initial, to create property. Updated with actual data after WombGetVolume call.
+ tf.identical = 0; //Initial, to create property. Updated with actual data during fetalSplit call.
try {
if (actor.womb.length == 0)
@@ -7057,7 +7132,7 @@ window.WombProgress = function(actor, ageToAdd)
window.WombBirth = function(actor, readyAge)
{
try{
- actor.womb.sort(function (a, b){return b.age - a.age}); //For normal processing fetuses that more old should be first. Now - they are.
+ WombSort(actor); //For normal processing fetuses that more old should be first. Now - they are.
}catch(err){
WombInit(actor);
alert("WombBirth warning - " + actor.slaveName+" "+err);
@@ -7147,7 +7222,7 @@ window.WombGetVolume = function(actor) //most code from pregJS.tw with minor ada
window.WombUpdatePregVars = function(actor) {
- actor.womb.sort(function (a, b){return b.age - a.age});
+ WombSort(actor);
if (actor.womb.length > 0)
{
if (actor.preg > 0 && actor.womb[0].age > 0)
@@ -7165,7 +7240,7 @@ window.WombUpdatePregVars = function(actor) {
window.WombMinPreg = function(actor)
{
- actor.womb.sort(function (a, b){return b.age - a.age});
+ WombSort(actor);
if (actor.womb.length > 0)
return actor.womb[actor.womb.length-1].age;
@@ -7175,7 +7250,7 @@ window.WombMinPreg = function(actor)
window.WombMaxPreg = function(actor)
{
- actor.womb.sort(function (a, b){return b.age - a.age});
+ WombSort(actor);
if (actor.womb.length > 0)
return actor.womb[0].age;
else
@@ -7259,6 +7334,56 @@ window.WombZeroID = function(actor, id)
WombNormalizePreg(actor);
}
+/* Sorts the womb object by age with oldest and thus soonest to be born, first. This will be needed in the future once individual fertilization is a possiblity.*/
+window.WombSort = function(actor)
+{
+ actor.womb.sort(function (a, b){return b.age - a.age});
+}
+
+window.fetalSplit = function(actor)
+{
+ var i, ft;
+ var nft = {};
+ nft.age = actor.preg;
+ nft.fatherID = actor.pregSource;
+ nft.sex = Math.round(Math.random())+1;
+ nft.volume = 1;
+ nft.identical = 0;
+
+ actor.womb.forEach(function(s){
+ if ((jsRandom(1,1000) >= 1000) && s.identical !== 1)
+ {
+ nft = {};
+ nft.age = s.age;
+ nft.fatherID = s.fatherID;
+ nft.sex = s.sex;
+ nft.volume = s.volume;
+ actor.womb.push(nft);
+ s.identical = 1;
+ }
+ });
+ WombNormalizePreg(actor);
+
+}
+
+/* alt
+window.fetalSplit = function(actor)
+{
+ var i, ft, nft;
+
+ actor.womb.forEach(function(s){
+ if ((jsRandom(1,1000) >= 1000) && s.identical !== 1)
+ {
+ nft = deepCopy(s);
+ actor.womb.push(nft);
+ s.identical = 1;
+ }
+ });
+ WombNormalizePreg(actor);
+
+}
+*/
+
/*:: clothingSelectionJS [script]*/
window.todaysOutfit = function(slave) {
@@ -9325,3 +9450,115 @@ window.setColors = function(colorMap){
});
});
}
+
+/*:: HTAG Macro JS [script]*/
+
+/*
+ * <<htag>> macro
+ * A simple macro which allows to create wrapping html elements with dynamic IDs.
+ * idea blatantly robbed from the spanMacroJS.tw but expanded to a more generic
+ * case, allowing <div>, <button> or whatever you want. elements, default is for
+ * the div though. In addition, you can pass an object in as the first argument
+ * instead of an id, and each of the object's attributes will become attributes
+ * of the generate tag.
+ *
+ * Usage: <<htag id>>...<</htag>>
+ * Usage: <<htag id tag>>...<</htag>>
+ * Usage: <<htag atributes>>...<</htag>>
+ * Usage: <<htag atributes tag>>...<</htag>>
+ */
+Macro
+ .add(
+ 'htag',
+ { tags : null
+ , handler()
+ {
+ const payload = this.payload[0].contents.replace(/(^\n+|\n+$)/, '');
+ let htag = 'div';
+ let attributes;
+
+ var munge = function (val, key)
+ {
+ return key + '="' + val + '"';
+ };
+
+ if (1 > this.args.length)
+ {
+ return
+ this.error(
+ 'invalid syntax, format: <<htag [id [ tag ] | attributes [ tag ] >>'
+ );
+ }
+ if (1 < this.args.length)
+ {
+ htag = String(this.args[1]).trim();
+ }
+ if ("object" === typeof this.args[0])
+ {
+ attributes = $.map(this.args[0], munge).join(" ");
+ }
+ else
+ {
+ attributes = 'id="' + String(this.args[0]).trim() + '"';
+ }
+ Config.debug && this.debugView.modes({block: true});
+
+ jQuery('<' + htag + ' ' + attributes + ' />')
+ .wiki(payload)
+ .appendTo(this.output);
+ }
+});
+
+/*:: Quick List [script]*/
+
+window.sortDomObjects = function (objects, attrName)
+{
+ var sortingByAttr = function (a, b)
+ {
+ var aVal = parseInt(a.getAttribute(attrName))
+ , bVal = parseInt(b.getAttribute(attrName))
+ ;
+ return bVal - aVal;
+ };
+ return objects.toArray().sort(sortingByAttr);
+};
+
+window.sortButtonsByDevotion = function ()
+{
+ var $sortedButtons = $('#qlWrapper button').remove();
+
+ $sortedButtons = sortDomObjects($sortedButtons, 'data-devotion');
+
+ $($sortedButtons).appendTo($('#qlWrapper'));
+ quickListBuildLinks();
+};
+
+window.sortButtonsByTrust = function ()
+{
+ var $sortedButtons = $('#qlWrapper button').remove();
+
+ $sortedButtons = sortDomObjects($sortedButtons, 'data-trust');
+
+ $($sortedButtons).appendTo($('#qlWrapper'));
+ quickListBuildLinks();
+};
+
+window.quickListBuildLinks = function ()
+{
+ $("[data-scroll-to]").click(function() {
+ var $this = $(this), $toElement = $this.attr('data-scroll-to'),
+ /*
+ * note the * 1 enforces $offset to be an integer, without
+ * it we scroll to True, which goes nowhere fast.
+ */
+ $offset = $this.attr('data-scroll-offset') * 1 || 0,
+ $speed = $this.attr('data-scroll-speed') * 1 || 500
+ ;
+ /*
+ * Use javascript scrollTop animation for in page navigation.
+ */
+ $('html, body').animate({
+ scrollTop: $($toElement).offset().top + $offset
+ }, $speed);
+ });
+};
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index a261844a97d162a74b489ee99d470c62eb7c30b7..9b06c184d284b532d4fe4ba3a0ecc4d6d7b49b8f 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -23,6 +23,7 @@ $children = WombBirth($slave, $birth_ready_age) - for actual birth. Return array
WombFlush($slave) - clean womb (array). Can be used at broodmother birthstorm or abortion situations in game. But birthstorm logically should use WombBirth($slave, 35) or so before - some children in this event is live capable, others is not.
$slave.bellyPreg = WombGetWolume($slave) - return double, with current womb volume in CC - for updating $slave.bellyPreg, or if need to update individual fetuses sizes.
+
*/
window.WombInit = function(actor) //Init womb system.
@@ -86,6 +87,7 @@ window.WombImpregnate = function(actor, fCount, fatherID, age)
tf.fatherID = fatherID; //We can store who is father too.
tf.sex = Math.round(Math.random())+1; // 1 = male, 2 = female. For possible future usage, just as concept now.
tf.volume = 1; //Initial, to create property. Updated with actual data after WombGetVolume call.
+ tf.identical = 0; //Initial, to create property. Updated with actual data during fetalSplit call.
try {
if (actor.womb.length == 0)
@@ -124,7 +126,7 @@ window.WombProgress = function(actor, ageToAdd)
window.WombBirth = function(actor, readyAge)
{
try{
- actor.womb.sort(function (a, b){return b.age - a.age}); //For normal processing fetuses that more old should be first. Now - they are.
+ WombSort(actor); //For normal processing fetuses that more old should be first. Now - they are.
}catch(err){
WombInit(actor);
alert("WombBirth warning - " + actor.slaveName+" "+err);
@@ -214,7 +216,7 @@ window.WombGetVolume = function(actor) //most code from pregJS.tw with minor ada
window.WombUpdatePregVars = function(actor) {
- actor.womb.sort(function (a, b){return b.age - a.age});
+ WombSort(actor);
if (actor.womb.length > 0)
{
if (actor.preg > 0 && actor.womb[0].age > 0)
@@ -232,7 +234,7 @@ window.WombUpdatePregVars = function(actor) {
window.WombMinPreg = function(actor)
{
- actor.womb.sort(function (a, b){return b.age - a.age});
+ WombSort(actor);
if (actor.womb.length > 0)
return actor.womb[actor.womb.length-1].age;
@@ -242,7 +244,7 @@ window.WombMinPreg = function(actor)
window.WombMaxPreg = function(actor)
{
- actor.womb.sort(function (a, b){return b.age - a.age});
+ WombSort(actor);
if (actor.womb.length > 0)
return actor.womb[0].age;
else
@@ -325,3 +327,53 @@ window.WombZeroID = function(actor, id)
WombNormalizePreg(actor);
}
+
+/* Sorts the womb object by age with oldest and thus soonest to be born, first. This will be needed in the future once individual fertilization is a possiblity.*/
+window.WombSort = function(actor)
+{
+ actor.womb.sort(function (a, b){return b.age - a.age});
+}
+
+window.fetalSplit = function(actor)
+{
+ var i, ft;
+ var nft = {};
+ nft.age = actor.preg;
+ nft.fatherID = actor.pregSource;
+ nft.sex = Math.round(Math.random())+1;
+ nft.volume = 1;
+ nft.identical = 0;
+
+ actor.womb.forEach(function(s){
+ if ((jsRandom(1,1000) >= 1000) && s.identical !== 1)
+ {
+ nft = {};
+ nft.age = s.age;
+ nft.fatherID = s.fatherID;
+ nft.sex = s.sex;
+ nft.volume = s.volume;
+ actor.womb.push(nft);
+ s.identical = 1;
+ }
+ });
+ WombNormalizePreg(actor);
+
+}
+
+/* alt
+window.fetalSplit = function(actor)
+{
+ var i, ft, nft;
+
+ actor.womb.forEach(function(s){
+ if ((jsRandom(1,1000) >= 1000) && s.identical !== 1)
+ {
+ nft = deepCopy(s);
+ actor.womb.push(nft);
+ s.identical = 1;
+ }
+ });
+ WombNormalizePreg(actor);
+
+}
+*/
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index bef18c32d15e89b976c2dc9f83e35a9450d3adee..56a377aed5fd6de9f901d536a2326d3f51a51a47 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -114,12 +114,35 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<<set _incubated = 1>>
<</if>>
<<set $mom = $activeSlave>>
+ <<set _identicalChildGen = 0, _shiftDegree = 0>>
<<for _cb = 0; _cb < _cToIncub; _cb++>> /* if there is no reserved children, code in loop will not trigger */
- <<include "Generate Child">>
+ <<if _identicalChildGen == 0>>
+ <<if _cb == $mom.curBabies.length-1 && $mom.curBabies.length > 1 && $mom.curBabies[_cb].identical == 1>> /* catch for improperly placed identical twin flag to still generate*/
+ <<set _twin = clone($activeSlave)>>
+ <<set $activeSlave = _twin>>
+ <<set $activeSlave.ID = $IDNumber++>>
+ <<else>>
+ <<include "Generate Child">>
+ <</if>>
+ <<else>>
+ <<set _twin = clone($activeSlave)>>
+ <<set $activeSlave = _twin>>
+ <<set $activeSlave.ID = $IDNumber++>>
+ <</if>>
<<include "Incubator Workaround">>
- <<set $mom.curBabies.shift()>> /*for now child generation method for incubator not changed. But here children for incubator removed from array of birthed babies. If we decide later - we can use them for incubator as real objects here. For now they just discarded silently */
+ <<if $mom.curBabies[_cb].identical === 1>>
+ <<set _identicalChildGen = 1>>
+ <<else>>
+ <<set _identicalChildGen = 0>>
+ <</if>>
+ <<set _shiftDegree++>>
<<set $reservedChildren-- >>
<</for>>
+ <<if _shiftDegree > 0>>
+ <<for _csec = 0; _csec < _shiftDegree; _csec++>>
+ <<set $mom.curBabies.shift()>> /*for now child generation metod for incubator not changed. But here children for incubator removed from array of birthed babies. If we decide later - we can use them for incubator as real objects here. For now they just discarded silently */
+ <</for>>
+ <</if>>
<<set $activeSlave = $mom>>
<<else>>
/*No live babies. Placeholder */
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index ea809ffd6e5752a6a09fb32b397f2f6034d54f71..edae128acc77c255436b94cb9802fe3985a3b3d2 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -279,7 +279,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</if>>
while her rear will be
<<if $tanks[$i].butt <= 3>>
- an healthy size.
+ a healthy size.
<<elseif $tanks[$i].butt <= 6>>
quite impressive.
<<elseif $tanks[$i].butt <= 9>>
diff --git a/src/pregmod/incubatorWorkaround.tw b/src/pregmod/incubatorWorkaround.tw
index 5325c0a9d98f9a8ae9abcd7f1b7f6601ad30e64a..91c41cc1085df44b0b5c3978f658e291d5c2fc69 100644
--- a/src/pregmod/incubatorWorkaround.tw
+++ b/src/pregmod/incubatorWorkaround.tw
@@ -4,6 +4,4 @@
<<set $activeSlave.growTime = Math.trunc($targetAge*52)>>
<<set $tanks.push($activeSlave)>>
<<set $incubatorSlaves++>>
-<</if>>
-
-<<set $activeSlave = {}>>
\ No newline at end of file
+<</if>>
\ No newline at end of file
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index f3c3496cc0b5365059ecf9bdd7b83d00c5a4bfd5..d9bbb1f6c3701ad9698947abe97cda4317d2f0da 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -25,7 +25,7 @@ PC.pregSource documentation
<<set _curBabies = $PC.curBabies.length>>
<<set _stilBirth = $PC.womb.length>>
<<set WombFlush($PC)>>
-/* difference in code below: _curBabies - count of live babies after birth, $PC.pregType = all babies in PC. I assume that dead fetuses do not count to reputation, etc, and PC manages to hide them. This mainly for future possibilities, or early birth triggers. PC will not support partial birth - even she happens to be prenant at different stages at once, undeveloped babies will be dead as result. _stilBirth currently not used - it's just for future improvements.*/
+/* difference in code below: _curBabies - count of live babies after birth, $PC.pregType = all babies in PC. I assume that dead fetuses do not count to reputation, etc, and PC manages to hide them. This mainly for future possibilities, or early birth triggers. PC will not support partial birth - even she happens to be pregnant at different stages at once, undeveloped babies will be dead as result. _stilBirth currently not used - it's just for future improvements.*/
<<set $PC.preg = 0, $PC.pregKnown = 0, $PC.labor = 0, $PC.births += _curBabies>>
<<if $PC.pregSource == 0>>
@@ -440,8 +440,21 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<</if>>
<<elseif _curBabies > 1>>
+ <<set _identicalChildGen = 0, _shiftDegree = 0>>
<<for _p = 0; _p < _curBabies; _p++>>
- <<include "Generate Child">>
+ <<if _identicalChildGen == 0>>
+ <<if _p == $PC.curBabies.length-1 && $PC.curBabies.length > 1 && $PC.curBabies[_p].identical == 1>> /* catch for improperly placed indentical twin flag to still generate*/
+ <<set _twin = clone($activeSlave)>>
+ <<set $activeSlave = _twin>>
+ <<set $activeSlave.ID = $IDNumber++>>
+ <<else>>
+ <<include "Generate Child">>
+ <</if>>
+ <<else>>
+ <<set _twin = clone($activeSlave)>>
+ <<set $activeSlave = _twin>>
+ <<set $activeSlave.ID = $IDNumber++>>
+ <</if>>
<<if $activeSlave.race == $PC.race>>
<<set _PCDegree++>>
@@ -457,7 +470,9 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<</if>>
<<if _p == 0>>Your first<<else>>The next<</if>> little <<if $babyGender == 1>>girl<<else>>boy<</if>>
- <<if $PC.pregSource == -6>>
+ <<if _identicalChildGen == 1>>
+ looks exactly like the previous; they're identical twins.
+ <<elseif $PC.pregSource == -6>>
looks exactly like you<<if _p == 0>>, in fact, the resemblance seems uncanny. Since she has the exact same genetics as you, she'll likely look almost identical to you when she's your age<</if>>. Every one of your children look this way; it's kind of hard to tell them apart.
<<elseif _PCDegree == 4>>
looks just like you; she will likely grow up to closely resemble yourself.
@@ -472,11 +487,21 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
You set <<if $babyGender == 1>>her<<else>>him<</if>> aside for incubation.
<<include "Incubator Workaround">>
<<set $reservedChildren-->>
- <<set $PC.curBabies.shift()>>
+ <<set _shiftDegree++>>
<<set $PC.reservedChildren-- >>
<</if>>
- <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<if $PC.curBabies[_p].identical === 1>>
+ <<set _identicalChildGen = 1>>
+ <<else>>
+ <<set _identicalChildGen = 0>>
+ <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <</if>>
<</for>>
+ <<if _shiftDegree > 0>>
+ <<for _spb = 0; _spb < _shiftDegree; _spb++>>
+ <<set $PC.curBabies.shift()>>
+ <</for>>
+ <</if>>
<</if>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 937bfc869463bc17bf9a80af574c32de16f81e1e..23092826ab6f388bc03f2def6db9e5f1c100c379 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -767,13 +767,36 @@ All in all,
<<set $slaves[$i].reservedChildren = 0, _cToIncub = _curBabies>>
<</if>>
<<set $mom = $slaves[$i]>>
+ <<set _identicalChildGen = 0, _shiftDegree = 0>>
<br><br>
Of $possessive _curBabies child<<if $slaves[$i].pregType > 1>>ren<</if>>; _cToIncub <<if $slaves[$i].reservedChildren > 1>>were<<else>>was<</if>> taken to $incubatorName.
- <<for _k = _cToIncub; _k != 0; _k-->>
- <<include "Generate Child">>
+ <<for _k = 0; _k < _cToIncub; _k++>>
+ <<if _identicalChildGen == 0>>
+ <<if _k == $slaves[$i].curBabies.length-1 && $slaves[$i].curBabies.length > 1 && $slaves[$i].curBabies[_k].identical == 1>> /* catch for improperly placed identical twin flag to still generate*/
+ <<set _twin = clone($activeSlave)>>
+ <<set $activeSlave = _twin>>
+ <<set $activeSlave.ID = $IDNumber++>>
+ <<else>>
+ <<include "Generate Child">>
+ <</if>>
+ <<else>>
+ <<set _twin = clone($activeSlave)>>
+ <<set $activeSlave = _twin>>
+ <<set $activeSlave.ID = $IDNumber++>>
+ <</if>>
<<include "Incubator Workaround">>
- <<set $slaves[$i].curBabies.shift()>> /*for now child generation metod for incubator not changed. But here children for incubator removed from array of birthed babies. If we decide later - we can use them for incubator as real objects here. For now they just discarded silently */
+ <<if $slaves[$i].curBabies[_k].identical === 1>>
+ <<set _identicalChildGen = 1>>
+ <<else>>
+ <<set _identicalChildGen = 0>>
+ <</if>>
+ <<set _shiftDegree++>>
<</for>>
+ <<if _shiftDegree > 0>>
+ <<for _sbw = 0; _sbw < _shiftDegree; _sbw++>>
+ <<set $slaves[$i].curBabies.shift()>> /*for now child generation metod for incubator not changed. But here children for incubator removed from array of birthed babies. If we decide later - we can use them for incubator as real objects here. For now they just discarded silently */
+ <</for>>
+ <</if>>
<<set _curBabies = $slaves[$i].curBabies.length>>
<br><br>
<<if _curBabies > 0>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 66772dfc1ae96a0e762444421fc3b9c71e40926e..20e331f51d62d4a050ce8cc1859ddc1171c5381d 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -136,6 +136,9 @@
<<set $PC.sexualEnergy += 2>>
<</if>>
<<if $PC.preg > 0>>
+ <<if $PC.preg == 1>>
+ <<run fetalSplit($PC)>>
+ <</if>>
<<set WombProgress($PC, 1)>>
<<set WombNormalizePreg($PC), $PC.pregWeek = $PC.preg>>
<<set _newBelly = WombGetVolume($PC)>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 564103eb3e96c6114142b32220fc44172ad9d8de..92b1b8e1152612ec470894d31d9bb1d3f22996ee 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -304,6 +304,9 @@
/* preg speed and advance*/
<<if $slaves[$i].preg > 0>>
+ <<if $slaves[$i].preg == 1>>
+ <<run fetalSplit($slaves[$i])>>
+ <</if>>
<<set _pregSpeed = 1>> /*base speed is normal*/
<<if $slaves[$i].pregControl == "slow gestation">>
<<set _pregSpeed = 0.5>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index a340091bd43be09c614ad7409eacb1b22dbb0216..e4ab11eeb0a9e9ff53e17a8fc3bc019186ffa210 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -10097,47 +10097,47 @@ $pronounCap has
<<elseif $activeSlave.belly >= 120000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $pronounCap looks absolutely blasphemous in a habit bearing such a giant implant-filled belly. The coarse cloth aggravates $possessive sensitive overly stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit bearing such a giant implant-filled belly. The coarse cloth aggravates $possessive sensitive overly stretched skin.
<<else>>
- $pronounCap looks absolutely blasphemous in a habit bearing such a giant pregnant belly. The coarse cloth aggravates $possessive sensitive overly stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit bearing such a giant pregnant belly. The coarse cloth aggravates $possessive sensitive overly stretched skin.
<</if>>
<<elseif $activeSlave.weight > 190>>
- $possessiveCap massively fat belly completely fills $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating and entirely relentless.
+ $activeSlave.slaveName's massively fat belly completely fills $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating and entirely relentless.
<<elseif $activeSlave.belly >= 15000 || ($activeSlave.bellyAccessory == "a huge empathy belly")>>
<<if $activeSlave.bellyAccessory == "a huge empathy belly">>
- $pronounCap looks absolutely blasphemous in a habit with such a huge pregnant belly.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with such a huge pregnant belly.
<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $pronounCap looks absolutely blasphemous in a habit with such a huge implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with such a huge implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin.
<<else>>
- $pronounCap looks absolutely blasphemous in a habit with such a huge pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with such a huge pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin.
<</if>>
<<elseif $activeSlave.belly >= 10000 || ($activeSlave.bellyAccessory == "a large empathy belly")>>
<<if $activeSlave.bellyAccessory == "a large empathy belly">>
- $pronounCap looks absolutely blasphemous in a habit with such a big pregnant belly.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with such a big pregnant belly.
<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
- $pronounCap looks absolutely blasphemous in a habit with such a hugely swollen belly. The coarse cloth aggravates $possessive sensitive stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with such a hugely swollen belly. The coarse cloth aggravates $possessive sensitive stretched skin.
<<elseif $activeSlave.bellyImplant > 0>>
- $pronounCap looks absolutely blasphemous in a habit with such a big implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with such a big implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin.
<<else>>
- $pronounCap looks absolutely blasphemous in a habit with such a big pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with such a big pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin.
<</if>>
<<elseif $activeSlave.weight > 160>>
- $possessiveCap hugely fat belly fills $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating.
+ $activeSlave.slaveName's hugely fat belly fills $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating.
<<elseif $activeSlave.weight > 130>>
- $possessiveCap big fat belly fills out $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating.
+ $activeSlave.slaveName's big fat belly fills out $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating.
<<elseif $activeSlave.belly >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>>
<<if $activeSlave.bellyAccessory == "a medium empathy belly">>
- $pronounCap looks absolutely blasphemous in a habit with a pregnant belly.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with a pregnant belly.
<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
- $pronounCap looks absolutely blasphemous in a habit with a jiggling <<print $activeSlave.inflationType>>-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with a jiggling <<print $activeSlave.inflationType>>-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin.
<<elseif $activeSlave.bellyImplant > 0>>
- $pronounCap looks absolutely blasphemous in a habit with an implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with an implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin.
<<else>>
- $pronounCap looks absolutely blasphemous in a habit with a pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin.
+ $activeSlave.slaveName looks absolutely blasphemous in a habit with a pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin.
<</if>>
<<elseif $activeSlave.weight > 95>>
- $possessiveCap fat belly fills out $possessive habit. The coarse cloth has plenty of extra skin to aggravate.
+ $activeSlave.slaveName's fat belly fills out $possessive habit. The coarse cloth has plenty of extra skin to aggravate.
<<elseif $activeSlave.belly >= 1500 || $activeSlave.bellyAccessory == "a small empathy belly">>
<<if $activeSlave.bellyAccessory == "a small empathy belly">>
$activeSlave.slaveName's habit gently bulges from $possessive small pregnant belly.
@@ -10156,26 +10156,96 @@ $pronounCap has
$activeSlave.slaveName's ripped abs rub uncomfortably against $possessive habit.
<</if>>
<<case "a string bikini">>
- <<if $activeSlave.bellyPreg >= 600000>>
- $activeSlave.slaveName's titanic bulging pregnant belly hides most of $possessive string bikini.
- <<elseif $activeSlave.bellyPreg >= 300000>>
- $activeSlave.slaveName's massive pregnant belly parts $possessive string bikini to either side.
+ <<if $activeSlave.belly >= 1000000>>
+ //WIP//
+ <<elseif $activeSlave.belly >= 750000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's implant-filled belly is so monolithic that most of $possessive string bikini is completely eclipsed by its immense bulk.
+ <<else>>
+ $activeSlave.slaveName's pregnant belly is so monolithic that most of $possessive string bikini is completely eclipsed by the straining mass.
+ <</if>>
+ <<elseif $activeSlave.belly >= 600000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's implant-filled belly is so titanic that most of $possessive string bikini is completely eclipsed by its immense bulk.
+ <<else>>
+ $activeSlave.slaveName's pregnant belly is so titanic that most of $possessive string bikini is completely eclipsed by the life stuffed mass.
+ <</if>>
+ <<elseif $activeSlave.belly >= 450000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's implant-filled belly is so gigantic that most of $possessive string bikini is completely eclipsed by its bulk.
+ <<else>>
+ $activeSlave.slaveName's pregnant belly is so gigantic that most of $possessive string bikini is completely eclipsed by the life filled mass.
+ <</if>>
+ <<elseif $activeSlave.belly >= 300000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's implant-filled belly is so massive that most of $possessive string bikini is completely eclipsed by its bulk.
+ <<else>>
+ $activeSlave.slaveName's pregnant belly is so massive that most of $possessive string bikini is completely eclipsed by the life swollen mass.
+ <</if>>
+ <<elseif $activeSlave.belly >= 120000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's giant implant-filled belly forces $possessive string bikini to either side and hangs low enough to hide $possessive crotch.
+ <<else>>
+ $activeSlave.slaveName's giant pregnant belly forces $possessive string bikini to either side and hangs low enough to hide $possessive crotch.
+ <</if>>
<<elseif $activeSlave.weight > 190>>
$activeSlave.slaveName's massively fat belly hides most $possessive string bikini. What can be seen of it risks being swallowed up by $possessive folds.
- <<elseif $activeSlave.bellyPreg >= 10000 || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>>
- $activeSlave.slaveName's big pregnant belly parts $possessive string bikini to either side.
+ <<elseif $activeSlave.belly >= 15000 || ($activeSlave.bellyAccessory == "a huge empathy belly")>>
+ <<if $activeSlave.bellyAccessory == "a huge empathy belly">>
+ $activeSlave.slaveName's huge pregnant belly parts $possessive string bikini to either side.
+ <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's huge implant-filled belly parts $possessive string bikini to either side.
+ <<else>>
+ $activeSlave.slaveName's huge pregnant belly parts $possessive string bikini to either side.
+ <</if>>
+ <<elseif $activeSlave.belly >= 10000 || ($activeSlave.bellyAccessory == "a large empathy belly")>>
+ <<if $activeSlave.bellyAccessory == "a large empathy belly">>
+ $activeSlave.slaveName's big pregnant belly parts $possessive string bikini to either side.
+ <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ $activeSlave.slaveName's hugely swollen belly parts $possessive string bikini to either side.
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's big implant-filled belly parts $possessive string bikini to either side.
+ <<else>>
+ $activeSlave.slaveName's big pregnant belly parts $possessive string bikini to either side.
+ <</if>>
<<elseif $activeSlave.weight > 160>>
$activeSlave.slaveName's hugely fat belly parts $possessive string bikini to either side and threatens to hide her bikini bottom.
<<elseif $activeSlave.weight > 130>>
$activeSlave.slaveName's big fat belly parts $possessive string bikini to either side.
- <<elseif $activeSlave.bellyPreg >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>>
- $activeSlave.slaveName's pregnant belly parts $possessive string bikini to either side.
+ <<elseif $activeSlave.belly >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>>
+ <<if $activeSlave.bellyAccessory == "a medium empathy belly">>
+ $activeSlave.slaveName's pregnant belly parts $possessive string bikini to either side.
+ <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ $activeSlave.slaveName's jiggling <<print $activeSlave.inflationType>>-filled belly parts $possessive string bikini to either side.
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's implant-filled belly parts $possessive string bikini to either side.
+ <<else>>
+ $activeSlave.slaveName's pregnant belly parts $possessive string bikini to either side.
+ <</if>>
<<elseif $activeSlave.weight > 95>>
$activeSlave.slaveName's fat belly parts $possessive string bikini to either side.
- <<elseif (($activeSlave.bellyPreg >= 1500) || ($activeSlave.bellyAccessory == "a small empathy belly"))>>
- $activeSlave.slaveName's growing belly juts out between the strings of $possessive bikini.
+ <<elseif $activeSlave.belly >= 1500 || $activeSlave.bellyAccessory == "a small empathy belly">>
+ <<if $activeSlave.bellyAccessory == "a small empathy belly">>
+ $activeSlave.slaveName's small pregnant belly juts out between the strings of $possessive bikini.
+ <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ $activeSlave.slaveName's <<print $activeSlave.inflationType>>-swollen belly juts out between the strings of $possessive bikini.
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's implant-rounded belly juts out between the strings of $possessive bikini.
+ <<else>>
+ $activeSlave.slaveName's growing belly juts out between the strings of $possessive bikini.
+ <</if>>
<<elseif $activeSlave.weight > 30>>
- $activeSlave.slaveName's chubby belly hangs between the strings of $possessive bikini.
+ $activeSlave.slaveName's chubby belly bulges between the strings of $possessive bikini.
+ <<elseif $activeSlave.bellyPreg >= 100 || $activeSlave.bellyImplant >= 100>>
+ $activeSlave.slaveName's string bikini parts just barely around the slight swell of $possessive lower belly.
+ <<elseif $activeSlave.muscles > 30>>
+ $activeSlave.slaveName's string bikini clings to $possessive ripped abs.
<</if>>
<<case "a scalemail bikini">>
<<if $activeSlave.bellyPreg >= 600000>>