diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw index e48bc003ec108511996306c10ebf9b3892bb71c6..992bba3edfe2a33e0e8f85ea51b95d368bd33e28 100644 --- a/src/events/intro/initNationalities.tw +++ b/src/events/intro/initNationalities.tw @@ -510,9 +510,6 @@ <</if>> <</if>> -<<set $customSlave.nationality = $nationalities.random()>> -<<set $huskSlave.nationality = $nationalities.random()>> - /* SET STARTING CONDITIONS */ <<set $minimumSlaveCost = 3000>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index a1ead138fd9565d41ed6447035987e2b3f2a6114..6b39eb6c134035a331ccc8d1fa4ada4eb3449fac 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1063,9 +1063,10 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $nextLink = "EW Slaves">> <<set $customSlaveOrdered = 0>> +<<set $customSlave = {age: 18, health: 0, muscles: 0, lips: 15, heightMod: "normal", face: 0, race: "white", skin: 0, boobs: 500, butt: 3, sex: 1, virgin: 0, penis: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 1, nationality: "Stateless", amp: 0, eyes: 1}>> <<set $huskSlaveOrdered = 0>> -<<set $huskSlave = {age: 18, nationality: "slave", race: "white", sex: 1, virgin: 0}>> +<<set $huskSlave = {age: 18, nationality: "Stateless", race: "white", sex: 1, virgin: 0}>> /*non-vanilla shit*/ <<set $pedo_mode = 0>> @@ -1083,10 +1084,6 @@ FertilityAge($fertilityAge) <<set $targetAge = $minimumSlaveAge>> <<set $pubertyLength = 5>> <<set $maxGrowthAge = 24>> -<<set $DOLFigureHeadFamilyStatuesChildren = 0>> -<<set $DOLFigureHeadFamilyStatuesEscorts = 0>> - - /% Begin mod section: toggle whether slaves lisp. %/ <<set $disableLisping = 0>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index a96261ee10d8ce0d7d8b00e93023a4f44aab6568..3691226b5d2227bdf4d01e34b7df00aebbf09eb5 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -397,7 +397,7 @@ <<if ($slaves[$i].balls == 0)>> <<set $slaves[$i].hormones = 2>> <</if>> - <<if ($slaves[$i].lactation < 2) && ($slaves[$i].boobs > 300 || $slaves[$i].dick == 0 $slaves[$i].lactation == 1)>> + <<if ($slaves[$i].lactation < 2) && ($slaves[$i].boobs > 300 || $slaves[$i].dick == 0 || $slaves[$i].lactation == 1)>> <<set $slaves[$i].lactation = 2, $slaves[$i].health -= 10, $cash -= $surgeryCost>> <</if>> <<elseif $slaves[$i].diet == "fattening">> @@ -412,7 +412,7 @@ <<if ($slaves[$i].health < 75)>> <<set $slaves[$i].health += 25>> <<else>> - <<if ($dairySlimMaintain == 0)>> + <<if ($dairySlimMaintain == 0) && $slaves[$i].lactation > 0>> <<if $dairyFeedersSetting > 1 && $dairyStimulatorsSetting > 0>> <<if $slaves[$i].boobs < 50000>> <<if $arcologies[0].FSAssetExpansionistResearch == 1>> @@ -526,7 +526,7 @@ <</if>> <<if ($slaves[$i].health < 60)>> <<set $slaves[$i].health += 20>> - <<elseif $dairySlimMaintain == 0>> + <<elseif $dairySlimMaintain == 0 && $slaves[$i].lactation > 0>> <<if $dairyFeedersSetting > 1>> <<if $slaves[$i].boobs < 50000>> <<if $arcologies[0].FSAssetExpansionistResearch == 1>> @@ -585,9 +585,14 @@ <</if>> <</if>> <</if>> + <<if $slaves[$i].balls > 0>> + <<set _cumWeek = _cumWeek*1.2>> + <</if>> <</if>> <<if ($dairyRestraintsSetting > 1)>> - <<set $slaves[$i].lactationAdaptation += 1>> + <<if $slaves[$i].lactation > 0>> + <<set $slaves[$i].lactationAdaptation += 1>> + <</if>> <<if ($slaves[$i].muscles > -100)>> <<set $slaves[$i].muscles-->> <</if>> @@ -664,7 +669,7 @@ <</if>> <</if>> <</if>> - <<if ($slaves[$i].milk > 1000) && ($slaves[$i].boobs > 12000) && ($slaves[$i].career != "a bioreactor")>> + <<if (($slaves[$i].milk > 1000) && ($slaves[$i].boobs > 12000) || ($slaves[$i].cum > 1000) && ($slaves[$i].balls >= 10)) && ($slaves[$i].career != "a bioreactor")>> <<set $slaves[$i].career = "a bioreactor", _careerForgotten++>> <</if>> <<if ($arcologies[0].FSBodyPuristLaw == 0) && ($healthyDrugsUpgrade == 0)>> @@ -707,7 +712,7 @@ <<elseif ($slaves[$i].fetish != "mindbroken")>> <<set $slaves[$i].fetish = "mindbroken", _mindbroken++>> <</if>> - <<elseif ($slaves[$i].milk > 1000) && ($slaves[$i].boobs > 12000) && ($slaves[$i].career != "a bioreactor")>> + <<elseif (($slaves[$i].milk > 1000) && ($slaves[$i].boobs > 12000) || ($slaves[$i].cum > 1000) && ($slaves[$i].balls >= 10)) && ($slaves[$i].career != "a bioreactor")>> <<set $slaves[$i].career = "a bioreactor", _careerForgotten++>> <</if>> <<if ($arcologies[0].FSBodyPuristLaw == 0) && ($healthyDrugsUpgrade == 0)>> diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw index 0135b329635942933820828c12c60a19b8729248..1242d9e677151c28fb252309ebf92fba2a4704ca 100644 --- a/src/uncategorized/saDevotion.tw +++ b/src/uncategorized/saDevotion.tw @@ -723,7 +723,7 @@ <</if>> <</if>> -<<if ($slaves[$i].devotion > 100) && ($slaves[$i].trust > 100) && ($slaves[$i].energy > 75)>> +<<if ($slaves[$i].devotion > 100) && ($slaves[$i].trust > 100) && ($slaves[$i].energy > 50)>> Her perfect devotion and trust @@.green;improve your reputation.@@ <<set $repGain += 10*($slaves[$i].devotion-100)>> <<set $slaves[$i].devotion = 100>>