diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index d1c468aadca30e0b1d1206b660f5691caff54e1d..09f11edf727f0dca34900f291d0c52d2476e2e3a 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -16,22 +16,25 @@
<<if $activeSlave.pregSource > 0>>
- <<set _daddy = "partner">>
- <<for _lsd = 0; _lsd < $slaves.length; _lsd++>>
- <<if $activeSlave.pregSource == $slaves[_lsd].ID>>
+ <<set _lsd = $slaves.findIndex(function(s) { return s.ID == $activeSlave.pregSource; })>>
+ <<if _lsd != -1>>
+ <<switch $slaves[_lsd].nationality>>
+ <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
+ <<if $slaves[_lsd].slaveSurname>><<set _daddy = $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveName>><<else>><<set _daddy = $slaves[_lsd].slaveName>><</if>>
+ <<default>>
<<set _daddy = $slaves[_lsd].slaveName>>
- <<break>>
- <</if>>
- <</for>>
+ <<if $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveSurname>><</if>>
+ <</switch>>
+ <<else>>
+ <<set _daddy = "partner">>
+ <</if>>
<</if>>
-<<switch $activeSlave.nationality>>
-<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
- ''@@.pink;<<if $activeSlave.slaveSurname>>$activeSlave.slaveSurname <</if>>$activeSlave.slaveName@@''
-<<default>>
- ''@@.pink;$activeSlave.slaveName<<if $activeSlave.slaveSurname>> $activeSlave.slaveSurname<</if>>@@''
-<</switch>>
+
+
+''@@.pink;<<SlaveFullName $activeSlave>>@@''
+
<<if ($activeSlave.customLabel != "")>> (@@.yellow;''<<print $activeSlave.customLabel>>''@@)<</if>>
<<if $ui == "start">>
@@ -1704,7 +1707,7 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
- <<if (Math.abs($activeSlave.weight) <= 30)>>
+ <<if (Math.abs($activeSlave.weight) <= 30) && $arcologies[0].FSHedonisticDecadence == "unset">>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<<set _genderLawDesc = 1>>
<<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $activeSlave.muscles <= 30>>
@@ -1725,19 +1728,33 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<<set _genderLawDesc = 0>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $activeSlave.weight <= 130 && $activeSlave.weight > -30>>
+ <<if _genderLawDesc == 1>>
+ <<if $arcologies[0].FSAssetExpansionist != "unset">>
+ <<if $activeSlave.boobs >= 500 && $activeSlave.boobs <= 1600 && $activeSlave.butt >= 3 && $activeSlave.butt <= 6>>
+ <<set _genderLawDesc = 1>>
+ <<else>>
+ <<set _genderLawDesc = 0>>
+ <</if>>
+ <<elseif $activeSlave.boobs >= 500 && $activeSlave.boobs <= 800 && $activeSlave.butt >= 3 && $activeSlave.butt <= 4>>
+ <<set _genderLawDesc = 1>>
+ <<else>>
+ <<set _genderLawDesc = 0>>
+ <</if>>
+ <</if>>
<<else>>
<<set _genderLawDesc = 0>>
<</if>>
<<if _genderLawDesc == 1>>
$possessiveCap body is a perfect example of the fashionable feminine ideal.
<</if>>
-<</if>>
-
-<<if $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
- <<if ($activeSlave.boobs <= 300) && ($activeSlave.butt <= 1) && ($activeSlave.weight <= 10) && ($activeSlave.waist <= 10)>>
- <<if $arcologies[0].FSPhysicalIdealist != "unset">>
+<<elseif $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
+ <<if ($activeSlave.boobs < 300) && ($activeSlave.butt <= 1) && ($activeSlave.waist <= 10)>>
+ <<if $arcologies[0].FSPhysicalIdealist != "unset" && ($activeSlave.weight <= 10)>>
<<set _slimDesc = 1>>
- <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $activeSlave.muscles <= 30>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $activeSlaveweight <= 30 && $activeSlave.muscles <= 30>>
+ <<set _slimDesc = 1>>
+ <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadence == "unset" && $activeSlave.muscles <= 30 && ($activeSlave.weight <= 10)>>
<<set _slimDesc = 1>>
<<else>>
<<set _slimDesc = 0>>
@@ -1746,18 +1763,14 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
$possessiveCap body is a perfect example of the fashionable ideal flat body.
<</if>>
<</if>>
+<<elseif $arcologies[0].FSHedonisticDecadenceLaw2 == 1>>
+ <<if ($activeSlave.boobs >= 2000) && ($activeSlave.butt >= 5) && ($activeSlave.weight > 95)>>
+ $possessiveCap body is a perfect example of the fashionable plump body.
+ <</if>>
<</if>>
-<<if $arcologies[0].FSRestartSMR > 0 && $arcologies[0].FSRestart > 80>>
-<<if ($activeSlave.dick == 0)>>
-<<if ($activeSlave.balls == 0)>>
-<<if ($activeSlave.ovaries == 0)>>
-<<if ($activeSlave.vagina < 0)>>
- $possessiveCap body is a perfect example of a subhuman who has accepted their place in society.
-<</if>>
-<</if>>
-<</if>>
-<</if>>
+<<if $arcologies[0].FSRestartSMR > 0 && $arcologies[0].FSRestart > 80 && ($activeSlave.dick == 0) && ($activeSlave.balls == 0) && ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0)>>
+ $possessiveCap body is a perfect example of a subhuman who has accepted their place in society.
<</if>>
<<if ($showScores != 0)>>
@@ -1902,12 +1915,42 @@ $pronounCap has
<</if>>
<</if>>
-<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSSlimnessEnthusiastLaw > 0>>
-<<if $activeSlave.weight > 30>>
- $pronounCap is much too fat for the fashionable feminine ideal.
-<<elseif $activeSlave.weight < -30 && $arcologies[0].FSSlimnessEnthusiastLaw == 0>>
- $pronounCap is too skinny for the fashionable feminine ideal.
-<</if>>
+<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
+ <<if $arcologies[0].FSHedonisticDecadence == "unset">>
+ <<if $activeSlave.weight > 130>>
+ $pronounCap is much too fat for the fashionable feminine ideal.
+ <<elseif $activeSlave.weight > 30>>
+ $pronounCap is too fat for the fashionable feminine ideal.
+ <<elseif $activeSlave.weight < -30>>
+ $pronounCap is too skinny for the fashionable feminine ideal.
+ <</if>>
+ <<else>>
+ <<if $activeSlave.weight > 130>>
+ $pronounCap is much too fat for the fashionable feminine ideal.
+ <<elseif $activeSlave.weight < -30>>
+ $pronounCap is too skinny for the fashionable feminine ideal.
+ <</if>>
+ <</if>>
+<<elseif $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
+ <<if $arcologies[0].FSHedonisticDecadence == "unset">>
+ <<if $activeSlave.weight > 30>>
+ $pronounCap is much too fat for the fashionable feminine ideal.
+ <<elseif $activeSlave.weight > 10>>
+ $pronounCap is too fat for the fashionable feminine ideal.
+ <</if>>
+ <<else>>
+ <<if $activeSlave.weight > 60>>
+ $pronounCap is much too fat for the fashionable feminine ideal.
+ <<elseif $activeSlave.weight > 30>>
+ $pronounCap is too fat for the fashionable feminine ideal.
+ <</if>>
+ <</if>>
+<<elseif $arcologies[0].FSHedonisticDecadenceLaw2 == 1>>
+ <<if $activeSlave.weight <= 95>>
+ $pronounCap is too thin for the fashionable feminine ideal.
+ <<elseif $activeSlave.weight <= 10>>
+ $pronounCap is much too thin for the fashionable feminine ideal.
+ <</if>>
<</if>>
<<if $activeSlave.heightImplant > 0>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 5819a20c39147f0042dcee9ca07ec5f75f8bc69e..f5e30075167bc5a43e3734b51e813940e69eeba5 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -65,11 +65,11 @@
<<if $PC.engineering >= 100>>
//You are a master arcology engineer.//
<<else>>
- <<if $PC.slaving > 60>>
+ <<if $PC.engineering > 60>>
//You are an expert arcology engineer.//
- <<elseif $PC.slaving > 30>>
+ <<elseif $PC.engineering > 30>>
//You have some skill as an arcology engineer.//
- <<elseif $PC.slaving > 10>>
+ <<elseif $PC.engineering > 10>>
//You have basic knowledge as an arcology engineer.//
<</if>>
<<if $personalAttention == "engineering">>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 6dabaff2e02096b7d1a13487f296c8bb1acec715..deea88d12110ffba2077c9b6e3df55cfdc711ca7 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -686,17 +686,116 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<</if>>
<</if>>
<</if>>
-
-<<if ($slaves[$i].boobs < 500) && ($slaves[$i].butt < 3) && ($slaves[$i].weight <= 10) && ($slaves[$i].muscles <= 30)>>
- <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
+<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
+ <<if (Math.abs($slaves[$i].weight) <= 30) && $arcologies[0].FSHedonisticDecadence == "unset">>
+ <<if $arcologies[0].FSPhysicalIdealist != "unset">>
+ <<set _genderLawDesc = 1>>
+ <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $slaves[$i].muscles <= 30>>
+ <<set _genderLawDesc = 1>>
+ <</if>>
+ <<if _genderLawDesc == 1>>
+ <<if $arcologies[0].FSAssetExpansionist != "unset">>
+ <<if $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 1600 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 6>>
+ The public enjoys her fashionably feminine body.
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <</if>>
+ <<elseif $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 800 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 4>>
+ The public enjoys her sleek, girlish figure.
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $slaves[$i].weight <= 130 && $slaves[$i].weight > -30>>
+ <<if _genderLawDesc == 1>>
+ <<if $arcologies[0].FSAssetExpansionist != "unset">>
+ <<if $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 1600 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 6>>
+ She makes extra ¤ due to her fashionably feminine body.
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <</if>>
+ <<elseif $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 800 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 4>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+<<elseif $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
+ <<if ($slaves[$i].boobs < 300) && ($slaves[$i].butt <= 1) && ($slaves[$i].waist <= 10)>>
+ <<if $arcologies[0].FSPhysicalIdealist != "unset" && ($slaves[$i].weight <= 10)>>
+ <<set _slimDesc = 1>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $slaves[$i].weight <= 30 && $slaves[$i].muscles <= 30>>
+ <<set _slimDesc = 1>>
+ <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadence == "unset" && $slaves[$i].muscles <= 30 && ($slaves[$i].weight <= 10)>>
+ <<set _slimDesc = 1>>
+ <</if>>
+ <<if _slimDesc == 1>>
+ The public enjoys her fashionably sleek little body.
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
+<<elseif $arcologies[0].FSHedonisticDecadenceLaw2 == 1>>
+ <<if ($slaves[$i].boobs >= 2000) && ($slaves[$i].butt >= 5) && ($slaves[$i].weight > 95)>>
+ The public enjoys her fashionably plump body.
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her feminine image, so she does even better.
+ <</if>>
+ <</if>>
<</if>>
- The public enjoys her fashionably sleek little body.
- <<else>>
- The public enjoys her sleek, girlish figure.
+<<else>>
+ <<if ($slaves[$i].boobs < 500) && ($slaves[$i].butt < 3)>>
+ <<if ($slaves[$i].muscles <= 30) && $arcologies[0].FSPhysicalIdealist == "unset" && ($slaves[$i].weight <= 10) && $arcologies[0].FSHedonisticDecadence == "unset">>
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ The public enjoys her fashionably sleek little body.
+ <<else>>
+ The public enjoys her sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <<elseif $arcologies[0].FSPhysicalIdealist != "unset" && ($slaves[$i].weight <= 10)>> /* no muscle malus for muscle loving societies */
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ The public enjoys her fashionably sleek little body.
+ <<else>>
+ The public enjoys her sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && ($slaves[$i].weight <= 30) && ($slaves[$i].muscles <= 30)>> /* reduced weight malus for fat loving societies */
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ The public enjoys her fashionably sleek little body.
+ <<else>>
+ The public enjoys her sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 9712cbe844db433c26b88d2fe752824976e405b7..ceaaf642149278bdd0e02d29e476c2a0865a1802 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -622,7 +622,7 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
- <<if (Math.abs($slaves[$i].weight) <= 30)>>
+ <<if (Math.abs($slaves[$i].weight) <= 30) && $arcologies[0].FSHedonisticDecadence == "unset">>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<<set _genderLawDesc = 1>>
<<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $slaves[$i].muscles <= 30>>
@@ -647,12 +647,34 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
<</if>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $slaves[$i].weight <= 130 && $slaves[$i].weight > -30>>
+ <<if _genderLawDesc == 1>>
+ <<if $arcologies[0].FSAssetExpansionist != "unset">>
+ <<if $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 1600 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 6>>
+ She makes extra ¤ due to her fashionably feminine body.
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <</if>>
+ <<elseif $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 800 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 4>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<elseif $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
- <<if ($slaves[$i].boobs <= 300) && ($slaves[$i].butt <= 1) && ($slaves[$i].weight <= 10) && ($slaves[$i].waist <= 10)>>
- <<if $arcologies[0].FSPhysicalIdealist != "unset">>
+ <<if ($slaves[$i].boobs < 300) && ($slaves[$i].butt <= 1) && ($slaves[$i].waist <= 10)>>
+ <<if $arcologies[0].FSPhysicalIdealist != "unset" && ($slaves[$i].weight <= 10)>>
<<set _slimDesc = 1>>
- <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $slaves[$i].muscles <= 30>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $slaves[$i].weight <= 30 && $slaves[$i].muscles <= 30>>
+ <<set _slimDesc = 1>>
+ <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadence == "unset" && $slaves[$i].muscles <= 30 && ($slaves[$i].weight <= 10)>>
<<set _slimDesc = 1>>
<</if>>
<<if _slimDesc == 1>>
@@ -674,16 +696,40 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
<</if>>
<</if>>
<<else>>
- <<if ($slaves[$i].boobs < 500) && ($slaves[$i].butt < 3) && ($slaves[$i].weight <= 10) && ($slaves[$i].muscles <= 30)>>
- <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
- She makes extra ¤ due to her fashionably sleek little body.
+ <<if ($slaves[$i].boobs < 500) && ($slaves[$i].butt < 3)>>
+ <<if ($slaves[$i].muscles <= 30) && $arcologies[0].FSPhysicalIdealist == "unset" && ($slaves[$i].weight <= 10) && $arcologies[0].FSHedonisticDecadence == "unset">>
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ She makes extra ¤ due to her fashionably sleek little body.
+ <<else>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <<elseif $arcologies[0].FSPhysicalIdealist != "unset" && ($slaves[$i].weight <= 10)>> /* no muscle malus for muscle loving societies */
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ She makes extra ¤ due to her fashionably sleek little body.
+ <<else>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i])>>
+ <<if $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <</if>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && ($slaves[$i].weight <= 30) && ($slaves[$i].muscles <= 30)>> /* reduced weight malus for fat loving societies */
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ She makes extra ¤ due to her fashionably sleek little body.
+ <<else>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <</if>>
<<if canTalk($slaves[$i])>>
<<if $slaves[$i].voice > 2>>
Her high voice contributes to her girlish image, so she does even better.
<</if>>
<</if>>
- <<else>>
- She receives extra ¤ for having a sleek, girlish figure.
<</if>>
<</if>>
<</if>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 58a72b8ca07af4d7c5fd93f9ac44730e6fe87d3a..6a9bd009e5e99a88658825b425f4fac7f2d241c7 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -880,7 +880,7 @@
<<set _genderLawPass = 0>>
<</if>>
<</if>>
- <<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $args[0].weight <= 130 && $args[0].weight > -30>>
<<if _genderLawPass == 1>>
<<if $arcologies[0].FSAssetExpansionist != "unset">>
<<if $args[0].boobs >= 500 && $args[0].boobs <= 1600 && $args[0].butt >= 3 && $args[0].butt <= 6>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index a5557035b3e214637d7e465600ba3abcf9068631..4d04ee7b84b350b2fe8318033076032f6f120d17 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2548,10 +2548,9 @@ Call as <<SlaveSort [$slaves]>>
$args[0]: Slave.
*/
<<widget "EventNameLink">>
- <<switch $activeSlave.nationality>>
+ <<switch $args[0].nationality>>
<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
- <<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><</if>>
- <<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>>
+ <<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>>
<<default>>
<<set _name = $args[0].slaveName>>
<<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>>