From 0935dc8facfb3e291663634ff61a67f4c4691a98 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 7 Aug 2017 18:38:51 -0400 Subject: [PATCH] Fixes. --- src/init/storyInit.tw | 1 + src/pregmod/fSlaveFeed.tw | 2 +- src/pregmod/forceFeeding.tw | 4 ++-- src/uncategorized/BackwardsCompatibility.tw | 3 +++ src/uncategorized/saLongTermEffects.tw | 1 - src/uncategorized/seNonlethalPit.tw | 12 ++++++------ src/uncategorized/slaveInteract.tw | 5 +++++ src/uncategorized/wardrobe.tw | 10 +++++++++- src/utility/miscWidgets.tw | 5 +++++ 9 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 40da20e527f..4c4f3bc2775 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -605,6 +605,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $toysBoughtGags = 0>> <<set $toysBoughtButtPlugs = 0>> <<set $toysBoughtButtPlugTails = 0>> +<<set $buckets = 0>> /* assistant FS appearance variable */ <<set $assistantFSAppearance = "default">> diff --git a/src/pregmod/fSlaveFeed.tw b/src/pregmod/fSlaveFeed.tw index fdc99952bed..5c42c3f6655 100644 --- a/src/pregmod/fSlaveFeed.tw +++ b/src/pregmod/fSlaveFeed.tw @@ -1,4 +1,4 @@ -:: FSlaveFeed +:: FSlaveFeed [nobr] <<if $activeSlave.inflationType == "milk">> <<set $activeSlave.milkSource = $milkTap.ID>> diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw index 4fad1708a1f..6ff7d2a74ed 100644 --- a/src/pregmod/forceFeeding.tw +++ b/src/pregmod/forceFeeding.tw @@ -327,7 +327,7 @@ buckets overflowing with slave food. She is going to eat all the slave food and Her ass is under a lot of pressure from her swollen middle and surely would feel amazing; it's even eagerly winking at you. Unfortanatly, no matter how hard you try, you can't find a position that will accommodate both her food-stuffed stomach and your own gravid middle. Sighing, you settle for her mouth instead. <<set _doMe = 0>> <<else>> - <<if $PC.dick == 1>>You're already rock hard so you<<else>>You don a strap-on,</if>> lub up, pull her legs apart and heft her bulk up to reveal her + <<if $PC.dick == 1>>You're already rock hard so you<<else>>You don a strap-on,<</if>> lub up, pull her legs apart and heft her bulk up to reveal her <<if $activeSlave.anus > 3>> gaping asshole. Her belly is putting so much pressure on it that you should be able to get a decent fuck out of it. <<if $PC.dick == 1>>You can't help but be amazed that you're getting some resistance as you slide in<<else>>You slide in like it's nothing<</if>>. <<elseif $activeSlave.anus > 2>> @@ -345,7 +345,7 @@ buckets overflowing with slave food. She is going to eat all the slave food and <<else>> <<set _doMe = 0>> <</if>> - <<if _doMe = 0>> + <<if _doMe == 0>> <<if $PC.dick == 1>> You crawl onto the couch above her head and lower your erect cock straight into her waiting mouth. She eagerly sucks you off, her belly wobbling with every thrust into her throat. You cum fast and hard into her, a product of being on the edge during her feeding; <<if $activeSlave.behavioralFlaw == "gluttonous">>she takes it like nothing and resumes sucking, her gluttony showing no bounds<<else>>she swallows it promptly and keeps sucking. You'd swear she was a glutton at this point<</if>>. <<else>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 963ee4e51af..1aee536bdb3 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -204,6 +204,9 @@ <<if ndef $toysBoughtButtPlugTails>> <<set $toysBoughtButtPlugTails = 0>> <</if>> +<<if ndef $buckets>> + <<set $buckets = 0>> +<</if>> <<if ndef $FCTVenable>> <<set $FCTVenable = 1>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 85a3800445b..f138b5eaa96 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4146,7 +4146,6 @@ <<set $slaves[$i].behavioralFlaw = "anorexic">> <</if>> <</switch>> - <</if>> <</if>> <<if $slaves[$i].inflation == 3 && $seeExtreme == 1 && $slaves[$i].health <= -100>> diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw index d0218031fb4..18428853ce5 100644 --- a/src/uncategorized/seNonlethalPit.tw +++ b/src/uncategorized/seNonlethalPit.tw @@ -612,15 +612,15 @@ You throw the victor's strap-on down to _winner.slaveName. She @@.mediumorchid;hates@@ having to abuse _loser.slaveName. <<set _winner.devotion -= 10>> <</if>> -<<if _winner.fetish == "sadist" && _winner.fetishStrength > 90 && _winner.behavioralFlaw != "malicious" && _winner.devotion >= 20>> +<<if _winner.fetish == "sadist" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "malicious" && _winner.devotion >= 20>> She noticed something while she was raping _loser.slaveName; watching the way she writhed in pain was strangely satisfying, as was making her suffer. _winner.slaveName cums powerfully at the mere thought; she has become @@.yellow;sexually addicted to inflicting pain and anguish.@@ - <<set _winner.behavioralFlaw = "malicious">> -<<elseif _winner.fetish == "masochist" && _winner.fetishStrength > 90 && _winner.behavioralFlaw != "self hating" && _winner.devotion < 20>> + <<set _winner.sexualFlaw = "malicious">> +<<elseif _winner.fetish == "masochist" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "self hating" && _winner.devotion < 20>> She feels horrible after forcing herself on _loser.slaveName; she is the one that should suffer, not her. _winner.slaveName has @@.yellow;descended into true self hatred.@@ - <<set _winner.behavioralFlaw = "self hating">> -<<elseif _winner.fetish == "dom" && _winner.fetishStrength > 90 && _winner.behavioralFlaw != "abusive" && _winner.devotion >= 20>> + <<set _winner.sexualFlaw = "self hating">> +<<elseif _winner.fetish == "dom" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "abusive" && _winner.devotion >= 20>> She noticed something while she was raping _loser.slaveName; watching the way she cowered before her raised palm was strangely satisfying, as were the painful moans that accompanied every forceful thrust. _winner.slaveName cums powerfully at the mere thought; she has become @@.yellow;sexually abusive, getting off on the thrill of forcing herself on other slaves.@@ - <<set _winner.behavioralFlaw = "abusive">> + <<set _winner.sexualFlaw = "abusive">> <<elseif _winner.behavioralFlaw == "none" && random(1,100) <= 5 && _winner.devotion < 20>> She begins to act @@.red;oddly@@ after the fight; having to beat down and rape another slave may have affected her mentally. <<set _winner.behavioralFlaw = "odd">> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 05ed38b063f..cae53d13cf3 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -165,6 +165,11 @@ <<if ($activeSlave.preg <= 0) && ($activeSlave.inflation == 0) && ($activeSlave.bellyImplant == -1)>> <<if $activeSlave.assignment != "work in the dairy" || $activeSlave.assignment != "be confined in the arcade">> | [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]] + <<if $buckets == 1>> + | <<link "Make her consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + | <<link "Force her to consume a gallon of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 2>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + | <<link "Force two gallons of slave food into her">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 3>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> <</if>> <</if>> </span> diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw index d4ebce4fc69..47b4c4a55c8 100644 --- a/src/uncategorized/wardrobe.tw +++ b/src/uncategorized/wardrobe.tw @@ -5,7 +5,7 @@ <</nobr>>\ \ ''__Slave Wardrobe__'' -//The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should she be allowed to dress herself. The selection includes <<if ($cheatMode == 1) || (($clothesBoughtBunny == 1 || $arcologies[0].FSGenderFundamentalist != "unset") && ($clothesBoughtChains == 1 || $arcologies[0].FSDegradationist != "unset") && ($clothesBoughtConservative == 1 || $arcologies[0].FSPaternalist != "unset") && ($clothesBoughtWestern == 1 || $arcologies[0].FSPastoralist != "unset") && ($clothesBoughtOil == 1 || $arcologies[0].FSPhysicalIdealist != "unset") && ($clothesBoughtHabit == 1 || $arcologies[0].FSChattelReligionist != "unset") && ($clothesBoughtToga == 1 || $arcologies[0].FSRomanRevivalist != "unset") && ($clothesBoughtHuipil == 1 || $arcologies[0].FSAztecRevivalist != "unset") && ($clothesBoughtKimono == 1 || $arcologies[0].FSEdoRevivalist != "unset") && ($clothesBoughtHarem == 1 || $arcologies[0].FSArabianRevivalist != "unset") && ($clothesBoughtQipao == 1 || $arcologies[0].FSChineseRevivalist != "unset") && ($clothesBoughtEgypt == 1 || $arcologies[0].FSEgyptianRevivalist != "unset") && ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtBelly == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtLazyClothes == 1 || $arcologies[0].FSHedonisticDecadence != "unset"))>>outfits from all manner of cultures and societies, not a single style eludes you.<<else>>many styles of clothing ranging from exciting to mundane and sexy to practical.<</if>><<if $toysBoughtDildos == 1 && $toysBoughtGags == 1 && $toysBoughtButtPlugs == 1>> Sex toys of all kinds and shapes line the shelves.<<elseif $toysBoughtDildos == 1 || $toysBoughtGags == 1 || $toysBoughtButtPlugs == 1 || $toysBoughtButtPlugTails == 1>> Some sex toys line the shelves.<</if>><<if $enema == 1>> A number of drums of specially formulated water for use in enemas line one of the walls.<</if>><<if $medicalEnema == 1>> Alongside them, multiple drums of mixtures for use in medical enemas.<</if>>// +//The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should she be allowed to dress herself. The selection includes <<if ($cheatMode == 1) || (($clothesBoughtBunny == 1 || $arcologies[0].FSGenderFundamentalist != "unset") && ($clothesBoughtChains == 1 || $arcologies[0].FSDegradationist != "unset") && ($clothesBoughtConservative == 1 || $arcologies[0].FSPaternalist != "unset") && ($clothesBoughtWestern == 1 || $arcologies[0].FSPastoralist != "unset") && ($clothesBoughtOil == 1 || $arcologies[0].FSPhysicalIdealist != "unset") && ($clothesBoughtHabit == 1 || $arcologies[0].FSChattelReligionist != "unset") && ($clothesBoughtToga == 1 || $arcologies[0].FSRomanRevivalist != "unset") && ($clothesBoughtHuipil == 1 || $arcologies[0].FSAztecRevivalist != "unset") && ($clothesBoughtKimono == 1 || $arcologies[0].FSEdoRevivalist != "unset") && ($clothesBoughtHarem == 1 || $arcologies[0].FSArabianRevivalist != "unset") && ($clothesBoughtQipao == 1 || $arcologies[0].FSChineseRevivalist != "unset") && ($clothesBoughtEgypt == 1 || $arcologies[0].FSEgyptianRevivalist != "unset") && ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtBelly == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtLazyClothes == 1 || $arcologies[0].FSHedonisticDecadence != "unset"))>>outfits from all manner of cultures and societies, not a single style eludes you.<<else>>many styles of clothing ranging from exciting to mundane and sexy to practical.<</if>><<if $toysBoughtDildos == 1 && $toysBoughtGags == 1 && $toysBoughtButtPlugs == 1>> Sex toys of all kinds and shapes line the shelves.<<elseif $toysBoughtDildos == 1 || $toysBoughtGags == 1 || $toysBoughtButtPlugs == 1 || $toysBoughtButtPlugTails == 1>> Some sex toys line the shelves.<</if>><<if $buckets == 1>>Several buckets of various sizes and a sturdy cup have been set aside for you in feeding slaves to their limit.<</if>><<if $enema == 1>> A number of drums of specially formulated water for use in enemas line one of the walls.<</if>><<if $medicalEnema == 1>> Alongside them, multiple drums of mixtures for use in medical enemas.<</if>>// <br> <<nobr>> <<if $clothesBoughtBunny == 0 && $arcologies[0].FSGenderFundamentalist == "unset" && $cheatMode == 0>> @@ -145,6 +145,14 @@ <</if>> <</nobr>> +<<nobr>> +<<if $buckets == 0>> + [[Gather up everything you need to force feed slaves|Wardrobe][$buckets = 1]] + //Some supplies from the cafeteria and a slight adjustment to the feeder settings is all it would take.// +<<else>>You have everything you need in one place to force feed slaves. You've also adjusted the feeders to cheaply produce filler food to save on money. However, said food is just empty calories and probably bad for a slave's waistline. +<</if>> +<</nobr>> + <<nobr>> <<if $enema == 0>> [[Order enema supplies|Wardrobe][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $enema = 1]] diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index f17e557e7f4..a2e31eb9ba6 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -389,6 +389,11 @@ <<if ($activeSlave.preg <= 0) && ($activeSlave.inflation == 0) && ($activeSlave.bellyImplant == -1)>> <<if $activeSlave.assignment != "work in the dairy" || $activeSlave.assignment != "be confined in the arcade">> | [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]] + <<if $buckets == 1>> + | <<link "Make her consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + | <<link "Force her to consume a gallon of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 2>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + | <<link "Force two gallons of slave food into her">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 3>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> <</if>> <</if>> <</replace>> -- GitLab