From 172fcb02bf1710b0660afa03e16e486b1592bb7b Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 23 Jun 2019 00:10:12 -0500
Subject: [PATCH] EtcPcStuff
---
src/cheats/PCCheatMenu.tw | 6 ++++++
src/pregmod/analyzePlayerPregnancy.tw | 2 +-
src/pregmod/analyzePregnancy.tw | 2 +-
src/pregmod/birthStorm.tw | 13 ++++++++----
src/pregmod/csec.tw | 11 +++++++---
src/pregmod/managePersonalAffairs.tw | 21 ++++++++++++++------
src/pregmod/seBurst.tw | 13 ++++++++----
src/pregmod/sePlayerBirth.tw | 2 +-
src/uncategorized/persBusiness.tw | 2 +-
src/uncategorized/personalAttentionSelect.tw | 21 ++++++++++----------
10 files changed, 61 insertions(+), 32 deletions(-)
diff --git a/src/cheats/PCCheatMenu.tw b/src/cheats/PCCheatMenu.tw
index 5393e5b6190..71f5e5c7a8d 100644
--- a/src/cheats/PCCheatMenu.tw
+++ b/src/cheats/PCCheatMenu.tw
@@ -29,6 +29,10 @@ Sex: ''$tempSlave.genes''
<<radiobutton "$tempSlave.career" "engineer">> Engineer
<<radiobutton "$tempSlave.career" "medicine">> Medicine
<<radiobutton "$tempSlave.career" "celebrity">> Celebrity
+ <<radiobutton "$tempSlave.career" "escort">> Escort
+ <<radiobutton "$tempSlave.career" "servant">> Servant
+ <<radiobutton "$tempSlave.career" "gang">> Gang
+ <<radiobutton "$tempSlave.career" "BlackHat">> BlackHat
<br>Method of acquiring the arcology: ''$tempSlave.rumor''.
<br><<radiobutton "$tempSlave.rumor" "wealth">> Wealth
@@ -67,6 +71,8 @@ Sex: ''$tempSlave.genes''
<br>''Boobs Implant'': <<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>> //do you have breast implants - 0: no, 1: yes//
<br>''Lactation'': <<textbox "$tempSlave.lactation" $tempSlave.lactation>> //are you lactating - 0: no, 1: yes//
<br>
+<br>''Belly'': <<textbox "$tempSlave.belly" $tempSlave.belly>>
+<br>
<br>''Butt Size'': <<textbox "$tempSlave.butt" $tempSlave.butt>> //0: normal, 1: big, 2: huge, 3: enormous//
<br>''Butt Implant'': <<textbox "$tempSlave.buttImplant" $tempSlave.buttImplant>> //do you have butt implants - 0: no, 1: yes//
<br>
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index 90ed321a64c..ccb6a29700c 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -225,7 +225,7 @@
<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>>
+ <<if $PC.womb[_ap].age < 4 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.womb[_ap].fatherID != -1 && $PC.womb[_ap].fatherID != -6))>>
<br>
<<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
<<if $surgeryUpgrade == 1>>
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index eccc684d5af..4573e031fc3 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -236,7 +236,7 @@
<br><br>
Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][$activeSlave.womb[_ap].genetics.name = _tempName]]
- <<if $activeSlave.womb[_ap].age < 4 && ($activeSlave.womb[_ap].fatherID != -1 || $activeSlave.breedingMark == 0)>>
+ <<if $activeSlave.womb[_ap].age < 4 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($activeSlave.breedingMark == 0 && $propOutcome == 1) || ($activeSlave.womb[_ap].fatherID != -1 && $activeSlave.womb[_ap].fatherID != -6))>>
<br>
<<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($activeSlave, _ap)>><</link>>
<<if $surgeryUpgrade == 1>>
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index 92b22b2bc8d..91e66b1b206 100644
--- a/src/pregmod/birthStorm.tw
+++ b/src/pregmod/birthStorm.tw
@@ -5,9 +5,9 @@
<<set $activeSlave.curBabies = WombBirth($activeSlave, 34)>> /*Here check - how many children survive this event. 34 weeks minimum.*/
<<set _curBabies = $activeSlave.curBabies.length>>
-<<set _others = 0, _PC = 0, _citizens = 0, _oldMaster = 0, _arcOwner = 0, _lab = 0, _futaS = 0, _fathers = [], _babyFatherLink = []>>
+<<set _others = 0, _PC = 0, _citizens = 0, _oldMaster = 0, _arcOwner = 0, _clients = 0, _lab = 0, _futaS = 0, _fathers = [], _babyFatherLink = []>>
<<for _cb = 0; _cb < $activeSlave.curBabies.length; _cb++>>
- <<if $activeSlave.curBabies[_cb].fatherID == 0 || $activeSlave.curBabies[_cb].fatherID == -5>>
+ <<if $activeSlave.curBabies[_cb].fatherID == 0>>
<<set _others++>>
<<set _fathers.push("some man's")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -1>>
@@ -16,13 +16,16 @@
<<set _fathers.push("your")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -2>>
<<set _citizens++>>
- <<set _fathers.push("your arcology's")>>
+ <<set _fathers.push("a citizen's")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -3>>
<<set _oldMaster++>>
<<set _fathers.push("your former Master's")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -4>>
<<set _arcOwner++>>
<<set _fathers.push("another arcology owner's")>>
+ <<elseif $activeSlave.curBabies[_cb].fatherID == -5>>
+ <<set _clients++>>
+ <<set _fathers.push("your client's")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -7>>
<<set _lab++>>
<<set _fathers.push("the gene lab's")>>
@@ -66,12 +69,14 @@
<<set _num = _others>>
<<elseif _fathersReduced[_cb] == "your">>
<<set _num = _PC>>
- <<elseif _fathersReduced[_cb] == "your arcology's">>
+ <<elseif _fathersReduced[_cb] == "a citizen's">>
<<set _num = _citizens>>
<<elseif _fathersReduced[_cb] == "your former Master's">>
<<set _num = _oldMaster>>
<<elseif _fathersReduced[_cb] == "another arcology owner's">>
<<set _num = _arcOwner>>
+ <<elseif _fathersReduced[_cb] == "your client's">>
+ <<set _num = _clients>>
<<elseif _fathersReduced[_cb] == "the gene lab's">>
<<set _num = _lab>>
<<elseif _fathersReduced[_cb] == "a Futanari Sister's">>
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index ab25cece430..2e04c66013d 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -19,9 +19,9 @@
<<set $activeSlave.counter.birthsTotal += _curBabies>>
<<set $birthsTotal += _curBabies>>
-<<set _others = 0, _PC = 0, _citizens = 0, _oldMaster = 0, _arcOwner = 0, _lab = 0, _futaS = 0, _fathers = [], _babyFatherLink = []>>
+<<set _others = 0, _PC = 0, _citizens = 0, _oldMaster = 0, _arcOwner = 0, _clients = 0, _lab = 0, _futaS = 0, _fathers = [], _babyFatherLink = []>>
<<for _cb = 0; _cb < $activeSlave.curBabies.length; _cb++>>
- <<if $activeSlave.curBabies[_cb].fatherID == 0 || $activeSlave.curBabies[_cb].fatherID == -5>>
+ <<if $activeSlave.curBabies[_cb].fatherID == 0>>
<<set _others++>>
<<set _fathers.push("some man's")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -1>>
@@ -30,13 +30,16 @@
<<set _fathers.push("your")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -2>>
<<set _citizens++>>
- <<set _fathers.push("your arcology's")>>
+ <<set _fathers.push("a citizen's")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -3>>
<<set _oldMaster++>>
<<set _fathers.push("your former Master's")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -4>>
<<set _arcOwner++>>
<<set _fathers.push("another arcology owner's")>>
+ <<elseif $activeSlave.curBabies[_cb].fatherID == -5>>
+ <<set _clients++>>
+ <<set _fathers.push("your client's")>>
<<elseif $activeSlave.curBabies[_cb].fatherID == -7>>
<<set _lab++>>
<<set _fathers.push("the gene lab's")>>
@@ -86,6 +89,8 @@
<<set _num = _oldMaster>>
<<elseif _fathersReduced[_cb] == "another arcology owner's">>
<<set _num = _arcOwner>>
+ <<elseif _fathersReduced[_cb] == "your client's">>
+ <<set _num = _clients>>
<<elseif _fathersReduced[_cb] == "the gene lab's">>
<<set _num = _lab>>
<<elseif _fathersReduced[_cb] == "a Futanari Sister's">>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index dc151229c19..0648a702b59 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -390,14 +390,20 @@ __Contraceptives and Fertility__
<br>
<span id="miniscene">
-<<if $PC.preg < 6 && $PC.pregKnown == 1 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
- Your period is late, so the first thing you do is test yourself for a potential pregnancy: @@.lime;you are pregnant.@@ <<link "Abort your child">><<replace "#miniscene">><<set $PC.preg = 0, $PC.pregType = 0, $PC.pregSource = 0, $PC.pregKnown = 0, $PC.pregWeek = 0>><<set WombFlush($PC)>><<print "You take a syringe filled with abortifacients and make yourself comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.">><br> <</replace>><</link>>
+<<if $PC.preg < 6 && $PC.pregKnown == 1>>
+ Your period is late, so the first thing you do is test yourself for a potential pregnancy: @@.lime;you are pregnant.@@
+ <<if ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
+ <<link "Abort your child">><<replace "#miniscene">><<set $PC.preg = 0, $PC.pregType = 0, $PC.pregSource = 0, $PC.pregKnown = 0, $PC.pregWeek = 0>><<set WombFlush($PC)>><<print "You take a syringe filled with abortifacients and make yourself comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.">><br> <</replace>><</link>>
+ <</if>>
<<elseif $PC.labor == 1>>
You are beginning to feel contractions; you'll be giving birth soon.
<<elseif $PC.preg >= 39>>
Your due date is looming, but your <<if $PC.pregType > 1>>children don't<<else>>child doesn't<</if>> seem to be interested in coming out just yet. [[Induce childbirth|Manage Personal Affairs][$PC.labor = 1]]
-<<elseif $PC.pregKnown == 1 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
- You're pregnant, something rather unbecoming for an arcology owner. <<link "Abort your child">><<replace "#miniscene">><<set $PC.preg = 0, $PC.pregWeek = -2, $PC.pregType = 0, $PC.pregSource = 0, $PC.belly = 0, $PC.pregKnown = 0>><<set WombFlush($PC)>><<print "You take a syringe filled with abortifacients and make yourself comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.">><br> <</replace>><</link>>
+<<elseif $PC.pregKnown == 1>>
+ You're pregnant, something rather unbecoming for an arcology owner.
+ <<if ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
+ <<link "Abort your child">><<replace "#miniscene">><<set $PC.preg = 0, $PC.pregWeek = -2, $PC.pregType = 0, $PC.pregSource = 0, $PC.belly = 0, $PC.pregKnown = 0>><<set WombFlush($PC)>><<print "You take a syringe filled with abortifacients and make yourself comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.">><br> <</replace>><</link>>
+ <</if>>
<</if>>
</span>
@@ -461,8 +467,11 @@ In total, you have given birth to:
You're having morning sickness.
<<elseif $PC.preg > 1>>
You've missed your period. This could be bad.
-<<elseif $PC.preg > 0 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
- Your fertile pussy has been thoroughly seeded; there is a chance you are pregnant. <<link "Pop some morning after pills">><<set $PC.preg = 0, $PC.pregWeek = 0, $PC.pregType = 0, $PC.pregSource = 0, $PC.pregKnown = 0>><<set WombFlush($PC)>><<goto "Manage Personal Affairs">><</link>>
+<<elseif $PC.preg > 0>>
+ Your fertile pussy has been thoroughly seeded; there is a chance you are pregnant.
+ <<if ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
+ <<link "Pop some morning after pills">><<set $PC.preg = 0, $PC.pregWeek = 0, $PC.pregType = 0, $PC.pregSource = 0, $PC.pregKnown = 0>><<set WombFlush($PC)>><<goto "Manage Personal Affairs">><</link>>
+ <</if>>
<<elseif $PC.pregWeek < 0>>
You're still recovering from your recent pregnancy.
<<elseif $PC.preg == -2>>
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index 7c757a6120c..fe7c3e49c82 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -12,9 +12,9 @@
<<set _curBabies = $slaves[_b].curBabies.length>> /*just to improve speed and usability here.*/
<<set $birthsTotal += _curBabies>>
- <<set _others = 0, _PC = 0, _citizens = 0, _oldMaster = 0, _arcOwner = 0, _lab = 0, _futaS = 0, _fathers = [], _babyFatherLink = []>>
+ <<set _others = 0, _PC = 0, _citizens = 0, _oldMaster = 0, _arcOwner = 0, _clients = 0, _lab = 0, _futaS = 0, _fathers = [], _babyFatherLink = []>>
<<for _cb = 0; _cb < $slaves[_b].curBabies.length; _cb++>>
- <<if $slaves[_b].curBabies[_cb].fatherID == 0 || $slaves[_b].curBabies[_cb].fatherID == -5>>
+ <<if $slaves[_b].curBabies[_cb].fatherID == 0>>
<<set _others++>>
<<set _fathers.push("some man's")>>
<<elseif $slaves[_b].curBabies[_cb].fatherID == -1>>
@@ -23,13 +23,16 @@
<<set _fathers.push("your")>>
<<elseif $slaves[_b].curBabies[_cb].fatherID == -2>>
<<set _citizens++>>
- <<set _fathers.push("your arcology's")>>
+ <<set _fathers.push("a citizen's")>>
<<elseif $slaves[_b].curBabies[_cb].fatherID == -3>>
<<set _oldMaster++>>
<<set _fathers.push("your former Master's")>>
<<elseif $slaves[_b].curBabies[_cb].fatherID == -4>>
<<set _arcOwner++>>
<<set _fathers.push("another arcology owner's")>>
+ <<elseif $slaves[_b].curBabies[_cb].fatherID == -5>>
+ <<set _clients++>>
+ <<set _fathers.push("your client's")>>
<<elseif $slaves[_b].curBabies[_cb].fatherID == -7>>
<<set _lab++>>
<<set _fathers.push("the gene lab's")>>
@@ -73,12 +76,14 @@
<<set _num = _others>>
<<elseif _fathersReduced[_cb] == "your">>
<<set _num = _PC>>
- <<elseif _fathersReduced[_cb] == "your arcology's">>
+ <<elseif _fathersReduced[_cb] == "a citizen's">>
<<set _num = _citizens>>
<<elseif _fathersReduced[_cb] == "your former Master's">>
<<set _num = _oldMaster>>
<<elseif _fathersReduced[_cb] == "another arcology owner's">>
<<set _num = _arcOwner>>
+ <<elseif _fathersReduced[_cb] == "your client's">>
+ <<set _num = _clients>>
<<elseif _fathersReduced[_cb] == "the gene lab's">>
<<set _num = _lab>>
<<elseif _fathersReduced[_cb] == "a Futanari Sister's">>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 8acce2f62da..9e989286bac 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 > 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.
<<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.
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index a38442bde71..4f7ce5a0608 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -101,7 +101,7 @@
<<if $PC.belly >= 5000>>
You spend your free time hustling around your penthouse, cleaning and making sure everything is in order. You manage to reduce your upkeep by 20%. Your pregnancy slows you down some, but you're used to working around it.
<<else>>
- You spend your free time hustling around your penthouse, cleaning and making sure everything is in order. You manage to reduce your upkeep by 25%. <<if $PC.vagina == 1>>This is much easier to do without a big baby bump in the way.<</if>>
+ You spend your free time hustling around your penthouse, cleaning and making sure everything is in order. You manage to reduce your upkeep by 25%. <<if $PC.birthMaster > 0>>This is much easier to do without a big baby bump in the way.<</if>>
<</if>>
<<elseif ($personalAttention == "proclamation")>>
/* handled after this if chain */
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 433c9d972d0..2a09301ab08 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -2,18 +2,17 @@
<<set $nextButton = "Back to Main", $nextLink = "Main">>
-<<if $PC.career == "escort">>
- [[Focus on "connecting"|Main][$personalAttention = "whoring"]]
+
+[[Focus on business|Main][$personalAttention = "business"]]
+<<if $PC.career == "gang">>
+ <br>[[Help people "pass" things around|Main][$personalAttention = "smuggling"]]
+<<elseif $PC.career == "escort">>
+ <br>[[Focus on "connecting"|Main][$personalAttention = "whoring"]]
<<elseif $PC.career == "servant">>
- [[Maintain your home|Main][$personalAttention = "upkeep"]]
-<<else>>
- [[Focus on business|Main][$personalAttention = "business"]]
- <<if $PC.career == "gang">>
- | [[Help people "pass" things around|Main][$personalAttention = "smuggling"]]
- <</if>>
- <<if $PC.hacking > 25>>
- <br>[[Sell your intrusion services to the highest bidder|Main][$personalAttention = "technical accidents"]]
- <</if>>
+ <br>[[Maintain your home|Main][$personalAttention = "upkeep"]]
+<</if>>
+<<if $PC.hacking > 25>>
+ <br>[[Sell your intrusion services to the highest bidder|Main][$personalAttention = "technical accidents"]]
<</if>>
<<if $HeadGirl != 0>>
<br>[[Support your Head Girl|Main][$personalAttention = "HG"]]
--
GitLab