From 352d8f10cf03f0991300e0440775f29cc0876b88 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Mon, 26 Oct 2020 02:04:51 -0400 Subject: [PATCH] use new dom --- src/uncategorized/arcadeReport.tw | 6 ++---- src/uncategorized/brothelReport.tw | 8 ++------ src/uncategorized/cellblockReport.tw | 10 ++++------ src/uncategorized/clubReport.tw | 12 ++++-------- src/uncategorized/dairyReport.tw | 12 ++++-------- src/uncategorized/fullReport.tw | 6 ++---- src/uncategorized/saLiveWithHG.tw | 6 ++---- src/uncategorized/spaReport.tw | 12 ++++-------- 8 files changed, 24 insertions(+), 48 deletions(-) diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw index ad3e4c7a549..2f2dca07c7e 100644 --- a/src/uncategorized/arcadeReport.tw +++ b/src/uncategorized/arcadeReport.tw @@ -138,7 +138,7 @@ <</if>> <<if $showEWD != 0>> <br> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_slave)>> <<= App.SlaveAssignment.diet(_slave)>> <<includeDOM App.SlaveAssignment.longTermEffects(_slave)>> <<= App.SlaveAssignment.drugs(_slave)>> @@ -146,15 +146,13 @@ <<= App.SlaveAssignment.rivalries(_slave)>> <br> <<= App.SlaveAssignment.devotion(_slave)>> <<else>> - <<silently>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules()>> <<run App.SlaveAssignment.diet(_slave)>> <<run App.SlaveAssignment.longTermEffects(_slave)>> <<run App.SlaveAssignment.drugs(_slave)>> <<run App.SlaveAssignment.relationships(_slave)>> <<run App.SlaveAssignment.rivalries(_slave)>> <<run App.SlaveAssignment.devotion(_slave)>> - <</silently>> <</if>> <</for>> diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 2ecf9987cbe..d735efced5a 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -204,17 +204,15 @@ <<= App.SlaveAssignment.rivalries(_S.Madam)>> <br> <<= App.SlaveAssignment.devotion(_S.Madam)>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnClothes(_S.Madam)>> <<run tired(_S.Madam)>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules(_S.Madam)>> <<run App.SlaveAssignment.diet(_S.Madam)>> <<run App.SlaveAssignment.longTermEffects(_S.Madam)>> <<run App.SlaveAssignment.drugs(_S.Madam)>> <<run App.SlaveAssignment.relationships(_S.Madam)>> <<run App.SlaveAssignment.rivalries(_S.Madam)>> <<run App.SlaveAssignment.devotion(_S.Madam)>> - <</silently>> <</if>> <</if>> @@ -295,18 +293,16 @@ <<= App.SlaveAssignment.rivalries(_slave)>> <br> <<= App.SlaveAssignment.devotion(_slave)>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnJob(_slave)>> <<run App.SlaveAssignment.whore(_slave)>> <<run App.SlaveAssignment.choosesOwnClothes(_slave)>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules(_slave)>> <<run App.SlaveAssignment.diet(_slave)>> <<run App.SlaveAssignment.longTermEffects(_slave)>> <<run App.SlaveAssignment.drugs(_slave)>> <<run App.SlaveAssignment.relationships(_slave)>> <<run App.SlaveAssignment.rivalries(_slave)>> <<run App.SlaveAssignment.devotion(_slave)>> - <</silently>> <</if>> <<set _seed = Math.max(App.Ads.getMatchedCategoryCount(_slave, "brothel"), 1)>> diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index 7c0555e8fce..8a2d3b4426f 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -141,7 +141,7 @@ <br> <<= App.SlaveAssignment.choosesOwnClothes($slaves[$i])>> <<run tired($slaves[$i])>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules($slaves[$i])>> <<= App.SlaveAssignment.diet($slaves[$i])>> <<includeDOM App.SlaveAssignment.longTermEffects($slaves[$i])>> <<= App.SlaveAssignment.drugs($slaves[$i])>> @@ -149,17 +149,15 @@ <<= App.SlaveAssignment.rivalries($slaves[$i])>> <br> <<= App.SlaveAssignment.devotion($slaves[$i])>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnClothes($slaves[$i])>> <<run tired($slaves[$i])>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules($slaves[$i])>> <<run App.SlaveAssignment.diet($slaves[$i])>> <<run App.SlaveAssignment.longTermEffects($slaves[$i])>> <<run App.SlaveAssignment.drugs($slaves[$i])>> <<run App.SlaveAssignment.relationships($slaves[$i])>> <<run App.SlaveAssignment.rivalries($slaves[$i])>> <<run App.SlaveAssignment.devotion($slaves[$i])>> - <</silently>> <</if>> <</if>> @@ -263,7 +261,7 @@ <</if>> <br> $He <<= App.SlaveAssignment.stayConfined(_slave)>> <br> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_slave)>> <<= App.SlaveAssignment.diet(_slave)>> <<includeDOM App.SlaveAssignment.longTermEffects(_slave)>> <<= App.SlaveAssignment.drugs(_slave)>> @@ -274,7 +272,7 @@ <<silently>> <<run App.SlaveAssignment.choosesOwnJob(_slave)>> <<run App.SlaveAssignment.stayConfined(_slave)>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules(_slave)>> <<run App.SlaveAssignment.diet(_slave)>> <<run App.SlaveAssignment.longTermEffects(_slave)>> <<run App.SlaveAssignment.drugs(_slave)>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index e9d427d33e3..c7a90861626 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -120,7 +120,7 @@ <br> <<= App.SlaveAssignment.choosesOwnClothes(_S.DJ)>> <<run tired(_S.DJ)>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_S.DJ)>> <<= App.SlaveAssignment.diet(_S.DJ)>> <<includeDOM App.SlaveAssignment.longTermEffects(_S.DJ)>> <<= App.SlaveAssignment.drugs(_S.DJ)>> @@ -128,17 +128,15 @@ <<= App.SlaveAssignment.rivalries(_S.DJ)>> <br> <<= App.SlaveAssignment.devotion(_S.DJ)>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnClothes(_S.DJ)>> <<run tired(_S.DJ)>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules(_S.DJ)>> <<run App.SlaveAssignment.diet(_S.DJ)>> <<run App.SlaveAssignment.longTermEffects(_S.DJ)>> <<run App.SlaveAssignment.drugs(_S.DJ)>> <<run App.SlaveAssignment.relationships(_S.DJ)>> <<run App.SlaveAssignment.rivalries(_S.DJ)>> <<run App.SlaveAssignment.devotion(_S.DJ)>> - <</silently>> <</if>> <</if>> @@ -197,7 +195,7 @@ <br> $He <<= App.SlaveAssignment.serveThePublic(_slave)>> <br> <<= App.SlaveAssignment.choosesOwnClothes(_slave)>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_slave)>> <<= App.SlaveAssignment.diet(_slave)>> <<includeDOM App.SlaveAssignment.longTermEffects(_slave)>> <<= App.SlaveAssignment.drugs(_slave)>> @@ -205,18 +203,16 @@ <<= App.SlaveAssignment.rivalries(_slave)>> <br> <<= App.SlaveAssignment.devotion(_slave)>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnJob(_slave)>> <<run App.SlaveAssignment.serveThePublic(_slave)>> <<run App.SlaveAssignment.choosesOwnClothes(_slave)>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_slave)>> <<run App.SlaveAssignment.diet(_slave)>> <<run App.SlaveAssignment.longTermEffects(_slave)>> <<run App.SlaveAssignment.drugs(_slave)>> <<run App.SlaveAssignment.relationships(_slave)>> <<run App.SlaveAssignment.rivalries(_slave)>> <<run App.SlaveAssignment.devotion(_slave)>> - <</silently>> <</if>> <</for>> <p> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 8fc702d6f8a..4b8757d8b50 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -310,7 +310,7 @@ <br> <<= App.SlaveAssignment.choosesOwnClothes(_S.Milkmaid)>> <<run tired(_S.Milkmaid)>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_S.Milkmaid)>> <<= App.SlaveAssignment.diet(_S.Milkmaid)>> <<includeDOM App.SlaveAssignment.longTermEffects(_S.Milkmaid)>> <<= App.SlaveAssignment.drugs(_S.Milkmaid)>> @@ -318,17 +318,15 @@ <<= App.SlaveAssignment.rivalries(_S.Milkmaid)>> <br> <<= App.SlaveAssignment.devotion(_S.Milkmaid)>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnClothes(_S.Milkmaid)>> <<run tired(_S.Milkmaid)>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules(_S.Milkmaid)>> <<run App.SlaveAssignment.diet(_S.Milkmaid)>> <<run App.SlaveAssignment.longTermEffects(_S.Milkmaid)>> <<run App.SlaveAssignment.drugs(_S.Milkmaid)>> <<run App.SlaveAssignment.relationships(_S.Milkmaid)>> <<run App.SlaveAssignment.rivalries(_S.Milkmaid)>> <<run App.SlaveAssignment.devotion(_S.Milkmaid)>> - <</silently>> <</if>> <</if>> @@ -418,7 +416,7 @@ <<set _milkResults = App.SlaveAssignment.getMilked(_slave)>> <br> $He <<= _milkResults.text>> <br> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_slave)>> <<= App.SlaveAssignment.diet(_slave)>> <<includeDOM App.SlaveAssignment.longTermEffects(_slave)>> <<= App.SlaveAssignment.drugs(_slave)>> @@ -426,17 +424,15 @@ <<= App.SlaveAssignment.rivalries(_slave)>> <br> <<= App.SlaveAssignment.devotion(_slave)>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnJob(_slave)>> <<set _milkResults = App.SlaveAssignment.getMilked(_slave)>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules(_slave)>> <<run App.SlaveAssignment.diet(_slave)>> <<run App.SlaveAssignment.longTermEffects(_slave)>> <<run App.SlaveAssignment.drugs(_slave)>> <<run App.SlaveAssignment.relationships(_slave)>> <<run App.SlaveAssignment.rivalries(_slave)>> <<run App.SlaveAssignment.devotion(_slave)>> - <</silently>> <</if>> <<set _milkWeek += _milkResults.milk, _cumWeek += _milkResults.cum>> diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw index b840e0372b1..95d64be55e6 100644 --- a/src/uncategorized/fullReport.tw +++ b/src/uncategorized/fullReport.tw @@ -61,17 +61,15 @@ <</if>> <<if $showEWD == 0>> - <<silently>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules($slaves[$i])>> <<run App.SlaveAssignment.choosesOwnClothes($slaves[$i])>> <<run App.SlaveAssignment.diet($slaves[$i])>> <<run App.SlaveAssignment.longTermEffects($slaves[$i])>> <<run App.SlaveAssignment.drugs($slaves[$i])>> <<run App.SlaveAssignment.relationships($slaves[$i])>> <<run App.SlaveAssignment.rivalries($slaves[$i])>> - <</silently>> <<else>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules($slaves[$i])>> <<= App.SlaveAssignment.choosesOwnClothes($slaves[$i])>> <<= App.SlaveAssignment.diet($slaves[$i])>> <<includeDOM App.SlaveAssignment.longTermEffects($slaves[$i])>> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index 3090acf5a33..48f53186004 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -1031,19 +1031,17 @@ <</if>> <<if $showEWD == 0>> - <<silently>> /*<<run App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>*/ - <<include "SA rules">> + <<run App.SlaveAssignment.rules($slaves[$i])>> <<run App.SlaveAssignment.diet($slaves[$i])>> <<run App.SlaveAssignment.longTermEffects($slaves[$i])>> <<run App.SlaveAssignment.drugs($slaves[$i])>> <<run App.SlaveAssignment.relationships($slaves[$i])>> <<run App.SlaveAssignment.rivalries($slaves[$i])>> <<run App.SlaveAssignment.devotion($slaves[$i])>> - <</silently>> <<else>> /*<<= App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>*/ - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules($slaves[$i])>> <<= App.SlaveAssignment.diet($slaves[$i])>> <<includeDOM App.SlaveAssignment.longTermEffects($slaves[$i])>> <<= App.SlaveAssignment.drugs($slaves[$i])>> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index 19d64cce398..0ea1ed2eaae 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -233,7 +233,7 @@ <br> <<= App.SlaveAssignment.choosesOwnClothes(_S.Attendant)>> <<run tired(_S.Attendant)>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_S.Attendant)>> <<= App.SlaveAssignment.diet(_S.Attendant)>> <<includeDOM App.SlaveAssignment.longTermEffects(_S.Attendant)>> <<= App.SlaveAssignment.drugs(_S.Attendant)>> @@ -241,17 +241,15 @@ <<= App.SlaveAssignment.rivalries(_S.Attendant)>> <br> <<= App.SlaveAssignment.devotion(_S.Attendant)>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnClothes(_S.Attendant)>> <<run tired(_S.Attendant)>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules()>> <<run App.SlaveAssignment.diet(_S.Attendant)>> <<run App.SlaveAssignment.longTermEffects(_S.Attendant)>> <<run App.SlaveAssignment.drugs(_S.Attendant)>> <<run App.SlaveAssignment.relationships(_S.Attendant)>> <<run App.SlaveAssignment.rivalries(_S.Attendant)>> <<run App.SlaveAssignment.devotion(_S.Attendant)>> - <</silently>> <</if>> <</if>> @@ -342,7 +340,7 @@ <</if>> <br> <<= App.SlaveAssignment.choosesOwnClothes(_slave)>> - <<include "SA rules">> + <<includeDOM App.SlaveAssignment.rules(_slave)>> <<= App.SlaveAssignment.diet(_slave)>> <<includeDOM App.SlaveAssignment.longTermEffects(_slave)>> <<= App.SlaveAssignment.drugs(_slave)>> @@ -350,18 +348,16 @@ <<= App.SlaveAssignment.rivalries(_slave)>> <br> <<= App.SlaveAssignment.devotion(_slave)>> <<else>> - <<silently>> <<run App.SlaveAssignment.choosesOwnJob(_slave)>> <<run App.SlaveAssignment.choosesOwnClothes(_slave)>> <<run App.SlaveAssignment.rest(_slave)>> - <<include "SA rules">> + <<run App.SlaveAssignment.rules(_slave)>> <<run App.SlaveAssignment.diet(_slave)>> <<run App.SlaveAssignment.longTermEffects(_slave)>> <<run App.SlaveAssignment.drugs(_slave)>> <<run App.SlaveAssignment.relationships(_slave)>> <<run App.SlaveAssignment.rivalries(_slave)>> <<run App.SlaveAssignment.devotion(_slave)>> - <</silently>> <</if>> <</for>> <<if (_restedSlaves > 0)>> -- GitLab