From 76c68403bd76e756314ddb8ccaeea191c76426f3 Mon Sep 17 00:00:00 2001
From: pregmodfan <pregmodfan@cock.li>
Date: Sun, 12 Mar 2017 22:03:03 +0200
Subject: [PATCH] compile script update, clinic release fix, cervix pump
research text fix, slave interact new drugs set options, re-added
---
compile-git | 4 +-
src/uncategorized/clinicReport.tw | 2 +-
src/uncategorized/dispensary.tw | 2 +-
src/uncategorized/slaveInteract.tw | 73 ++++++++++++++++--------------
4 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/compile-git b/compile-git
index 20a8daef3e4..8fb59113335 100755
--- a/compile-git
+++ b/compile-git
@@ -10,4 +10,6 @@ HASH=`git log -n1 |grep -m1 commit | sed 's/commit //'`
./devTools/tweeGo/tweego -o bin/FC_pregmod_$HASH.html src/config/start.tw
-rm src/config/start.tw
\ No newline at end of file
+rm src/config/start.tw
+
+echo "FC_pregmod_$HASH.html" compilation finished.
\ No newline at end of file
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index f2145150377..521c7d6db1c 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -109,7 +109,7 @@
<</if>>
/* slave release block become too much a mess, need to change structure*/
<<set _stay = 0>>
- <<if ($slaves[$i].health >= 40)>>
+ <<if ($slaves[$i].health <= 40)>>
<<set _stay += 1>>
<</if>>
<<if ($slaves[$i].chem <= 20) && ($clinicUpgradeFilters == 1)>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 13e7507a87c..36181fa92c0 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -300,7 +300,7 @@ The hormone replacement therapies
<</if>>
<<if ($bellyImplants == 1) && ($cervixImplants != 1) && ($rep >6000*$upgradeMultiplierMedicine)>> /* nanotech like technology much more impressive and costly than simple implant */
- [[Purchase schematics for fillable abdominal implants|Dispensary][$cash -= 70000*$upgradeMultiplierMedicine, $cervixImplants to 1]]
+ [[Purchase schematics for cervix filter micropumps|Dispensary][$cash -= 70000*$upgradeMultiplierMedicine, $cervixImplants to 1]]
//Costs ¤<<print 70000*$upgradeMultiplierMedicine>>//
<br> //Will allow the fabrication of cervix filter micropumps for fillable abdominal implants using the autosurgery.//
<<elseif ($cervixImplants > 0)>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 3db91247774..89c4287795f 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -179,11 +179,11 @@
<</if>>
<</for>>
<<if $relation == $activeSlave.daughters>>
- <<if $activeSlave.daughters == 1>>
- //Her daughter is unavailable//
- <<else>>
- //Her daughters are unavailable//
- <</if>>
+ <<if $activeSlave.daughters == 1>>
+ //Her daughter is unavailable//
+ <<else>>
+ //Her daughters are unavailable//
+ <</if>>
<<else>>
<<if $activeSlave.daughters == 1>>
| <<click "Fuck her with her daughter">><<replace "#miniscene">><<set $partner to "daughter">><<display "FRelation">><br> <</replace>><</click>>
@@ -211,13 +211,13 @@
//Her sisters are unavailable//
<</if>>
<<else>>
- <<if $activeSlave.sisters == 1>>
- | <<click "Fuck her with her sister">><<replace "#miniscene">><<set $partner to "sister">><<display "FRelation">><br> <</replace>><</click>>
- <<else>>
- | <<click "Fuck her with one of her sisters">><<replace "#miniscene">><<set $partner to "sister">><<display "FRelation">><br> <</replace>><</click>>
- <</if>>
- <</if>>
- <</if>>
+ <<if $activeSlave.sisters == 1>>
+ | <<click "Fuck her with her sister">><<replace "#miniscene">><<set $partner to "sister">><<display "FRelation">><br> <</replace>><</click>>
+ <<else>>
+ | <<click "Fuck her with one of her sisters">><<replace "#miniscene">><<set $partner to "sister">><<display "FRelation">><br> <</replace>><</click>>
+ <</if>>
+ <</if>>
+ <</if>>
/*
<<if $activeSlave.sisters > 1>>
| <<click "Fuck her with her sisters">><<replace "#miniscene">><<set $partner to "sisters">><<display "FRelation">><br> <</replace>><</click>>
@@ -422,8 +422,8 @@ __Fucktoy use preference__: <strong><span id="hole"><<print $activeSlave.toyHole
__Body modification__:
[[Use remote surgery|Remote Surgery][$degradation to 0]]
- | [[Use body mod studio|Body Modification][$degradation to 0]]
- | [[Use auto salon|Salon][$degradation to 0]]
+| [[Use body mod studio|Body Modification][$degradation to 0]]
+| [[Use auto salon|Salon][$degradation to 0]]
<br>
@@ -580,19 +580,6 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<
<<elseif ($activeSlave.preg > 0) && ($activeSlave.pregType < 50)>>
[[Abort her pregnancy|Abort]]
<</if>>
-
-<<if ($activeSlave.preg > 1) && ($pregSpeedControl == 1) && ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1)>>
- <<if $activeSlave.pregControl == "labor supressors">>Labor is supressed:<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation:<<else>>Pregnancy control:<</if>> <span id="pregControl">
- <<if ($activeSlave.breedingMark != 1) && ($activeSlave.preg < 30) && ($activeSlave.pregControl == "slow gestation")>>
- <<click "Normal gestation">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>normal gestation speed<</replace>><</click>>
- <<elseif ($activeSlave.breedingMark != 1) && ($activeSlave.preg >= 30) && ($activeSlave.pregControl == "labor supressors")>>
- <<click "Allow Birth">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>allowed normal birth<</replace>><</click>>
- <<elseif ($activeSlave.breedingMark != 1) && ($activeSlave.preg < 30)>>
- <<click "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<replace "#pregControl">>slowed down gestation speed<</replace>><</click>>
- |
- <<click "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<replace "#pregControl">>scheduled for speed up gestation agents, but they can be used only in strictly controled environiments. Slave should be directed into the clinic.<</replace>><</click>>
- <<elseif ($activeSlave.breedingMark != 1) && ($activeSlave.preg >= 30)>>
- <<click "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<replace "#pregControl">>labor will be supressed<</replace>><</click>>
<</if>>
<<elseif ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>>
<<if ($activeSlave.preg < -1)>>
@@ -618,6 +605,22 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<
<</if>>
<</if>>
<</if>>
+<<if ($activeSlave.preg > 1) && ($pregSpeedControl == 1) && ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1)>>
+<br>
+
+ __Pregnancy control__:<span id="pregControl"><<if $activeSlave.pregControl == "labor supressors">>Labor is supressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation<<elseif $activeSlave.pregControl == "speed up">>Faster gestation<<else>>Normal gestation<</if>></span>
+ <<if ($activeSlave.breedingMark != 1) && ($activeSlave.preg >= 30)>>
+ <<click "Normal Birth">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>allowed normal birth<</replace>><</click>>
+ |
+ <<click "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<replace "#pregControl">>labor will be supressed<</replace>><</click>>
+ <<elseif ($activeSlave.breedingMark != 1) && ($activeSlave.preg < 30)>>
+ <<click "Normal Gestation">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>normal gestation speed<</replace>><</click>>
+ |
+ <<click "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<replace "#pregControl">>slowed down gestation speed<</replace>><</click>>
+ |
+ <<click "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<replace "#pregControl">>scheduled for speed up gestation agents, but they can be used only in strictly controled environiments. Slave should be directed into the clinic.<</replace>><</click>>
+ <</if>>
+<</if>>
<<if $incubator > 0>>
<<if $activeSlave.pregType < 50 && $activeSlave.preg > 3 && $activeSlave.eggType == "human">>
<<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>>
@@ -645,13 +648,13 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<
<<if $activeSlave.breedingMark == 0>>
<<if isFertile($activeSlave)>>
<<if $activeSlave.eggType == "human">>
- <br>
- [[Breeder Eligibility Exam|BreedingTest]]
+ <br>
+ [[Breeder Eligibility Exam|BreedingTest]]
+ <</if>>
<</if>>
<</if>>
<</if>>
<</if>>
-<</if>>
<<if $activeSlave.inflation > 0>>
<br>
@@ -809,11 +812,11 @@ __Diet Base__: <strong><span id="dietBase"><<if $activeSlave.dietCum == 2>>Cum B
<<if $activeSlave.standardReward isnot "situational">>
<<click "Situational">><<set $activeSlave.standardReward to "situational">><<replace "#standardReward">><<print $activeSlave.standardReward>><</replace>><</click>>
<</if>>
-<br>
-__Non-Assignment Orgasm Rules__: ''$activeSlave.releaseRules.''
-[[Permit masturbation and interslave sex|Slave Interact][$activeSlave.releaseRules to "permissive"]]
-| [[Let her get off with other slaves|Slave Interact][$activeSlave.releaseRules to "sapphic"]]
-| [[Only with you|Slave Interact][$activeSlave.releaseRules to "restrictive"]]
+ <br>
+ __Non-Assignment Orgasm Rules__: ''$activeSlave.releaseRules.''
+ [[Permit masturbation and interslave sex|Slave Interact][$activeSlave.releaseRules to "permissive"]]
+ | [[Let her get off with other slaves|Slave Interact][$activeSlave.releaseRules to "sapphic"]]
+ | [[Only with you|Slave Interact][$activeSlave.releaseRules to "restrictive"]]
<</if>>
<<if $activeSlave.clitPiercing is 3>>
--
GitLab