From ec8fd342a8bf4095df9817283299d7be411b2d4b Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 23 Jun 2017 14:40:38 -0400 Subject: [PATCH] Fixes. --- src/uncategorized/RESS.tw | 2 +- src/uncategorized/masterSuiteReport.tw | 2 +- src/uncategorized/newSlaveIntro.tw | 8 +-- src/uncategorized/saLongTermEffects.tw | 70 ++++++++++----------- src/uncategorized/slaveAssignmentsReport.tw | 10 +++ src/uncategorized/spaReport.tw | 4 +- src/utility/miscWidgets.tw | 4 +- 7 files changed, 55 insertions(+), 45 deletions(-) diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 155a9248e2b..7872e1d95fa 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -313,7 +313,7 @@ Which, incidentally, is what she's doing now. She has standing orders to change <<case "hormone dysfunction">> -<<EventNameLink $activeSlave>> comes to see you. You're busy with other things, so she waits patiently even though she's clearly very unhappy. Told to explain herself, she gestures at her totally flaccid penis<<if canTalk($activeSlave) == false>>.<<elseif ($activeSlave.lips > 70)>> and says through her huge lips, "<<Master>>, ah can't get hard."<<elseif ($activeSlave.lipsPiercing + $activeSlave.tonguePiercing > 2)>>and says through her piercings, "<<Master>>, ah can't get hard."<<else>>and says, "<<Master>>, I can't get it up."<</if>> Ever since the rules have permitted it, $activeSlave.slaveName has been a constant masturbator. If she can help it, she never sucks or gives up her ass without a hand between her legs, pumping away. +<<EventNameLink $activeSlave>> comes to see you. You're busy with other things, so she waits patiently even though she's clearly very unhappy. Told to explain herself, she gestures at her totally flaccid penis<<if canTalk($activeSlave) == false>>.<<elseif ($activeSlave.lips > 70)>> and says through her huge lips, "<<Master>>, ah can't get hard."<<elseif ($activeSlave.lipsPiercing + $activeSlave.tonguePiercing > 2)>> and says through her piercings, "<<Master>>, ah can't get hard."<<else>> and says, "<<Master>>, I can't get it up."<</if>> Ever since the rules have permitted it, $activeSlave.slaveName has been a constant masturbator. If she can help it, she never sucks or gives up her ass without a hand between her legs, pumping away. <br><br> <<if canTalk($activeSlave) == false>>She mimics masturbation and then traces a finger down her cheek, as though it were a tear.<<elseif ($activeSlave.lips > 70)>>"Ah can't cum like this, <<Master>>."<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>"Ah can't cum like this, <<Master>>."<<else>>"I can't come like this, <<Master>>."<</if>> It makes sense; she's probably never masturbated without a hard dick. She's clearly in desperate need of release, and more than a little sad the hormones she's taking have given her erectile dysfunction. diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw index 86e19a50742..2ad6dd15992 100644 --- a/src/uncategorized/masterSuiteReport.tw +++ b/src/uncategorized/masterSuiteReport.tw @@ -76,7 +76,7 @@ <</if>> <<if ($arcologies[0].FSHedonisticDecadence > 0)>> Society @@.green;approves@@ of the pampering your pregnant harem recieves. This advances the ideal that everyone's desires should be fulfilled. - <<FSChange "HedonisticDecadence" 1>> + <<FSChange "Hedonism" 1>> <</if>> <</if>> <<if _DL > 1>> diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index f183d0cc95a..ceb7a23ae9a 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -1428,12 +1428,12 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active <br> <<link "Make her worship your pregnancy">> <<replace "#introResult">> - You aggressively approach $activeSlave.slaveName, forcing your pregnancy into directly into her <<if $activeSlave.height > 175>>stomach<<elseif $activeSlave.height < 155>>face<<else>>chest<</if>> until she has no choice but be pushed to the ground. Standing over her, staring her down as she peeks around your taut globe of a middle; you order her to worship your pregnancy. + You aggressively approach $activeSlave.slaveName, forcing your pregnancy directly into her <<if $activeSlave.height > 175>>stomach<<elseif $activeSlave.height < 155>>face<<else>>chest<</if>> until she has no choice but to be pushed to the ground. Standing over her, staring her down as she peeks around your firm globe of a middle, you order her to worship your pregnancy. <<if $activeSlave.fetish == "pregnancy">> - She eagerly complies. She begins with sucking your popped navel before running her tongue across the tuat, smooth surface of your pregnancy. Once she has finished with your belly, she lowers herself under it to begin work on your needy pussy. Before long, her overzealous efforts have you quaking in pleasure and awoken your child. Once she finishes you off, she returns to rubbing your belly, soothing your rowdy child and @@.hotpink;solidifying her place@@ beneath you. + She complies eagerly. She begins with sucking your popped navel before running her tongue across the tuat, smooth surface of your pregnancy. Once she has finished with your belly, she lowers herself under it to begin work on your needy pussy. Before long, her overzealous efforts have you quaking in pleasure, rousing your child. Once she finishes you off, she returns to rubbing your belly, soothing your rowdy child and @@.hotpink;solidifying her place@@ beneath you. <<set $activeSlave.devotion += 15>> <<else>> - She shifts her gaze between your middle and your face, not sure what to do. Losing patience, you toss a tube of cream at her. She shakily massages it into your stretched skin, missing spots, much to your pleasure. With reason, you force her onto her back, turn around, and plant your needy cunt directly onto her face. Struggling to breath under your weight, she begins eating you out in desperation. After coaxing her to massage your belly as she does, you quickly climax across her face and gently lift yourself off the coughing girl. She now @@.hotpink;understands her place in life@@ and is @@.gold;terrified@@ about what she will have to do if she wants to survive. + She shifts her gaze between your middle and your face, not sure what to do. Losing patience, you toss a tube of cream at her. She shakily massages it onto your stretched skin, missing spots, much to your pleasure. With reason, you force her onto her back, turn around, and plant your needy cunt directly onto her face. Struggling to breath under your weight, she begins eating you out in desperation. After coaxing her to massage your belly as she does, you quickly climax across her face and gently lift yourself off the coughing girl. She now @@.hotpink;understands her place in life@@ and is @@.gold;terrified@@ about what she will have to do if she wants to survive. <<set $activeSlave.devotion += 5>> <<set $activeSlave.trust -= 5>> <</if>> @@ -1445,7 +1445,7 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active <br> <<link "Let your ample bust dominate her pathetic one">> <<replace "#introResult">> - You quickly strip off your shirt and draw close to $activeSlave.slaveName. You grab her as she attempts to back away and pull her tits directly into your own. Both of sets of eyes lock onto their pair of breasts, or they would have, had yours not utterly eclipsed their rival. Scoffing, you release the confused girl and walk away; leaving her feeling her own breasts and feeling uncertain about herself. She gets caught up in how small they really are, and how much @@.hotpink;lesser@@ than her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title isnot 0>>Master<<else>>Mistress<</if>> she is. + You quickly strip off your shirt and draw close to $activeSlave.slaveName. You grab her as she attempts to back away and pull her tits directly into your own. Both of sets of eyes lock onto their pair of breasts, or they would have, had yours not utterly eclipsed their rival. Scoffing, you release the confused girl and walk away; leaving her cupping her own breasts and feeling uncertain about herself. She gets caught up in how small they really are, and how much @@.hotpink;lesser@@ than her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title isnot 0>>Master<<else>>Mistress<</if>> she is. <<if $activeSlave.fetish == "boobs">> <<if $activeSlave.fetishKnown == 0>> You did note one thing when your breasts touched, her nipples got very hard. @@.green;Looks like she's a breast fetishist!@@ diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index a77717e04e8..59a68e2e6c9 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -2505,7 +2505,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2518,7 +2518,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2531,7 +2531,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif $slaves[$i].inflation != 0 && $slaves[$i].inflationType == "cum">> In addition to being an orally fixated cumslut, she is required to keep her belly bloated with cum at all times, making her life revolve around being full of cum. @@.yellow;She's become psychologically addicted to cum.@@ @@ -2539,7 +2539,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif $cockFeeder != 0>> In addition to being an orally fixated cumslut, she eats by sucking dick. @@.yellow;She's become psychologically addicted to cum.@@ @@ -2547,7 +2547,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2559,7 +2559,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2574,7 +2574,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif $slaves[$i].vaginalAccessory == "chastity belt">> She has a powerful sex drive, and since her pussy's off limits, she sinks ever deeper into her identity as a helpless anal slut. @@.yellow;She's become psychologically addicted to getting assfucked.@@ @@ -2582,7 +2582,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2596,7 +2596,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2609,7 +2609,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2621,7 +2621,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2634,7 +2634,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif $slaves[$i].drugs == "hyper breast injections">> She loves her tits, and watching them steadily swell from the hyper injections starts to hold more fascination for her than mere sex. @@.yellow;Her sexual identity is now dominated by her swelling boobs.@@ @@ -2642,7 +2642,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif ($slaves[$i].hormones > 0) && ($slaves[$i].boobs < 1000)>> She loves her tits, and feeling them grow under female hormone treatments starts to hold more fascination for her than mere sex. @@.yellow;Her sexual identity is now dominated by her swelling boobs.@@ @@ -2650,7 +2650,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2662,7 +2662,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2676,7 +2676,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2689,7 +2689,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2704,7 +2704,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2718,7 +2718,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2731,7 +2731,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif ($slaves[$i].assignment == "work in the dairy") && ($dairyRestraintsSetting >= 2)>> Strapped into a milking machine's tender, penetrative embrace, her masochistic tendencies darken into sexual appreciation for her life as a human factory. @@.yellow;She's descended into true self hatred.@@ @@ -2739,7 +2739,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2751,7 +2751,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2764,7 +2764,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif $slaves[$i].preg > 10 && $slaves[$i].pregSource == -1 && $slaves[$i].breedingMark == 1 && $slaves[$i].devotion > 75>> She's been marked to be the bearer of your offspring and is growing larger by the day with your child. She is to be nothing more than a vessel for your children, and as such @@.yellow;has become obsessed with carrying them.@@ @@ -2772,7 +2772,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif $slaves[$i].pregType >= 10 && $slaves[$i].preg > 20>> She's so overfull with life that she starts to pay much more sexual attention to pregnancy than to impregnation. @@.yellow;She's become obsessed with breeding.@@ @@ -2780,7 +2780,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif $slaves[$i].births > 10>> She's been bred so much that she starts to pay as much sexual attention to pregnancy as to impregnation. @@.yellow;She's become obsessed with breeding.@@ @@ -2788,7 +2788,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <<elseif ($slaves[$i].assignment == "work in the dairy") && ($dairyPregSetting >= 2) && ($slaves[$i].preg > 0)>> With her womanhood fucked full of cum and fertility drugs, her pregnancy fetish deepens into true perversity. @@.yellow;She's become obsessed with breeding.@@ @@ -2796,7 +2796,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -2808,7 +2808,7 @@ <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <</if>> @@ -4700,28 +4700,28 @@ <<elseif $arcologies[0].FSHedonisticDecadence != "unset">> <<if ($slaves[$i].weight > 160)>> Society @@.green;strongly approves@@ of $slaves[$i].slaveName's glorious rolls; everyone wants to own a pillowy slave like $object. - <<FSChangePorn "HedonisticDecadence" 3>> + <<FSChangePorn "Hedonism" 3>> <<elseif ($slaves[$i].weight > 95)>> Society @@.green;approves@@ of $slaves[$i].slaveName's fat body; it shows just how much luxurious your life must be to pamper a slave as much as $object. - <<FSChangePorn "HedonisticDecadence" 2>> + <<FSChangePorn "Hedonism" 2>> <<elseif ($slaves[$i].weight > 30)>> Society @@.green;approves@@ of $slaves[$i].slaveName's chubby form; the public enjoys the sight of a well rounded slave. - <<FSChangePorn "HedonisticDecadence" 1>> + <<FSChangePorn "Hedonism" 1>> <</if>> <<if ($slaves[$i].muscles < -30)>> Society @@.green;approves@@ of how soft $pronoun is; the sexual advantages of being able to effortlessly overpower $object are not lost on them. - <<FSChangePorn "HedonisticDecadence" 1>> + <<FSChangePorn "Hedonism" 1>> <</if>> <<if ($slaves[$i].fetishStrength > 95)>> Society @@.green;approves@@ of $possessive intense fetish; the expectation that everyone's deepest desires should be fulfilled grows. - <<FSChangePorn "HedonisticDecadence" 1>> + <<FSChangePorn "Hedonism" 1>> <</if>> <<if (_para > 0)>> Society @@.green;is pleased@@ that $pronoun is allowed to fully indulge $possessive paraphilia. - <<FSChangePorn "HedonisticDecadence" 1>> + <<FSChangePorn "Hedonism" 1>> <<elseif (_para < 0)>> Society @@.green;frowns@@ upon $object not being allowed to indulge in $possessive paraphilia. - <<FSChangePorn "HedonisticDecadence" -2>> + <<FSChangePorn "Hedonism" -2>> <</if>> <</if>> diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index 2010302b24e..d1985bd5868 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -266,6 +266,16 @@ <<set $Concubine = $slaves[$i], $fuckSlaves++>> <<case "serve in the master suite" "please you">> <<set $fuckSlaves++>> +<<case "take classes">> + <<if $slaves[$i].fetish == "mindbroken">> + <<removeJob $slaves[$i] "take classes">> + ''__@@.pink;$slaves[$i].slaveName@@__'' is no longer mentally capable and @@.yellow;has been dropped from class.@@ + <</if>> +<<case "learn in the schoolroom">> + <<if $slaves[$i].fetish == "mindbroken">> + <<removeJob $slaves[$i] "learn in the schoolroom">> + ''__@@.pink;$slaves[$i].slaveName@@__'' is no longer mentally capable and @@.yellow;has been dropped from class.@@ + <</if>> <</switch>> <<if $Lurcher>> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index f317783e499..5cf70930375 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -246,7 +246,7 @@ <br> Since she doesn't have enough girls to occupy all her time, the spa takes in citizens' slaves on a contract basis and she helps them too, earning @@.yellowgreen;¤_seed.@@ <<if ($arcologies[0].FSHedonisticDecadence > 0) && (_DL == 0)>> Society @@.green;loves@@ being allowed to lounge in your spa, greatly advancing your laid back culture. - <<FSChange "HedonisticDecadence" 2>> + <<FSChange "Hedonism" 2>> <</if>> <</if>> <<if (_DL > 0)>><br><br><</if>> @@ -256,7 +256,7 @@ ''<<if (_DL > 1)>>There are _DL slaves<<else>>There is one slave<</if>> resting and recuperating in the spa.'' <<if ($arcologies[0].FSHedonisticDecadence > 0) && (_DL == 0)>> Society @@.green;approves@@ of your slaves being pampered this way, greatly advancing your laid back culture. - <<FSChange "HedonisticDecadence" 1>> + <<FSChange "Hedonism" 1>> <</if>> <</if>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index f6f7281badf..bb672678f8d 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -1814,7 +1814,7 @@ Call as <<SlaveSort [$slaves]>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel)>> <<set $arcologies[0].FSRestart += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> -<<case "HedonisticDecadence">> +<<case "Hedonism">> <<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSHedonisticDecadence/$FSLockinLevel)>> <<set $arcologies[0].FSHedonisticDecadence += 0.05*$args[1]*$FSSingleSlaveRep>> @@ -1948,7 +1948,7 @@ Call as <<SlaveSort [$slaves]>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel)>> <<set $arcologies[0].FSRestart += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> -<<case "HedonisticDecadence">> +<<case "Hedonism">> <<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSHedonisticDecadence/$FSLockinLevel)>> <<set $arcologies[0].FSHedonisticDecadence += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> -- GitLab