diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 61064f983d437f1bcb3c20b0528b67e935f06036..76f2b5d4b53d8fc3f034dcbaf36a3d6e235ed91a 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4895,4 +4895,7 @@ Pregmod 0.10.3.0 -fixes 203 - -fxied bad if in saRules \ No newline at end of file + -fxied bad if in saRules + + 204 + -saRules now applies to the clinic \ No newline at end of file diff --git a/devNotes/twine JS b/devNotes/twine JS index f509a5b0d1014899fa1fe39b33ebb7f7189efa43..6f3b6a3c3a67215327e38d6d5c2096f58034b5b8 100644 --- a/devNotes/twine JS +++ b/devNotes/twine JS @@ -2150,6 +2150,16 @@ window.getSlaveCost = function(s) { cost += rulesCost * 2; } else if(s.assignment === Job.CLUB) { cost += rulesCost * 1.5; + } else if(s.assignment === Job.NURSE) { + cost += rulesCost * 2; + } else if(s.assignment === Job.CLINIC) { + if(s.livingRules === LivingRule.LUXURIOUS) { + cost += rulesCost * 2; + } else if(s.livingRules == LivingRule.NORMAL) { + cost += rulesCost * 1.5; + } else { + cost += rulesCost; + } } else { if(s.livingRules === LivingRule.LUXURIOUS) { cost += rulesCost * (s.relationship >= 4 ? 3 : 4); diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw index 769ff3c242f53c1bc80db869c5458ae1cebd8bb3..a4bd7797424a67c7bde0935b169cd419dc558dc6 100644 --- a/src/js/economyJS.tw +++ b/src/js/economyJS.tw @@ -336,6 +336,16 @@ window.getSlaveCost = function(s) { cost += rulesCost * 2; } else if(s.assignment === Job.CLUB) { cost += rulesCost * 1.5; + } else if(s.assignment === Job.NURSE) { + cost += rulesCost * 2; + } else if(s.assignment === Job.CLINIC) { + if(s.livingRules === LivingRule.LUXURIOUS) { + cost += rulesCost * 2; + } else if(s.livingRules == LivingRule.NORMAL) { + cost += rulesCost * 1.5; + } else { + cost += rulesCost; + } } else { if(s.livingRules === LivingRule.LUXURIOUS) { cost += rulesCost * (s.relationship >= 4 ? 3 : 4); diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 9e8c6183565ff156596389872c0ac832db54bfda..fb7db1a822c23b85f2a473f668e22b0b84b87a72 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -29,8 +29,8 @@ <<if $slaves[_FLs].trust < 45>> <<set $slaves[_FLs].trust += 5>> <</if>> - <<if $slaves[_FLs].livingConditions != "luxurious">> - <<set $slaves[_FLs].livingConditions = "luxurious">> + <<if $slaves[_FLs].livingRules != "luxurious">> + <<set $slaves[_FLs].livingRules = "luxurious">> <</if>> <<if $slaves[_FLs].fetishStrength <= 95>> <<if $slaves[_FLs].fetish != "dom">> @@ -275,10 +275,10 @@ /* Perform facility based rule changes */ <<set $slaves[$i].health += _healthBonus, $slaves[$i].aphrodisiacs = _aphrod>> <<switch $brothelDecoration>> - <<case "Chattel Religionist" "Degradationist" "standard">> - <<set $slaves[$i].livingConditions = "spare">> + <<case "Degradationist" "standard">> + <<set $slaves[$i].livingRules = "spare">> <<default>> - <<set $slaves[$i].livingConditions = "normal">> + <<set $slaves[$i].livingRules = "normal">> <</switch>> <<if $showEWD != 0>> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index f88449de2427a26af3f5560743bf28b272a97216..4006db67df3ab7e32858299426b79066c2fd69a9 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -21,6 +21,11 @@ <<if $slaves[_FLs].trust < 60>> <<set $slaves[_FLs].trust++>> <</if>> + + <<if $slaves[_FLs].livingRules != "luxurious">> + <<set $slaves[_FLs].livingRules = "luxurious">> + <</if>> + <<set $slaves[_FLs].devotion += _devBonus>> <<if $slaves[_FLs].fetishStrength <= 95>> <<if $slaves[_FLs].fetish != "dom">> @@ -209,6 +214,7 @@ ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as the clinical nurse. <br> <<include "SA chooses own clothes">> + <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> <<include "SA drugs">> @@ -218,6 +224,7 @@ <<else>> <<silently>> <<include "SA chooses own clothes">> + <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> <<include "SA drugs">> @@ -241,6 +248,16 @@ <<if $slaves[$i].health < 90>> <<set $slaves[$i].health += 10 + ($curativeUpgrade * 10) + _healthBonus>> <</if>> + + <<switch $clinicDecoration>> + <<case "Repopulation Focus" "Eugenics" "Gender Radicalist" "Gender Fundamentalist" "Paternalist" "Maturity Preferentialist" "Youth Preferentialist" "Slimness Enthusiast" "Hedonistic">> + <<set $slaves[$i].livingRules = "luxurious">> + <<case "Roman Revivalist" "Aztec Revivalist" "Egyptian Revivalist" "Arabian Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist">> + <<set $slaves[$i].livingRules = "normal">> + <<default>> + <<set $slaves[$i].livingRules = "spare">> + <</switch>> + <<if ($Nurse != 0) && ($clinicSpeedGestation == 1) && ($slaves[$i].pregKnown == 1)>> <<set $slaves[$i].pregControl = "speed up">> <</if>> @@ -279,6 +296,7 @@ <br> She <<include "SA rest">> <br> <<include "SA chooses own clothes">> + <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> <<include "SA drugs">> @@ -290,6 +308,7 @@ <<include "SA chooses own job">> <<include "SA rest">> <<include "SA chooses own clothes">> + <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> <<include "SA drugs">> diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw index 1e52f72107c6275353aabc25cb83caf5d97703c3..bffe8af52bcca4ea470540d97833dea942f2a19d 100644 --- a/src/uncategorized/costs.tw +++ b/src/uncategorized/costs.tw @@ -108,6 +108,16 @@ <<set $costs += ($rulesCost*2)>> <<elseif ($slaves[$i].assignment == "serve in the club")>> <<set $costs += ($rulesCost*1.5)>> +<<elseif ($slaves[$i].assignment == "be the Nurse")>> + <<set $costs += ($rulesCost*2)>> +<<elseif ($slaves[$i].assignment == "get treatment in the clinic")>> + <<if $slaves[$i].livingRules == "luxurious">> + <<set $costs += ($rulesCost*2)>> + <<elseif $slaves[$i].livingRules == "normal">> + <<set $costs += ($rulesCost*1.5)>> + <<else>> + <<set $costs += $rulesCost>> + <</if>> <<else>> <<if $slaves[$i].livingRules == "luxurious">> <<if $slaves[$i].relationship >= 4>> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 510e84169ba9ff272d0d57189a4673c1bd699bb1..5744d6212e1418393e27d6aa06b4a4ea8be833da 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -232,6 +232,9 @@ <<elseif ($slaves[$i].assignment == "be the DJ")>> <br> Living expenses: ¤<<print ($rulesCost*2)>> <<set $individualCosts += ($rulesCost*2)>> + <<elseif ($slaves[$i].assignment == "be the Nurse")>> + <br> Living expenses: ¤<<print ($rulesCost*2)>> + <<set $individualCosts += ($rulesCost*2)>> <<elseif ($slaves[$i].assignment == "serve in the club")>> <br> Living expenses: ¤<<print ($rulesCost*1.5)>> <<set $individualCosts += ($rulesCost*2)>> @@ -243,7 +246,18 @@ <br> Living expenses: ¤<<print $rulesCost>> <<set $individualCosts += $rulesCost>> <</if>> - + <<set $individualCosts += ($rulesCost*2)>> + <<elseif ($slaves[$i].assignment == "get treatment in the clinic")>> + <<if $slaves[$i].livingRules == "luxurious">> + <br> Living expenses: ¤<<print ($rulesCost*2)>> + <<set $individualCosts += ($rulesCost*2)>> + <<elseif $slaves[$i].livingRules == "normal">> + <br> Living expenses: ¤<<print ($rulesCost*1.5)>> + <<set $individualCosts += ($rulesCost*1.5)>> + <<else>> + <br> Living expenses: ¤<<print $rulesCost>> + <<set $individualCosts += $rulesCost>> + <</if>> <<set $individualCosts += ($rulesCost*2)>> <<else>> <<if $slaves[$i].livingRules == "luxurious">> diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index ccf926246349814412b2d7b13e7a0f9643cdf1fb..42450021194419d3b5efcd4f4f5c8c9d9dd35aee 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -317,7 +317,7 @@ <<if ($slaves[$i].devotion <= 20)>> <<switch $brothelDecoration>> - <<case "Chattel Religionist" "Degradationist" "standard">> + <<case "Degradationist" "standard">> The spare living conditions of $brothelName @@.hotpink;get her used@@ to the routine of <<if ($slaves[$i].trust > 20)>> slavery and @@.gold;keep her aware of her lowly place.@@ @@ -326,12 +326,15 @@ slavery. <</if>> <<set $slaves[$i].devotion += 1>> + <<case "Chattel Religionist">> + The open, yet comfortable, conditions of $brothelName @@.hotpink;get her used@@ to the routine of slavery. + <<set $slaves[$i].devotion += 1>> <<default>> She gets a little room all to herself, allowing her to feel self-reliant; or it would, if it didn't reek of sex and shame after all the customers she serviced in it. <</switch>> <<else>> <<switch $brothelDecoration>> - <<case "Chattel Religionist" "Degradationist" "standard">> + <<case "Degradationist" "standard">> <<if ($slaves[$i].trust > 40)>> The spare living conditions of $brothelName @@.gold;remind her not to get too comfortable@@ with her life. <<set $slaves[$i].trust -= 2>> @@ -339,6 +342,8 @@ The spare living conditions of $brothelName @@.gold;keep her aware of her place.@@ <<set $slaves[$i].trust -= 1>> <</if>> + <<case "Chattel Religionist">> + The open, yet comfortable, conditions of $brothelName's slave quarters are quite refreshing after a day of public sex, even if she has to share it with all the other whores. <<default>> She likes her little room in $brothelName, even if it smells of sex after fucking in it all day. <</switch>> @@ -1074,112 +1079,70 @@ <</switch>> <</if>> <<case "get treatment in the clinic">> + <<if $slaves[$i].relationship > 2>> + <<set _lover = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].relationshipTarget; })>> + <<if !canWalk($slaves[_lover]) || !isSlaveAvailable($slaves[_lover])>> + <<set _lover = 0>> + <</if>> + <<else>> + <<set _lover = 0>> + <</if>> <<if $slaves[$i].devotion < -50>> is so unhappy that she has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>. <<set $slaves[$i].need = 0>> <<elseif $slaves[$i].energy <= 20>> is frigid and has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>. <<set $slaves[$i].need = 0>> - <<else>> - <<if ($slaves[$i].releaseRules == "restrictive")>> - <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> - refuses to call on you for sexual release, and is @@.gold;severely punished@@ for illicit masturbation. - <<set $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion < 50)>> - <<if $slaves[$i].devotion <= 20>> - occasionally calls you to beg for sexual release. - <<else>> - doesn't mind having to call you to beg for sexual release. - <</if>> - <<saRulesPlayerEnergy>> - <<else>> /* $slaves[$i].devotion >= 50 */ - willingly calls and begs you to - <<saRulesPlayerFetishPlay>> - whenever she gets the chance. - <<saRulesPlayerEnergy>> - <</if>> /* closes $slaves[$i].devotion >= 50 */ - <<saRulesPlayerDiscoversFetish>> - <<saRulesPlayerDrugEffects>> - <<elseif ($slaves[$i].releaseRules == "masturbation")>> - <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> - takes solace in her permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing her fear@@ of you. - <<set $slaves[$i].trust += 2, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion <= 20)>> - enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you but @@.mediumorchid;allowing her to remain in control of her sexuality.@@ - <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> - accepts having to relieve herself solely through masturbation. - <<set $slaves[$i].need = 0>> + <<elseif $slaves[$i].relationship == -3>> + You make sure your wife's every sexual need is taken care of during her stay in $clinicName. + <<set $slaves[$i].need = 0>> + <<if $PC.dick == 1 && $slaves[$i].eggType == "human" && canGetPregnant($slaves[$i]) && (($slaves[$i].vagina > 0 && $slaves[$i].ovaries == 1)||($slaves[$i].anus != 0 && $slaves[$i].mpreg == 1))>> + <<KnockMeUp $slaves[$i] 10 0 -1 1>> + <<if ($slaves[$i].vagina > 0 && $slaves[$i].ovaries == 1)>> + <<set $slaves[$i].vaginalCount += 7, $vaginalTotal += 7>> <<else>> - is a little disapointed that she's limited to her hands and toys, but @@.mediumaquamarine;understands you care about her current health.@@ - <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>> + <<set $slaves[$i].analCount += 7, $analTotal += 7>> <</if>> - <<if $slaves[$i].devotion > 20>> - When she does play with herself, she - <<saRulesMasturbationFetishPlay>> - <<saRulesMasturbationDiscoversFetish>> + <<if $slaves[$i].preg > 0>> + It comes as little surprise when routine health checks start to show @@.lime;she's pregnant!@@ <</if>> - <<saRulesMasturbationDrugEffects>> - <<else>> /* releaseRules not restrictive */ - <<if ($universalRulesConsent == 0)>> - <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> - <<if ($slaves[$i].releaseRules == "permissive")>> - masturbates whenever she can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing her fear@@ of you. - <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>> - <<else>> - refuses to use other slaves to get off, and is @@.gold;punished@@ for illicit masturbation. - <<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>> - <</if>> - <<elseif ($slaves[$i].devotion <= 20)>> - <<if ($slaves[$i].releaseRules == "permissive")>> - prefers to masturbate rather than demanding sex from other slaves or giving free samples, @@.mediumaquamarine;slightly reducing her fear@@ of you. - <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>> - <<else>> - is forced by the urges induced by the food to either demand sex from other slaves or attempt to attract additional clients. She @@.hotpink;hates herself@@ for it. - <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> - <</if>> - <<elseif ($slaves[$i].devotion < 50)>> - @@.hotpink;accepts the need@@ to - <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> - <<else>> - happily @@.mediumaquamarine;avails herself@@ of your permission to - <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>> - <</if>> - <<if $slaves[$i].devotion > 20>> - <<saRulesRapeFetish>> - <<saRulesRapeDiscoversFetish>> - <</if>> - <<else>> /* universalRulesConsent is not zero */ - <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> - <<if ($slaves[$i].releaseRules == "permissive")>> - prefers to masturbate rather than asking other slaves for sex or giving free samples, @@.mediumaquamarine;slightly reducing her fear@@ of you. - <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>> - <<else>> - refuses to ask other slaves for sex, and is @@.gold;punished@@ for illicit masturbation. - <<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>> - <</if>> - <<elseif ($slaves[$i].devotion <= 20)>> - <<if ($slaves[$i].releaseRules == "permissive")>> - prefers to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you. - <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>> - <<else>> - is forced by the urges induced by the food to either swap sex with other slaves. She @@.hotpink;hates herself@@ for it. - <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> - <</if>> - <<elseif ($slaves[$i].devotion < 50)>> - @@.hotpink;accepts having to ask@@ other slaves for sex, - <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> - <<else>> - @@.mediumaquamarine;relies@@ on your other slaves for mutual satisfaction, - <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>> - <</if>> - <<if $slaves[$i].devotion > 20>> - <<saRulesConsentFetish>> - <<saRulesConsentDiscoversFetish>> - <</if>> - <</if>> /* closes universalRulesConsent */ - <<saRulesPermissiveDrugEffects>> - <</if>> /* closes releaseRules not restrictive */ + <</if>> + <<elseif _lover != 0>> + <<set $slaves[$i].need = 0>> + Her <<if $slaves[$i].relationship == 3>>friend with benefits<<elseif $slaves[$i].relationship == 4>>sweetheart<<else>>wife<</if>> frequently stops by when she gets the chance to make sure her sexual needs are well taken care of. + <<set $slaves[_lover].oralCount += 14, $oralTotal += 14>> + <<elseif $Nurse != 0>> + is routinely brought to orgasm by $Nurse.slaveName as part of her duties. + <<if canPenetrate($slaves[$i]) && $Nurse.boobs >= 500>> + <<set $slaves[_FLs].mammaryCount += 14, $mammaryTotal += 14>> + <<else>> + <<set $slaves[_FLs].oralCount += 14, $oralTotal += 14>> + /* possible cumflation code here */ + <</if>> + <<set $slaves[$i].need -= 60>> + <<elseif ($slaves[$i].releaseRules == "masturbation") || ($slaves[$i].releaseRules == "permisive")>> + <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> + takes solace in her permission to masturbate rather than being forced to seek other means of release, @@.mediumaquamarine;reducing her fear@@ of you. + <<set $slaves[$i].trust += 2, $slaves[$i].need = 0>> + <<elseif ($slaves[$i].devotion <= 20)>> + enjoys being allowed to masturbate rather than having to seek other means of release, @@.mediumaquamarine;slightly reducing her fear@@ of you but @@.mediumorchid;allowing her to remain in control of her sexuality.@@ + <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>> + <<elseif ($slaves[$i].devotion < 50)>> + accepts having to relieve herself solely through masturbation. + <<set $slaves[$i].need = 0>> + <<else>> + is a little disapointed that she's limited to her hands and toys, but @@.mediumaquamarine;understands you care about her current health.@@ + <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>> + <</if>> + <<if $slaves[$i].devotion > 20>> + When she does play with herself, she + <<saRulesMasturbationFetishPlay>> + <<saRulesMasturbationDiscoversFetish>> + <</if>> + <<saRulesMasturbationDrugEffects>> + <<else>> + eventually gives in to her urges and is @@.gold;punished@@ for illicit masturbation. + <<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>> <</if>> <<if ($slaves[$i].devotion <= 20)>> @@ -1196,31 +1159,60 @@ <</if>> <<if ($slaves[$i].devotion <= 20)>> - <<switch $brothelDecoration>> - <<case "Chattel Religionist" "Degradationist" "standard">> - The spare living conditions of $brothelName @@.hotpink;get her used@@ to the routine of + <<switch $clinicDecoration>> + <<case "Repopulation Focus" "Eugenics" "Gender Radicalist" "Gender Fundamentalist" "Paternalist" "Maturity Preferentialist" "Youth Preferentialist" "Slimness Enthusiast" "Hedonistic">> + The luxurious living conditions encourage her to @@.mediumaquamarine;feel respectable.@@ She can't help but @@.hotpink;feel you care@@ about her as something more than just an object under such lovely treatment. + <<set $slaves[$i].trust += 3, $slaves[$i].devotion += 1>> + <<case "Roman Revivalist" "Aztec Revivalist" "Egyptian Revivalist" "Arabian Revivalist" "Chinese Revivalist" "Chattel Religionist">> + The living conditions, despite their open nature, are @@.mediumaquamarine;quite relaxing.@@ Her opinion of you @@.hotpink;can only rise@@ with such lovely treatment. + <<set $slaves[$i].trust += 2, $slaves[$i].devotion += 1>> + <<case "Edo Revivalist">> + The living conditions, despite their spartan nature, are @@.mediumaquamarine;calming.@@ Her opinion of you @@.hotpink;improves@@ with such a contrast to her usual life. + <<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>> + <<case "standard">> + The spare living conditions of $clinicName serve as a constant reminder that @@.hotpink;you only care about her body@@ and not about her. <<if ($slaves[$i].trust > 20)>> - slavery and @@.gold;keep her aware of her lowly place.@@ + @@.gold;She fully understands what this means for her.@@ <<set $slaves[$i].trust -= 1>> - <<else>> - slavery. <</if>> <<set $slaves[$i].devotion += 1>> <<default>> - She gets a little room all to herself, allowing her to feel self-reliant; or it would, if it didn't reek of sex and shame after all the customers she serviced in it. + The spare living conditions of $clinicName serve as a constant reminder that @@.hotpink;she is nothing more than an object@@ for your amusement. + <<if ($slaves[$i].trust > 20)>> + She can only @@.gold;invision the horrors@@ that await her under your care. + <<set $slaves[$i].trust -= 2>> + <</if>> + <<set $slaves[$i].devotion += 1>> <</switch>> <<else>> - <<switch $brothelDecoration>> - <<case "Chattel Religionist" "Degradationist" "standard">> + <<switch $clinicDecoration>> + <<case "Repopulation Focus" "Eugenics" "Gender Radicalist" "Gender Fundamentalist" "Paternalist" "Maturity Preferentialist" "Youth Preferentialist" "Slimness Enthusiast" "Hedonistic">> + She loves her stay in $clinicName and almost wishes it didn't have to end. + <<case "Roman Revivalist" "Aztec Revivalist" "Egyptian Revivalist" "Arabian Revivalist" "Chinese Revivalist" "Chattel Religionist">> + The living conditions, despite their open nature, are @@.mediumaquamarine;quite relaxing.@@ She savors her stay at $clinicName. + <<set $slaves[$i].trust += 1>> + <<case "Edo Revivalist">> + The living conditions, despite their spartan nature, are @@.mediumaquamarine;calming.@@ She enjoys her stay at $clinicName. + <<set $slaves[$i].trust += 1>> + <<case "standard">> <<if ($slaves[$i].trust > 40)>> - The spare living conditions of $brothelName @@.gold;remind her not to get too comfortable@@ with her life. + The spare living conditions of $clinicName @@.gold;remind her not to get too comfortable@@ with her life. <<set $slaves[$i].trust -= 2>> <<elseif ($slaves[$i].trust > 10)>> - The spare living conditions of $brothelName @@.gold;keep her aware of her place.@@ + The spare living conditions of $clinicName @@.gold;keep her aware of her place.@@ <<set $slaves[$i].trust -= 1>> <</if>> <<default>> - She likes her little room in $brothelName, even if it smells of sex after fucking in it all day. + <<if ($slaves[$i].devotion >= 80)>> + The spare living conditions of $clinicName remind her that she is just an object for your amusement, and that is fine with her. + <<set $slaves[$i].trust -= 2>> + <<elseif ($slaves[$i].trust > 40)>> + The spare living conditions of $clinicName @@.gold;remind her that she is just an object to you.@@ + <<set $slaves[$i].trust -= 2>> + <<elseif ($slaves[$i].trust > 10)>> + The spare living conditions of $clinicName @@.gold;keep her aware of her place as your plaything.@@ + <<set $slaves[$i].trust -= 1>> + <</if>> <</switch>> <</if>> diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw index c962c265a86f9d36eb37e52091dac5245450e90f..9584f08965458327c1029831d61c6256878cda6f 100644 --- a/src/utility/assignWidgets.tw +++ b/src/utility/assignWidgets.tw @@ -20,7 +20,7 @@ <<case "work in the brothel" "brothel">> <<set $args[0].assignment = "work in the brothel", $args[0].assignmentVisible = 0, $brothelSlaves++, $BrothiIDs.push(_wID)>> <<switch $brothelDecoration>> - <<case "Chattel Religionist" "Degradationist" "standard">> + <<case "Degradationist" "standard">> <<set $args[0].livingRules = "spare">> <<default>> <<set $args[0].livingRules = "normal">> @@ -29,6 +29,14 @@ <<set $args[0].assignment = "be confined in the cellblock", $args[0].assignmentVisible = 0, $cellblockSlaves++, $CellBiIDs.push(_wID)>> <<case "get treatment in the clinic" "clinic">> <<set $args[0].assignment = "get treatment in the clinic", $args[0].assignmentVisible = 0, $clinicSlaves++, $CliniciIDs.push(_wID)>> + <<switch $clinicDecoration>> + <<case "Repopulation Focus" "Eugenics" "Gender Radicalist" "Gender Fundamentalist" "Paternalist" "Maturity Preferentialist" "Youth Preferentialist" "Slimness Enthusiast" "Hedonistic">> + <<set $args[0].livingRules = "luxurious">> + <<case "Roman Revivalist" "Aztec Revivalist" "Egyptian Revivalist" "Arabian Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist">> + <<set $args[0].livingRules = "normal">> + <<default>> + <<set $args[0].livingRules = "spare">> + <</switch>> <<case "serve in the club" "club">> <<set $args[0].assignment = "serve in the club", $args[0].assignmentVisible = 0, $clubSlaves++, $ClubiIDs.push(_wID)>> <<set $args[0].livingRules = "normal">>