diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw index 79313cd2ed1a5dfe069ed90d84bde892ecda4444..7163f3878b50b107ead20f64628eae294b224fe9 100644 --- a/src/pregmod/analyzePregnancy.tw +++ b/src/pregmod/analyzePregnancy.tw @@ -34,7 +34,7 @@ </div> <</if>> <div> - Current fetal count: getSlave($activeSlave.ID).womb.length + Current fetal count: <<= getSlave($activeSlave.ID).womb.length>> </div> <div> Estimated womb volume: <<if _safecc < _cc && $geneticMappingUpgrade > 0>>@@.red;<<= num(_cc)>>@@<<else>><<= num(_cc)>><</if>> cc @@ -45,7 +45,7 @@ <p> <h2>Furthest developed pregnancy</h2> <div class="indent"> - Fetal development week: getSlave($activeSlave.ID).preg + Fetal development week: <<= getSlave($activeSlave.ID).preg>> </div> </p> @@ -103,17 +103,17 @@ <<capture _ap>> <<if getSlave($activeSlave.ID).womb[_ap].age >=2 >> <div class="indent"> - Ova: getSlave($activeSlave.ID).womb[_ap].genetics.name + Ova: <<= getSlave($activeSlave.ID).womb[_ap].genetics.name>> </div> <div class="indent"> - Age: getSlave($activeSlave.ID).womb[_ap].age + Age: <<= getSlave($activeSlave.ID).womb[_ap].age>> </div> <<if $geneticMappingUpgrade >= 1>> <div class="indent"> - Gender: getSlave($activeSlave.ID).womb[_ap].genetics.gender + Gender: <<= getSlave($activeSlave.ID).womb[_ap].genetics.gender>> </div> <div class="indent"> - Father ID: getSlave($activeSlave.ID).womb[_ap].genetics.father + Father ID: <<= getSlave($activeSlave.ID).womb[_ap].genetics.father>> </div> <div class="indent"> Father Name: @@ -124,7 +124,7 @@ <</if>> </div> <div class="indent"> - Mother ID: getSlave($activeSlave.ID).womb[_ap].genetics.mother + Mother ID: <<= getSlave($activeSlave.ID).womb[_ap].genetics.mother>> </div> <div class="indent"> Mother Name: @@ -135,38 +135,38 @@ <</if>> </div> <div class="indent"> - Nationality: getSlave($activeSlave.ID).womb[_ap].genetics.nationality + Nationality: <<= getSlave($activeSlave.ID).womb[_ap].genetics.nationality>> </div> <div class="indent"> - Race: getSlave($activeSlave.ID).womb[_ap].genetics.race + Race: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.race)>> </div> <div class="indent"> - Skin tone: getSlave($activeSlave.ID).womb[_ap].genetics.skin + Skin tone: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.skin)>> </div> <div class="indent"> - Intelligence index: getSlave($activeSlave.ID).womb[_ap].genetics.intelligence out of 100 + Intelligence index: <<= getSlave($activeSlave.ID).womb[_ap].genetics.intelligence>> out of 100 </div> <div class="indent"> - Face index: getSlave($activeSlave.ID).womb[_ap].genetics.face out of 100 + Face index: <<= getSlave($activeSlave.ID).womb[_ap].genetics.face>> out of 100 </div> <div class="indent"> - Eye Color: getSlave($activeSlave.ID).womb[_ap].genetics.eyeColor + Eye Color: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.eyeColor)>> </div> <div class="indent"> - Hair Color: getSlave($activeSlave.ID).womb[_ap].genetics.hColor + Hair Color: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.hColor)>> </div> <div class="indent"> <<if getSlave($activeSlave.ID).womb[_ap].genetics.underArmHStyle == "hairless" && getSlave($activeSlave.ID).womb[_ap].genetics.pubicHStyle == "hairless">> - Body hair: none + Body hair: None <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.underArmHStyle == "hairless">> - Body hair: lacks underarm hair + Body hair: Lacks underarm hair <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.pubicHStyle == "hairless">> - Body hair: lacks pubic hair + Body hair: Lacks pubic hair <</if>> </div> <<if getSlave($activeSlave.ID).womb[_ap].genetics.markings == "freckles" || getSlave($activeSlave.ID).womb[_ap].genetics.markings == "heavily freckled">> <div class="indent"> - Markings: getSlave($activeSlave.ID).womb[_ap].genetics.markings + Markings: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.markings)>> </div> <</if>> <div class="indent"> @@ -265,27 +265,27 @@ <<else>> <<if getSlave($activeSlave.ID).womb[_ap].age > 13>> <div class="indent"> - Gender: getSlave($activeSlave.ID).womb[_ap].genetics.gender + Gender: <<= getSlave($activeSlave.ID).womb[_ap].genetics.gender>> </div> <</if>> <<if getSlave($activeSlave.ID).womb[_ap].age > 5>> <div class="indent"> - Father ID: getSlave($activeSlave.ID).womb[_ap].genetics.father + Father ID: <<= getSlave($activeSlave.ID).womb[_ap].genetics.father>> </div> <div class="indent"> - Father Name: getSlave($activeSlave.ID).womb[_ap].genetics.fatherName + Father Name: <<= getSlave($activeSlave.ID).womb[_ap].genetics.fatherName>> </div> <div class="indent"> - Mother ID: getSlave($activeSlave.ID).womb[_ap].genetics.mother + Mother ID: <<= getSlave($activeSlave.ID).womb[_ap].genetics.mother>> </div> <div class="indent"> - Mother Name: getSlave($activeSlave.ID).womb[_ap].genetics.motherName + Mother Name: <<= getSlave($activeSlave.ID).womb[_ap].genetics.motherName>> </div> <</if>> <</if>> <<if $incubator > 0 || $nursery > 0>> <div class="indent"> - Reserved: getSlave($activeSlave.ID).womb[_ap].reserve + Reserved: <<= getSlave($activeSlave.ID).womb[_ap].reserve>> </div> <</if>> diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index c360e5e8b114ce0020c479ce2a267c8db1844e32..2a4583232f934facd0362a8fc995dfbbe73eb72d 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -2800,7 +2800,7 @@ As the remote surgery's long recovery cycle completes, <<default>> ERROR bad/missing surgery descript Surgtyp: $surgeryType - Devotion: getSlave($AS).devotion + Devotion: <<= getSlave($AS).devotion>> <</switch>>