diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index b6997f80e68e10dc59c84a7449e077dfab9c1cf2..8215f2aa0921a71bb049ebba8be4484ec6b2bc8a 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -189,12 +189,6 @@ She would love to play off of $slaves[$i].slaveName's fame and fertility, but unfortunately she <<if $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 1500>>is already pregnant and not far enough along to show it<<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 5000>>already pregnant, but not enough to be exciting<<else>>is unable to get knocked up<</if>>. <</if>> <</if>> - - <<if setup.whoreCareers.includes($slaves[$i].career)>> - She has sex work experience from her life before she was a slave, making her more effective. - <<elseif $slaves[$i].skillS >= $masteredXP>> - "She has experience as a prostitute from working for you, making her more effective." - <</if>> <</for>> <<set _oldCash = $cash>> @@ -339,7 +333,7 @@ <<if $slaves[$i].energy > 40 && $slaves[$i].energy < 95>> <<set $slaves[$i].energy++>> <</if>> - + <<if $showEWD != 0>> <br><br> /* 000-250-006 */ @@ -493,9 +487,9 @@ <br><br> <<if $brothelAdsSpending != 0>> An ad campaign is supporting business there, and whores that match it make more ¤. - + <br> - + <<if $brothelAdsStacked == 1>> Its advertisements feature stacked girls. <<set _ads = 1>> @@ -552,7 +546,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The <<if _girls == 1>>stacked <<elseif _girls == -1>>slim <</if>>girls in the brothel match most customers' preferences for <<if _pref == 1>>stacked <<elseif _pref == -1>>slim <</if>>girls. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -562,7 +556,7 @@ <</if>> <br> <</if>> - + <<if ($brothelAdsSpending > 0)>> <<if $brothelAdsPreg == 1>> Its advertisements feature girls that have firm, rounded bellies. @@ -620,7 +614,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The <<if _girls == 1>>big-bellied <<elseif _girls == -1>>flat-bellied <</if>>girls in the brothel match most customers' preferences for <<if _pref == 1>>big-bellied <<elseif _pref == -1>>flat-bellied <</if>>girls. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -630,7 +624,7 @@ <</if>> <br> <</if>> - + <<if ($brothelAdsSpending > 0)>> <<if $brothelAdsModded == 1>> Its advertisements feature girls that are heavily pierced and tattooed. @@ -688,7 +682,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The <<if _girls == 1>>heavily modded <<elseif _girls == -1>>natural bodied <</if>>girls in the brothel match most customers' preferences for <<if _pref == 1>>heavily modded <<elseif _pref == -1>>natural unmodded <</if>>girls. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -698,7 +692,7 @@ <</if>> <br> <</if>> - + <<if ($brothelAdsSpending > 0)>> <<if ($brothelAdsImplanted == 1)>> Its advertisements feature girls that are augmented by implants or improved surgically. @@ -756,7 +750,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The <<if _girls == 1>>implanted or surgically improved <<elseif _girls == -1>>naturally pure <</if>>girls in the brothel match most customers' preferences for <<if _pref == 1>>implanted or surgically improved <<elseif _pref == -1>>natural unmodded <</if>>girls. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -766,7 +760,7 @@ <</if>> <br> <</if>> - + <<if $seeDicks != 0>> <<if ($brothelAdsSpending > 0)>> <<if ($brothelAdsXX == 1)>> @@ -823,7 +817,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The girls in the brothel match most customers preferences for girls <<if _girls == 1>>with female genitalia <<elseif _girls == -1>>with male genitalia <</if>>. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -834,7 +828,7 @@ <br> <</if>> <</if>> - + <<if ($brothelAdsSpending > 0)>> <<switch ($brothelAdsOld)>> <<case 1>> @@ -854,7 +848,7 @@ <<set _ads = 0>> <</switch>> <</if>> - + <<if ($arcologies[0].FSMaturityPreferentialist != "unset") && ($arcologies[0].FSMaturityPreferentialist >= 80)>> Most customers prefer mature girls. <<set _pref = 1>> @@ -900,7 +894,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The girls in the brothel match most customers' age preferences. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 901aea4a6073e91438adab55cee7e93364dde3e1..ee3e74b1db6561b022f1be9dcee7a7175660fd6a 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -229,7 +229,7 @@ <<if $slaves[$i].livingRules != "normal">> <<set $slaves[$i].livingRules = "normal">> <</if>> - + <<if $showEWD != 0>> <br><br> /* 000-250-006 */ @@ -300,20 +300,14 @@ <<elseif isNotPreg($slaves[$i])>> <<set _pregNo += 1>> <</if>> - - <<if setup.entertainmentCareers.includes($slaves[$i].career)>> - She has experience with entertainment from her life before she was a slave, making her more effective. - <<elseif $slaves[$i].skillS >= $masteredXP>> - "She has learned to be entertaining from working for you, making her more effective." - <</if>> <</for>> <br><br> <<if $clubAdsSpending != 0>> An ad campaign is getting citizens into the club every night, and sluts that match it gratify patrons. - + <br> - + <<if $clubAdsStacked == 1>> Its advertisements feature stacked girls. <<set _ads = 1>> @@ -371,7 +365,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The <<if _girls == 1>>stacked <<elseif _girls == -1>>slim <</if>>girls in the club match most customers' preferences for <<if _pref == 1>>stacked <<elseif _pref == -1>>slim <</if>>girls. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -439,7 +433,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The <<if _girls == 1>>heavily modded <<elseif _girls == -1>>natural bodied <</if>>girls in the club match most customers' preferences for <<if _pref == 1>>heavily modded <<elseif _pref == -1>>natural unmodded <</if>>girls. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -507,7 +501,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The <<if _girls == 1>>implanted or surgically improved <<elseif _girls == -1>>naturally pure <</if>>girls in the club match most customers' preferences for <<if _pref == 1>>implanted or surgically improved <<elseif _pref == -1>>natural unmodded <</if>>girls. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -574,7 +568,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The girls in the club match most customers preferences for girls <<if _girls == 1>>with female genitalia <<elseif _girls == -1>>with male genitalia <</if>>. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -650,7 +644,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The girls in the club match most customers' age preferences. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> @@ -718,7 +712,7 @@ <<set $rep -= random(_minBonus,_maxBonus)>> <</if>> <br> - <<else>> + <<else>> <<if (_girls == _pref)>> The <<if _girls == 1>>big-bellied <<elseif _girls == -1>>flat-bellied <</if>>girls in the club match most customers' preferences for <<if _pref == 1>>big-bellied <<elseif _pref == -1>>flat-bellied <</if>>girls. Your @@.green;reputation@@ increased slightly as a result. <<set $rep += random(_minBonus,_maxBonus)>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index a4f43f5f4e60c0fa5472e4380be5d914a885f9b6..4f2d9bb1c078a76efd49a3b47c024b4ad74c454c 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1333,13 +1333,13 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <<if ($activeSlave.skillWA >= $masteredXP)>> <<set _careers.push("Wardeness")>> <</if>> -<<if ($activeSlave.skillE>= $masteredXP)>> +<<if ($activeSlave.skillE >= $masteredXP)>> <<set _careers.push("Entertainer")>> <</if>> -<<if ($activeSlave.skillW>= $masteredXP)>> +<<if ($activeSlave.skillW >= $masteredXP)>> <<set _careers.push("Whore")>> <</if>> -<<if ($activeSlave.skillS>= $masteredXP)>> +<<if ($activeSlave.skillS >= $masteredXP)>> <<set _careers.push("Servant")>> <</if>> <<if _careers.length > 0>> diff --git a/src/uncategorized/saServant.tw b/src/uncategorized/saServant.tw index 41cbfefcf465843a338f07d8bac397e939dc438b..43aab2764b9d15ab3b895e6223a11952e440d9ae 100644 --- a/src/uncategorized/saServant.tw +++ b/src/uncategorized/saServant.tw @@ -72,3 +72,8 @@ works as a servant. $pronounCap performs the lowest jobs in your penthouse, clea <<if !setup.servantCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> <</if>> +<<if setup.servantCareers.includes($slaves[$i].career)>> + She has experience with house keeping from her life before she was a slave, making her more effective. +<<elseif $slaves[$i].skillS >= $masteredXP>> + She has experience with house keeping from working for you, making her more effective. +<</if>> diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index fb6e0c476fa990bf13c65e756eae0cb19ffb03cf..023456ee9fc3bdee571c4bf38c98bc92399623d5 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -1804,3 +1804,8 @@ __This week__ _vignette.text <<if !setup.entertainmentCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> <</if>> +<<if setup.entertainmentCareers.includes($slaves[$i].career)>> + She has experience with entertainment from her life before she was a slave, making her more effective. +<<elseif $slaves[$i].skillS >= $masteredXP>> + "She has learned to be entertaining from working for you, making her more effective." +<</if>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index 48dec302b5cd74be6c932a1cf6e5507e2a059ce5..a57b1736f280a9b13cb7451da68f34fcfa8917c2 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -1826,3 +1826,8 @@ __This week__ _vignette.text <<if !setup.whoreCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> <</if>> +<<if setup.whoreCareers.includes($slaves[$i].career)>> + She has sex work experience from her life before she was a slave, making her more effective. +<<elseif $slaves[$i].skillS >= $masteredXP>> + "She has experience as a prostitute from working for you, making her more effective." +<</if>> diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw index 6807d65bf9a9fbec2091026556e2f49ae0439405..cd6a317ee72a3954ccdfa3a920761697ce292e23 100644 --- a/src/uncategorized/sellSlave.tw +++ b/src/uncategorized/sellSlave.tw @@ -288,13 +288,13 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual <<if ($activeSlave.skillWA >= $masteredXP)>> <<set _careers.push("Wardeness")>> <</if>> -<<if ($activeSlave.skillE>= $masteredXP)>> +<<if ($activeSlave.skillE >= $masteredXP)>> <<set _careers.push("Entertainer")>> <</if>> -<<if ($activeSlave.skillW>= $masteredXP)>> +<<if ($activeSlave.skillW >= $masteredXP)>> <<set _careers.push("Whore")>> <</if>> -<<if ($activeSlave.skillS>= $masteredXP)>> +<<if ($activeSlave.skillS >= $masteredXP)>> <<set _careers.push("Servant")>> <</if>> <<if _careers.length > 0>> diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index 08a3356199eb3cec4eb47b4744ea7d98378fd726..9fb01cbd8719a764a98d363c1cb0d44dec8f31c8 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -259,13 +259,6 @@ <<elseif ($slaves[$i].health < 90)>> <<set $slaves[$i].health += 3>> <</if>> - - <<if setup.servantCareers.includes($slaves[$i].career)>> - She has experience with house keeping from her life before she was a slave, making her more effective. - <<elseif $slaves[$i].skillS >= $masteredXP>> - She has experience with house keeping from working for you, making her more effective. - <</if>> - <<switch $servantsQuartersDecoration>> <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist" "Supremacist" "Subjugationist" "Degradationist" "Arabian Revivalist" "Egyptian Revivalist">> <<set $slaves[$i].livingRules = "spare">>