From 05bc95b4c076e6980e978c34396436b3f588abed Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 1 Sep 2017 01:35:16 -0400 Subject: [PATCH] fixes, tweaks and breast growth changes. --- src/uncategorized/dairyReport.tw | 150 +++++++++++++++++++++++++------ src/uncategorized/saDrugs.tw | 4 +- src/utility/assayWidgets.tw | 10 ++- 3 files changed, 131 insertions(+), 33 deletions(-) diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 4e8532b0653..e67dea898c4 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -95,7 +95,7 @@ <<if $slaves[$i].weight >= 160>> <<set _MMWorkout++>> <</if>> - <<if $slaves[$i].boobs >= 6000>> + <<if $slaves[$i].boobs >= 20000>> <<set _MMWorkout++>> <</if>> <<if $slaves[$i].balls >= 30>> @@ -111,7 +111,7 @@ <<if $slaves[$i].weight >= 160>> <<set _MMWorkout += 2>> <</if>> - <<if $slaves[$i].boobs >= 6000>> + <<if $slaves[$i].boobs >= 20000>> <<set _MMWorkout += 2>> <</if>> <<if $slaves[$i].balls >= 30>> @@ -200,7 +200,7 @@ <</if>> <</if>> <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">> - <<if (($slaves[$i].balls > 5) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>> + <<if (($slaves[$i].balls > 6) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>> She spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them. <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>> <<else>> @@ -367,24 +367,80 @@ <<set $slaves[$i].health += 25>> <<else>> <<if ($dairySlimMaintain == 0)>> - <<if $slaves[$i].boobs < 50000>> - <<if $arcologies[0].FSAssetExpansionistResearch == 1>> - <<if ($slaves[$i].boobs < 2000)>> - <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> - <<elseif ($slaves[$i].boobs < 5000)>> - <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<if $dairyFeedersSetting > 1 && $dairyStimulatorsSetting > 0>> + <<if $slaves[$i].boobs < 50000>> + <<if $arcologies[0].FSAssetExpansionistResearch == 1>> + <<if ($slaves[$i].boobs < 2000)>> + <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<elseif ($slaves[$i].boobs < 5000)>> + <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <</if>> <<else>> - <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> <</if>> + <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> + <<set _boobtacular++>> + <</if>> + <<set $slaves[$i].boobs += _growth>> <<else>> - <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> + <<set $slaves[$i].boobs = 50000>> <</if>> - <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> - <<set _boobtacular++>> + <<elseif $dairyFeedersSetting > 0 && $dairyStimulatorsSetting > 0>> + <<if $slaves[$i].boobs < 25000>> + <<if $arcologies[0].FSAssetExpansionistResearch == 1>> + <<if ($slaves[$i].boobs < 2000)>> + <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<elseif ($slaves[$i].boobs < 5000)>> + <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <</if>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> + <</if>> + <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> + <<set _boobtacular++>> + <</if>> + <<set $slaves[$i].boobs += _growth>> + <</if>> + <<elseif $dairyFeedersSetting > 1>> + <<if $slaves[$i].boobs < 10000>> + <<if $arcologies[0].FSAssetExpansionistResearch == 1>> + <<if ($slaves[$i].boobs < 2000)>> + <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<elseif ($slaves[$i].boobs < 5000)>> + <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <</if>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> + <</if>> + <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> + <<set _boobtacular++>> + <</if>> + <<set $slaves[$i].boobs += _growth>> <</if>> - <<set $slaves[$i].boobs += _growth>> <<else>> - <<set $slaves[$i].boobs = 50000>> + <<if $slaves[$i].boobs < 5000>> + <<if $arcologies[0].FSAssetExpansionistResearch == 1>> + <<if ($slaves[$i].boobs < 2000)>> + <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<elseif ($slaves[$i].boobs < 5000)>> + <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <</if>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> + <</if>> + <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> + <<set _boobtacular++>> + <</if>> + <<set $slaves[$i].boobs += _growth>> + <</if>> <</if>> <</if>> <<if ($slaves[$i].balls > 0)>> @@ -413,7 +469,7 @@ <</if>> <</if>> <</if>> /* closes ($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0) */ - <<if ($dairyStimulatorsUpgrade == 1)>> + <<if ($dairyStimulatorsUpgrade == 1) && $dairyStimulatorsSetting > 0>> <<if ($dairyStimulatorsSetting > 1) && ($slaves[$i].anus < 4)>> <<set $slaves[$i].anus++>> <<if ($slaves[$i].anus == 4)>> @@ -425,24 +481,62 @@ <<if ($slaves[$i].health < 60)>> <<set $slaves[$i].health += 20>> <<elseif $dairySlimMaintain == 0>> - <<if $slaves[$i].boobs < 50000>> - <<if $arcologies[0].FSAssetExpansionistResearch == 1>> - <<if ($slaves[$i].boobs < 2000)>> - <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> - <<elseif ($slaves[$i].boobs < 5000)>> - <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<if $dairyFeedersSetting > 1>> + <<if $slaves[$i].boobs < 50000>> + <<if $arcologies[0].FSAssetExpansionistResearch == 1>> + <<if ($slaves[$i].boobs < 2000)>> + <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<elseif ($slaves[$i].boobs < 5000)>> + <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <</if>> <<else>> - <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> <</if>> + <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> + <<set _boobtacular++>> + <</if>> + <<set $slaves[$i].boobs += _growth>> <<else>> - <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> + <<set $slaves[$i].boobs = 50000>> <</if>> - <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> - <<set _boobtacular++>> + <<elseif $dairyFeedersSetting > 0>> + <<if $slaves[$i].boobs < 25000>> + <<if $arcologies[0].FSAssetExpansionistResearch == 1>> + <<if ($slaves[$i].boobs < 2000)>> + <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<elseif ($slaves[$i].boobs < 5000)>> + <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <</if>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> + <</if>> + <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> + <<set _boobtacular++>> + <</if>> + <<set $slaves[$i].boobs += _growth>> <</if>> - <<set $slaves[$i].boobs += _growth>> <<else>> - <<set $slaves[$i].boobs = 50000>> + <<if $slaves[$i].boobs < 10000>> + <<if $arcologies[0].FSAssetExpansionistResearch == 1>> + <<if ($slaves[$i].boobs < 2000)>> + <<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<elseif ($slaves[$i].boobs < 5000)>> + <<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>> + <</if>> + <<else>> + <<set _growth = 25*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50-$slaves[$i].physicalAge)/4))>> + <</if>> + <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> + <<set _boobtacular++>> + <</if>> + <<set $slaves[$i].boobs += _growth>> + <</if>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 06c0d5e25e3..a4966ee6522 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -384,7 +384,7 @@ <<case "penis enhancement" "intensive penis enhancement">> <<set _growth = 60+($injectionUpgrade*20)>> - <<if _intensive>><<set _growth += 20>><</if>> + <<if _intensive>><<set _growth -= 20>><</if>> <<if ($slaves[$i].dick > 0)>> <<if (random(1,100) > _growth-($slaves[$i].dick*5))>> @@.lime;$possessiveCap cock grows painfully,@@ becoming both longer and girthier. @@ -439,7 +439,7 @@ <<if $slaves[$i].balls >= 10>> <<else>> <<set _growth = 60+($injectionUpgrade*20)>> - <<if _intensive>><<set _growth += 20>><</if>> + <<if _intensive>><<set _growth -= 20>><</if>> <<if (random(1,100) > _growth-($slaves[$i].balls*5))>> @@.lime;$possessiveCap balls swell painfully.@@ <<set $slaves[$i].balls++>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 4927bcb1170..0a8bb26e5e1 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -400,7 +400,7 @@ <<elseif $args[0].boobs <= 25000>> <<set $beauty += 50+(0.005*($args[0].boobs-3000))>> /*160 - this might need to be lowered. Maybe drop the 50? Otherwise break it down more.*/ <<else>> - <<set $beauty += 165+($args[0].boobs/10000)>> + <<set $beauty += 145+(0.001*($args[0].boobs-10000))>> /* 185 */ <</if>> <<if $args[0].butt <= 2>> <<set $beauty += (2*($args[0].butt-1))>> /*2*/ @@ -413,7 +413,7 @@ <</if>> /* maybe buff butts? */ <<elseif ($arcologies[0].FSSlimnessEnthusiast > 20)>> <<if $args[0].boobs <= 500>> - <<set $beauty += (0.05*($args[0].boobs))>> /*25 - buff me to be in line with higher end asset exp*/ + <<set $beauty += (0.08*($args[0].boobs))>> /*40 - buff me to be in line with higher end asset exp*/ <<elseif $args[0].boobs <= 1000>> <<set $beauty += 10>> <<elseif $args[0].boobs <= 3000>> @@ -435,8 +435,12 @@ <<set $beauty += 20+(0.01*($args[0].boobs-1200))>> /*32*/ <<elseif $args[0].boobs <= 3600>> <<set $beauty += 32+(0.005*($args[0].boobs-2400))>> /*38*/ + <<elseif $args[0].boobs <= 10000>> + <<set $beauty += 38>> + <<elseif $args[0].boobs <= 25000>> + <<set $beauty += 30>> <<else>> - <<set $beauty += 38>> + <<set $beauty += 20>> <</if>> <<if $args[0].butt <= 2>> <<set $beauty += (2*($args[0].butt-1))>> /*2*/ -- GitLab