From 0b9f4b6634678e91eccf07badf45b33122842a1a Mon Sep 17 00:00:00 2001 From: pregmodfan <pregmodfan@cock.li> Date: Wed, 22 May 2019 03:06:45 +0300 Subject: [PATCH] PC now can do womb scan from week 1 too --- src/pregmod/analyzePlayerPregnancy.tw | 193 ++++++++++++++------------ src/pregmod/managePersonalAffairs.tw | 2 +- 2 files changed, 103 insertions(+), 92 deletions(-) diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw index 70961bb38aa..387cd21d8f9 100644 --- a/src/pregmod/analyzePlayerPregnancy.tw +++ b/src/pregmod/analyzePlayerPregnancy.tw @@ -66,54 +66,13 @@ <br> <<for _ap = 0; _ap < _WL; _ap++>> <<capture _ap>> - <br> - Ova: $PC.womb[_ap].genetics.name - - <<if $geneticMappingUpgrade >= 1>> - <br> - Gender: $PC.womb[_ap].genetics.gender - <br> - Father ID: $PC.womb[_ap].genetics.father - <br> - Father Name: $PC.womb[_ap].genetics.fatherName - <br> - Mother ID: $PC.womb[_ap].genetics.mother - <br> - Mother Name: $PC.womb[_ap].genetics.motherName - <br> - Nationality: $PC.womb[_ap].genetics.nationality + <<if $PC.womb[_ap].age >=2 >> <br> - Race: $PC.womb[_ap].genetics.race - <br> - Skin tone: $PC.womb[_ap].genetics.skin - <br> - Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100 - <br> - Face index: $PC.womb[_ap].genetics.face out of 100 - <br> - Eye Color: $PC.womb[_ap].genetics.eyeColor - <br> - Hair Color: $PC.womb[_ap].genetics.hColor - <<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">> - <br> - Body hair: none - <<elseif $PC.womb[_ap].genetics.underArmHStyle == "hairless">> - <br> - Body hair: lacks underarm hair - <<elseif $PC.womb[_ap].genetics.pubicHStyle == "hairless">> - <br> - Body hair: lacks pubic hair - <</if>> - <<if $PC.womb[_ap].genetics.markings == "freckles" || $PC.womb[_ap].genetics.markings == "heavily freckled">> - <br> - Markings: $PC.womb[_ap].genetics.markings - <</if>> - <<else>> - <<if $PC.womb[_ap].age > 13>> + Ova: $PC.womb[_ap].genetics.name + + <<if $geneticMappingUpgrade >= 1>> <br> Gender: $PC.womb[_ap].genetics.gender - <</if>> - <<if $PC.womb[_ap].age > 5>> <br> Father ID: $PC.womb[_ap].genetics.father <br> @@ -122,59 +81,111 @@ Mother ID: $PC.womb[_ap].genetics.mother <br> Mother Name: $PC.womb[_ap].genetics.motherName + <br> + Nationality: $PC.womb[_ap].genetics.nationality + <br> + Race: $PC.womb[_ap].genetics.race + <br> + Skin tone: $PC.womb[_ap].genetics.skin + <br> + Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100 + <br> + Face index: $PC.womb[_ap].genetics.face out of 100 + <br> + Eye Color: $PC.womb[_ap].genetics.eyeColor + <br> + Hair Color: $PC.womb[_ap].genetics.hColor + <<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">> + <br> + Body hair: none + <<elseif $PC.womb[_ap].genetics.underArmHStyle == "hairless">> + <br> + Body hair: lacks underarm hair + <<elseif $PC.womb[_ap].genetics.pubicHStyle == "hairless">> + <br> + Body hair: lacks pubic hair + <</if>> + <<if $PC.womb[_ap].genetics.markings == "freckles" || $PC.womb[_ap].genetics.markings == "heavily freckled">> + <br> + Markings: $PC.womb[_ap].genetics.markings + <</if>> + <<else>> + <<if $PC.womb[_ap].age > 13>> + <br> + Gender: $PC.womb[_ap].genetics.gender + <</if>> + <<if $PC.womb[_ap].age > 5>> + <br> + Father ID: $PC.womb[_ap].genetics.father + <br> + Father Name: $PC.womb[_ap].genetics.fatherName + <br> + Mother ID: $PC.womb[_ap].genetics.mother + <br> + Mother Name: $PC.womb[_ap].genetics.motherName + <</if>> + <</if>> + <<if $incubator > 0 || $nursery > 0>> + <br> + Reserved: $PC.womb[_ap].reserve <</if>> - <</if>> - <<if $incubator > 0 || $nursery > 0>> - <br> - Reserved: $PC.womb[_ap].reserve - <</if>> - <br><br> + <br><br> - Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]] - <<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>> - <br> - <<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>> - <<if $surgeryUpgrade == 1>> - | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]] + Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]] + <<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>> + <br> + <<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>> + <<if $surgeryUpgrade == 1>> + | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]] + <</if>> <</if>> - <</if>> - <<if $incubator > 0>> - <br> - <<if $PC.womb[_ap].reserve === "incubator">> - <<link "Don't keep this child $incubatorName" "Analyze PC Pregnancy">> - <<set $PC.womb[_ap].reserve = "">> - <<set $reservedChildren-->> - <</link>> - <<elseif $freeTanks - $reservedChildren > 0>> - <<link "Keep this child in $incubatorName" "Analyze PC Pregnancy">> - <<if $PC.womb[_ap].reserve === "nursery">> + <<if $incubator > 0>> + <br> + <<if $PC.womb[_ap].reserve === "incubator">> + <<link "Don't keep this child $incubatorName" "Analyze PC Pregnancy">> + <<set $PC.womb[_ap].reserve = "">> + <<set $reservedChildren-->> + <</link>> + <<elseif $freeTanks - $reservedChildren > 0>> + <<link "Keep this child in $incubatorName" "Analyze PC Pregnancy">> + <<if $PC.womb[_ap].reserve === "nursery">> + <<set $reservedChildrenNursery-->> + <</if>> + <<set $PC.womb[_ap].reserve = "incubator">> + <<set $reservedChildren++>> + <</link>> + <<else>> + There is not enough free space to keep this child in $incubatorName. + <</if>> + <</if>> + <<if $nursery > 0>> + <br> + <<if $PC.womb[_ap].reserve === "nursery">> + <<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">> + <<set $PC.womb[_ap].reserve = "">> <<set $reservedChildrenNursery-->> - <</if>> - <<set $PC.womb[_ap].reserve = "incubator">> - <<set $reservedChildren++>> - <</link>> - <<else>> - There is not enough free space to keep this child in $incubatorName. + <</link>> + <<elseif $freeCribs - $reservedChildrenNursery > 0>> + <<link "Keep this child in $nurseryName" "Analyze PC Pregnancy">> + <<if $PC.womb[_ap].reserve === "incubator">> + <<set $reservedChildren-->> + <</if>> + <<set $PC.womb[_ap].reserve = "nursery">> + <<set $reservedChildrenNursery++>> + <</link>> + <<else>> + There is not enough free space to keep this child in $nurseryName. + <</if>> <</if>> - <</if>> - <<if $nursery > 0>> + <<else>> <br> - <<if $PC.womb[_ap].reserve === "nursery">> - <<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">> - <<set $PC.womb[_ap].reserve = "">> - <<set $reservedChildrenNursery-->> - <</link>> - <<elseif $freeCribs - $reservedChildrenNursery > 0>> - <<link "Keep this child in $nurseryName" "Analyze PC Pregnancy">> - <<if $PC.womb[_ap].reserve === "incubator">> - <<set $reservedChildren-->> - <</if>> - <<set $PC.womb[_ap].reserve = "nursery">> - <<set $reservedChildrenNursery++>> - <</link>> - <<else>> - There is not enough free space to keep this child in $nurseryName. + Unindefined ova found, no detailed data available.<br> + Age: too early for scan. + <br> + <<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>> + <<if $surgeryUpgrade == 1>> + | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]] <</if>> <</if>> <br><br><hr style="margin:0"><br> diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw index cffa513f2fb..250ecc4710a 100644 --- a/src/pregmod/managePersonalAffairs.tw +++ b/src/pregmod/managePersonalAffairs.tw @@ -484,7 +484,7 @@ In total, you have given birth to: You are not on any fertility supplements<<if _fertRefresh == 1>>, other than the $PC.refreshment, of course.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]] <</if>> <</if>> -<<if ($PC.preg > 1 && $pregnancyMonitoringUpgrade == 1)>> +<<if ($PC.preg > 0 && $pregnancyMonitoringUpgrade == 1)>> <br>[[Inspect pregnancy|Analyze PC Pregnancy]] <</if>> <<if $PC.preg >= 0 && $PC.vagina == 1>> -- GitLab