From 6845a4e7668e29cad8bf07ffa9b33380c960b8a9 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 10 Mar 2017 05:33:25 -0500 Subject: [PATCH] Bugfixes and tweaks. --- src/pregmod/generateChild.tw | 6 ++-- src/uncategorized/clubReport.tw | 57 ++++++++++++++------------------ src/uncategorized/costs.tw | 4 +++ src/uncategorized/costsReport.tw | 4 +++ 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw index 12a18eb1f34..55a1af000cd 100644 --- a/src/pregmod/generateChild.tw +++ b/src/pregmod/generateChild.tw @@ -8,7 +8,7 @@ <<set $mergeMom = $genePool[$m]>> <</if>> <<if $mom.pregSource == $genePool[$m].ID>> - <<set $mergeDad = $genePool[$m].ID>> + <<set $mergeDad = $genePool[$m]>> <</if>> <</for>> <<if $mom.pregSource == -1>> @@ -53,7 +53,7 @@ <<else>> <<for $m to 0; $m < $genePool.length; $m++>> <<if $PC.pregSource == $genePool[$m].ID>> - <<set $mergeDad == $genePool[$m].ID>> + <<set $mergeDad == $genePool[$m]>> <<break>> <</if>> <</for>> @@ -162,7 +162,7 @@ <<else>> <<for $m to 0; $m < $genePool.length; $m++>> <<if $PC.pregSource == $genePool[$m].ID>> - <<set $mergeDad == $genePool[$m].ID>> + <<set $mergeDad == $genePool[$m]>> <<break>> <</if>> <</for>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index a216f1dc921..0745aebf8e5 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -18,7 +18,7 @@ <<set $pregYes to 0>> <<set $pregNo to 0>> <<set $DJFetish to 0>> - <<set $DJRepBonus to 0>> +<<set $DJRepBonus to 0>> <<for $i to 0; $i < $slaves.length; $i++>> <<if ($slaves[$i].assignment is "serve in the club")>> @@ -30,22 +30,6 @@ <<if ($DJ != 0)>> <<for $i to 0; $i < $slaves.length; $i++>> <<if ($slaves[$i].ID is $DJ.ID)>> - <<silently>> - <<display [[SA serve the public]]>> - <<if $slaves[$i].choosesOwnClothes == 1>> - <<display "SA chooses own clothes">> - <<if ($slaves[$i].devotion <= 20)>> - <<set $slaves[$i].devotion -= 5>> - <<else>> - <<set $slaves[$i].devotion += 1>> - <</if>> - <</if>> - <<display "SA diet">> - <<display "SA long term effects">> - <<display "SA drugs">> - <<display "SA relationships">> - <<display "SA rivalries">> - <</silently>> <<if ($slaves[$i].health < -80)>> <<set $slaves[$i].health += 20>> <<elseif $slaves[$i].health < -40>> @@ -160,22 +144,6 @@ $DJ.slaveName is performing as the DJ.<<if $DJ.relationship is -3>> She tries h <<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].pregType < 50) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>> <<set $legendaryWombID to $slaves[$i].ID>> <</if>> - <<silently>> - <<display [[SA serve the public]]>> - <<if $slaves[$i].choosesOwnClothes == 1>> - <<display "SA chooses own clothes">> - <<if ($slaves[$i].devotion <= 20)>> - <<set $slaves[$i].devotion -= 5>> - <<else>> - <<set $slaves[$i].devotion += 1>> - <</if>> - <</if>> - <<display "SA diet">> - <<display "SA long term effects">> - <<display "SA drugs">> - <<display "SA relationships">> - <<display "SA rivalries">> - <</silently>> <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> <<set $slaves[$i].devotion -= 5>> <<set $slaves[$i].trust -= 5>> @@ -302,12 +270,18 @@ $DJ.slaveName is performing as the DJ.<<if $DJ.relationship is -3>> She tries h <<display [[SA serve the public]]>> <<if $slaves[$i].choosesOwnClothes == 1>> <<display "SA chooses own clothes">> + <<if ($slaves[$i].devotion <= 20)>> + <<set $slaves[$i].devotion -= 5>> + <<else>> + <<set $slaves[$i].devotion += 1>> + <</if>> <</if>> <<display "SA diet">> <<display "SA long term effects">> <<display "SA drugs">> <<display "SA relationships">> <<display "SA rivalries">> + <<display "SA devotion">> <</silently>> <<else>> <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>> @@ -317,8 +291,14 @@ $DJ.slaveName is performing as the DJ.<<if $DJ.relationship is -3>> She tries h <<set $legendaryWombID to $slaves[$i].ID>> <</if>> ''__@@color:pink;$slaves[$i].slaveName@@__'' is performing as the DJ in the club. + <<display [[SA serve the public]]>> <<if $slaves[$i].choosesOwnClothes == 1>> <<display "SA chooses own clothes">> + <<if ($slaves[$i].devotion <= 20)>> + <<set $slaves[$i].devotion -= 5>> + <<else>> + <<set $slaves[$i].devotion += 1>> + <</if>> <</if>> <<display "SA diet">> <<display "SA long term effects">> @@ -350,12 +330,18 @@ $DJ.slaveName is performing as the DJ.<<if $DJ.relationship is -3>> She tries h <<display [[SA serve the public]]>> <<if $slaves[$i].choosesOwnClothes == 1>> <<display "SA chooses own clothes">> + <<if ($slaves[$i].devotion <= 20)>> + <<set $slaves[$i].devotion -= 5>> + <<else>> + <<set $slaves[$i].devotion += 1>> + <</if>> <</if>> <<display "SA diet">> <<display "SA long term effects">> <<display "SA drugs">> <<display "SA relationships">> <<display "SA rivalries">> + <<display "SA devotion">> <</silently>> <<else>> <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>> @@ -369,6 +355,11 @@ $DJ.slaveName is performing as the DJ.<<if $DJ.relationship is -3>> She tries h <br> <<if $slaves[$i].choosesOwnClothes == 1>> <<display "SA chooses own clothes">> + <<if ($slaves[$i].devotion <= 20)>> + <<set $slaves[$i].devotion -= 5>> + <<else>> + <<set $slaves[$i].devotion += 1>> + <</if>> <</if>> <<display "SA diet">> <<display "SA long term effects">> diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw index 81dc5348eb1..87afd8e29d2 100644 --- a/src/uncategorized/costs.tw +++ b/src/uncategorized/costs.tw @@ -28,6 +28,10 @@ <<set $costs += ($girls*(250+($economy*500)))>> +<<if $arcologies[0].FSRepopulationFocusLaw == 1 && $PC.preg > 4>> + <<set $costs -= 500>> +<</if>> + <<if ($PC.career is "mercenary") || ($PC.career is "arcology owner")>> <<set $costs += ($mercenaries*500)>> <<else>> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 9a25f6a44ba..7538bf537e8 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -14,6 +14,10 @@ Since you are used to a fairly normal life, your __personal living expenses__ are ¤<<print ($girls*(250+($economy*500)))>>. <</if>> +<<if $arcologies[0].FSRepopulationFocusLaw == 1 && $PC.preg > 4>> + <br>Rent promotion for being a pregnant citizen under ''Universal Pregnancy Subsidy:'' ¤500>> +<</if>> + <<if $PC.preg == -1>> <br>Your Contraceptives expenses: ¤25>> <<elseif $PC.preg >= 16>> -- GitLab