From f39f5fc3fba41485a0982999d4b3a8638c5ea476 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 24 Apr 2019 19:06:06 -0400 Subject: [PATCH] tidying --- src/facilities/farmyard/farmyardReport.tw | 5 ++--- src/facilities/nursery/nurseryReport.tw | 4 ++-- src/pregmod/rePregInventor.tw | 2 +- src/uncategorized/arcadeReport.tw | 4 ++-- src/uncategorized/brothelReport.tw | 6 +++--- src/uncategorized/cellblockReport.tw | 2 +- src/uncategorized/clinicReport.tw | 4 ++-- src/uncategorized/clubReport.tw | 6 +++--- src/uncategorized/fullReport.tw | 2 +- src/uncategorized/saRecruitGirls.tw | 2 +- src/uncategorized/servantsQuartersReport.tw | 6 +++--- src/uncategorized/spaReport.tw | 4 ++-- 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw index 6f9e1ec35c5..ce107fe6390 100644 --- a/src/facilities/farmyard/farmyardReport.tw +++ b/src/facilities/farmyard/farmyardReport.tw @@ -264,9 +264,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<_dump = saWorkTheFarm($slaves[$i])>> - $He <<= saWorkTheFarm($slaves[$i])>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saWorkTheFarm($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw index 8adf96ded21..aa35b8d37c9 100644 --- a/src/facilities/nursery/nurseryReport.tw +++ b/src/facilities/nursery/nurseryReport.tw @@ -184,8 +184,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> - <<set _dump = saRest($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> + <<run saRest($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw index 8d1549144de..21c9224fab9 100644 --- a/src/pregmod/rePregInventor.tw +++ b/src/pregmod/rePregInventor.tw @@ -94,7 +94,7 @@ <<else>> surprisingly resilient, tight little pussy, <</if>> - <<set _dump = VaginalVCheck()>> + <<run VaginalVCheck()>> <<else>> clench your legs around $his slutty head as $he drives your pussy over the edge with $his tongue, <<set $activeSlave.counter.oral++, $oralTotal++>> diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw index 6c6646c06f2..5ee020d75dd 100644 --- a/src/uncategorized/arcadeReport.tw +++ b/src/uncategorized/arcadeReport.tw @@ -76,11 +76,11 @@ <<else>> is confined in $arcadeName. <</if>> - <br> $He <<print saWorkAGloryHole($slaves[$i])>> + <br> $He <<= saWorkAGloryHole($slaves[$i])>> <<else>> <<silently>> <<include "SA chooses own job">> - <<print saWorkAGloryHole($slaves[$i])>> + <<run saWorkAGloryHole($slaves[$i])>> <</silently>> <</if>> <<if ($arcadeUpgradeCollectors > 0)>> diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 8e11b8eab0c..2b300f40764 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -197,7 +197,7 @@ <<if $showEWD != 0>> <br> $He <<= saWhore($slaves[$i])>> <<else>> - <<set _dump = saWhore($slaves[$i])>> + <<run saWhore($slaves[$i])>> <</if>> <<set _seed = $cash-_oldCash, _cashX += Math.trunc(0.5*_seed), _seed = Math.trunc(1.5*_seed), _profits += _seed>> <<run cashX(_cashX, "whore", $Madam)>> @@ -355,8 +355,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _dump = saWhore($slaves[$i])>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saWhore($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index 63778fa3315..b3d5d40ff90 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -265,7 +265,7 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _dump = saStayConfined($slaves[$i])>> + <<run saStayConfined($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index bd774af0ecf..93d5e51cb5a 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -318,8 +318,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _dump = saRest($slaves[$i])>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saRest($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index b601dbea316..48cc7bbde6a 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -100,7 +100,7 @@ <<if $showEWD != 0>> <br> $He <<= saServeThePublic($slaves[$i])>> <<else>> - <<set _dump = saServeThePublic($slaves[$i])>> + <<run saServeThePublic($slaves[$i])>> <</if>> <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[_FLs].skill.entertainment))*0.1*0.5), "club", $slaves[_FLs])>> <</if>> @@ -245,8 +245,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _dump = saServeThePublic($slaves[$i])>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saServeThePublic($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw index 60b6e3fe2ed..82cd23ccd10 100644 --- a/src/uncategorized/fullReport.tw +++ b/src/uncategorized/fullReport.tw @@ -18,7 +18,7 @@ <<case "serve the public">> <<= saServeThePublic($slaves[$i])>> <<case "work a glory hole">> - <<print saWorkAGloryHole($slaves[$i])>> + <<= saWorkAGloryHole($slaves[$i])>> <<case "get milked">> <<set $servantMilkersMultiplier = 1>> <<include "SA get milked">> diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index a4fbe817dd8..4c07b6f23f4 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -39,7 +39,7 @@ <<set _oldRepGain = hashSum($lastWeeksRepIncome)>> <<set $pure = 0>> - <<set _dump = saServeThePublic($slaves[$i])>> + <<run saServeThePublic($slaves[$i])>> <<set _influence = Math.clamp((hashSum($lastWeeksRepIncome)-_oldRepGain)*0.01,1,3)>> <<if $arcologies[0].FSSubjugationist != "unset">> diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index f37ada6591a..72d3b2c3bd9 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -202,7 +202,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -281,12 +281,12 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<_dump = saServant($slaves[$i])>> + <<run saServant($slaves[$i])>> <<if ($servantMilkers == 1) && ($slaves[$i].lactation > 0)>> <<include "SA get milked">> <<set _SQMilk += $milk, _SQMilkSale += $milkSale>> <</if>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index 6f2182e93de..c7a5f00650f 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -321,8 +321,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> - <<set _dump = saRest($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> + <<run saRest($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> -- GitLab