From 6ccdefb966cdff254893e263609836369c759fc4 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 17 Apr 2018 00:05:19 -0400 Subject: [PATCH] fixes and REFI.tw --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 ++ src/uncategorized/REFI.tw | 84 +++++++++++++++---- src/uncategorized/customSlave.tw | 1 + src/uncategorized/randomNonindividualEvent.tw | 2 +- src/uncategorized/saLongTermEffects.tw | 2 +- src/uncategorized/saStayConfined.tw | 5 +- 6 files changed, 81 insertions(+), 19 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index a6f84cf44b7..3b60c108a3e 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.1-0.1.x +4/17/2018 + + 57 + -fixes + -more REFI work + 4/16/2018 56 diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw index 17d1cfbe4b7..11f9bdc8e31 100644 --- a/src/uncategorized/REFI.tw +++ b/src/uncategorized/REFI.tw @@ -330,7 +330,6 @@ It seems she passed by while you were enjoying the heavily pregnant $subSlave.sl <<case "boobs">> <<set _refi = $slaveIndices[$boobsID]>> -<<set $slaves[_refi].vaginalCount += 1, $vaginalTotal += 1>> <<set $subSlave = $slaves[_refi]>> <<set _subBelly = bellyAdjective($subSlave)>> @@ -395,8 +394,14 @@ It seems she passed by while you were drinking from $subSlave.slaveName and foun <<set _refi = $slaveIndices[$subID]>> <<if canDoVaginal($slaves[_refi]) && ($slaves[_refi].vagina > 0)>> <<set $slaves[_refi].vaginalCount++, $vaginalTotal++>> + <<if $PC.dick == 1 && $slaves[_refi].eggType == "human" && canGetPregnant($slaves[_refi])>> + <<KnockMeUp $slaves[_refi] 5 0 -1 1>> + <</if>> <<else>> <<set $slaves[_refi].analCount++, $analTotal++>> + <<if $PC.dick == 1 && $slaves[_refi].eggType == "human" && canGetPregnant($slaves[_refi])>> + <<KnockMeUp $slaves[_refi] 5 1 -1 1>> + <</if>> <</if>> <<set $subSlave = $slaves[_refi]>> <<set _subBelly = bellyAdjective($subSlave)>> @@ -412,9 +417,45 @@ It seems she passed by while you were drinking from $subSlave.slaveName and foun <</if>> /* 000-250-006 */ -$subSlave.slaveName is lying on the edge of your desk with her body helpless beneath you, your <<if ($PC.dick == 1)>>dick<<else>>strap-on<</if>> in her, and your hands around her neck. It's just breath play, and you're practiced enough that she's in no danger. She's such a sexual submissive that she sometimes acts out if not managed. This happens when she feels the urge to misbehave in order to access punishment, so you personally ensure that she can indulge her submissiveness when she needs it. She does not orgasm with you, her complete servitude to your pleasure fulfilling a deeper need than that. She leaves your office with a serene look on her face, passing <<EventNameLink $activeSlave>>, who is <<if ($activeSlave.heels == 1) && ($activeSlave.shoes != "heels") && ($activeSlave.shoes != "pumps") && ($activeSlave.shoes != "boots") && ($activeSlave.shoes != "extreme heels")>>kneeling in the doorway with a troubled look on her face.<<elseif $activeSlave.amp != 1>>standing in the doorway with a troubled look on her face.<<else>>propped limblessly nearby. She has a troubled look on her face.<</if>> +$subSlave.slaveName is lying on the edge of your desk with her<<if $subSlave.belly >= 1500>> bloated<</if>> body helpless beneath you, your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> in her, and your hands around her neck. It's just breath play, and you're practiced enough that she's in no danger. She's such a sexual submissive that she sometimes acts out if not managed. This happens when she feels the urge to misbehave in order to access punishment, so you personally ensure that she can indulge her submissiveness when she needs it. She does not orgasm with you, her complete servitude to your pleasure fulfilling a deeper need than that. She leaves your office with a serene look on her face, passing <<EventNameLink $activeSlave>>, who is +<<if $activeSlave.amp == 1>> + propped limblessly nearby. She has +<<elseif !canWalk($activeSlave)>> + kneeling in the doorway with +<<else>> + standing in the doorway with +<</if>> +a troubled look on her face. <br><br> -<<EventNameLink $activeSlave>> hesitates before explaining herself, and the $desc is obviously aroused: <<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>she's got a string of precum leaking out of her chastity cage<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormoneBalance >= 100)>>though her hormone-filled body can't get her dick hard any more, she's got a string of precum coming off her member<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>though her gelded body can't get her dick hard any more, she's got a string of precum coming off her limp member<<elseif $activeSlave.dick > 4>>her gigantic cock is standing out like a mast<<elseif $activeSlave.dick > 2>>she's sporting an impressive erection<<elseif $activeSlave.dick > 0>>her little penis is rock hard<<elseif $activeSlave.clit > 0>>her large clit is visibly engorged<<else>>her nipples are hard and there's a sheen on her pussylips<</if>>. It seems she passed by while you were dominating $subSlave.slaveName. <<if $activeSlave.amp != 1>>As though it has a mind of its own, her hand reaches up toward her throat. <</if>>It should be possible to either encourage this fascination with submission or steer her away from it for now. +<<EventNameLink $activeSlave>> hesitates before explaining herself, and the $desc is obviously aroused: +<<if ($activeSlave.dick > 0) && ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>> + she's got a string of precum leaking out of her chastity cage. +<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormoneBalance >= 100)>> + though her hormone-filled body can't get her dick hard any more, she's got a string of precum coming off her member. +<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>> + though her gelded body can't get her dick hard any more, she's got a string of precum coming off her limp member. +<<elseif canAchieveErection($activeSlave)>> + <<if $activeSlave.dick > 4>> + her gigantic cock is standing out like a mast. + <<elseif $activeSlave.dick > 2>> + she's sporting an impressive erection. + <<elseif $activeSlave.dick > 0>> + her little penis is rock hard. + <</if>> +<<elseif $activeSlave.dick > 7>> + she's got a string of precum coming off her engorged member. +<<elseif $activeSlave.dick > 0>> + she's got a string of precum coming off her limp member. +<<elseif $activeSlave.clit > 0>> + her large clit is visibly engorged. +<<elseif $activeSlave.vagina > -1>> + her nipples are hard and there's a sheen on her pussylips. +<<elseif $activeSlave.balls > 0>> + her nipples are hard and there is a distinct dribble of precum running from her featureless crotch. +<<else>> + her nipples are hard and there is a clear scent of lust around her. +<</if>> +It seems she passed by while you were dominating $subSlave.slaveName. <<if $activeSlave.amp != 1>>As though it has a mind of its own, her hand reaches up toward her throat. <</if>>It should be possible to either encourage this fascination with submission or steer her away from it for now. <<case "buttslut">> @@ -698,14 +739,14 @@ You have $subSlave.slaveName pinned up against a railing on a balcony that overl <<if $activeSlave.mpreg == 1>> <<if canDoAnal($activeSlave) && $activeSlave.anus > 0>> you slide <<if $PC.dick == 0>>a strap-on<<else>>your cock<</if>> into her rear and give her a pounding that leaves her begging for whats to come. <<if $PC.dick == 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell her that pregnancy is a very special reward for very good slaves, and you might give it to her one day - but that she doesn't deserve it yet. With that, you slide out of her ass and paint her back with <<if $PC.dick == 1>>your cum<<else>>a few squirts from the dildo<</if>>. - <<set $activeSlave.analCount++, set $analTotal++>> + <<AnalVCheck>> <<else>> you tell her that pregnancy is a very special reward for very good slaves, and you might give it to her one day - but that she doesn't deserve it yet. With that, you run your hands across the quivering slave's belly; pantomiming it swelling with child and sending her over the edge. <</if>> <<else>> <<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>> you slide <<if $PC.dick == 0>>a strap-on<<else>>your cock<</if>> into her vagina and give her a pounding that leaves her begging for whats to come. <<if $PC.dick == 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell her that pregnancy is a very special reward for very good slaves, and you might give it to her one day - but that she doesn't deserve it yet. With that, you slide out of her pussy and paint the quivering slave's belly with <<if $PC.dick == 1>>your cum<<else>>a few squirts from the dildo<</if>>. - <<set $activeSlave.vaginalCount++, set $vaginalTotal++>> + <<VaginalVCheck>> <<else>> you tell her that pregnancy is a very special reward for very good slaves, and you might give it to her one day - but that she doesn't deserve it yet. With that, you run your hands across the quivering slave's belly; pantomiming it swelling with child and sending her over the edge. <</if>> @@ -767,14 +808,14 @@ You have $subSlave.slaveName pinned up against a railing on a balcony that overl <<if $activeSlave.mpreg == 1>> <<if canDoAnal($activeSlave) && $activeSlave.anus > 0>> slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into her rear. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick == 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell her that pregnancy is a very special reward for very good slaves, and if she keeps being a good girl you'll be sure to keep her swollen with child. With that, you hilt yourself and <<if $PC.dick == 1>>flood her rectum with your cum<<else>>repeatedly pump bursts of cum out of your toy into her bowels<</if>>. - <<set $activeSlave.analCount++, set $analTotal++>> + <<AnalVCheck>> <<else>> you tell her that pregnancy is a very special reward for very good slaves, and if she keeps being a good girl you'll be sure to keep her swollen with child. With that, you run your hands across the quivering slave's _belly belly; pantomiming it swelling to an obscene size with children and sending her over the edge. <</if>> <<else>> <<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>> slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into her pussy. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick == 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell her that pregnancy is a very special reward for very good slaves, and if she keeps being a good girl you'll be sure to keep her swollen with child. With that, you hilt yourself and <<if $PC.dick == 1>>flood her cunt with your cum<<else>>repeatedly pump bursts of cum into her until it flows out around your toy<</if>>. - <<set $activeSlave.vaginalCount++, set $vaginalTotal++>> + <<VaginalVCheck>> <<else>> you tell her that pregnancy is a very special reward for very good slaves, and if she keeps being a good girl you'll be sure to keep her swollen with child. With that, you run your hands across the quivering slave's _belly belly; pantomiming it swelling to an obscene size with children and sending her over the edge. <</if>> @@ -1162,19 +1203,34 @@ You have $subSlave.slaveName pinned up against a railing on a balcony that overl <<link "Turn her into a submissive too">> <<EventNameDelink $activeSlave>> <<replace "#result">> - <<if $activeSlave.amp != 1>>You snap your fingers at $activeSlave.slaveName and point commandingly at the floor next to your desk. You tell her that a proper sub does what her dom wants, always, and leave her kneeling obediently beside you for some time.<<else>>You place $activeSlave.slaveName's helpless body on the floor next to your desk. You tell her that a proper sub does what her dom wants, always, and leave her lying obediently beside you for some time.<</if>> Then, without preamble, you stand up again and <<if ($PC.dick == 0)>>ride her face<<else>>throatfuck her<</if>>, intentionally ensuring that she gags and struggles. $activeSlave.slaveName spends almost all her sexual experiences in subspace for the rest of the week. Even other slaves who have sex with her are required to use her, not make love to her. @@.hotpink;She has become more obedient,@@ and @@.lightcoral;her sexuality now focuses on submission.@@ + <<if canWalk($activeSlave) && canSee($activeSlave)>> + You snap your fingers at $activeSlave.slaveName and point commandingly at the floor next to your desk. You tell her that a proper sub does what her dom wants, always, and leave her kneeling obediently beside you for some time. + <<elseif $activeSlave.amp == 1>> + You place $activeSlave.slaveName's helpless body on the floor next to your desk. You tell her that a proper sub does what her dom wants, always, and leave her lying obediently beside you for some time. + <<else>> + You guide $activeSlave.slaveName to the floor next to your desk and push her to her knees. You tell her that a proper sub does what her dom wants, always, and leave her waiting obediently beside you for some time. + <</if>> + Then, without preamble, you stand up again and <<if $PC.dick == 0>>ride her face<<else>>throatfuck her<</if>>, intentionally ensuring that she gags and struggles. $activeSlave.slaveName spends almost all her sexual experiences in subspace for the rest of the week. Even other slaves who have sex with her are required to use her, not make love to her. @@.hotpink;She has become more obedient,@@ and @@.lightcoral;her sexuality now focuses on submission.@@ <<set $activeSlave.devotion += 4>> - <<set $activeSlave.oralCount += 10>> - <<set $oralTotal += 10>> - <<set $activeSlave.fetish = "submissive">> - <<set $activeSlave.fetishKnown = 1>><<set $activeSlave.fetishStrength = 65>> + <<set $activeSlave.oralCount += 10, $oralTotal += 10>> + <<set $activeSlave.fetish = "submissive", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>> <</replace>> <</link>> <br><<link "Steer her away from total submission for the moment">> <<EventNameDelink $activeSlave>> <<replace "#result">> - Good slaves get aroused according to their masters' whim, not their own silly tendencies. You call $activeSlave.slaveName over before she can give voice to her interest in submission, and make her ride <<if ($PC.dick == 0)>>a strap-on you're wearing<<else>>your dick<</if>>. You ensure that she maintains the active role throughout. You'll keep an eye on her, and with this correction @@.hotpink;she'll become more obedient.@@ - <<SimpleVCheck>> + Good slaves get aroused according to their masters' whim, not their own silly tendencies. You call $activeSlave.slaveName over before she can give voice to her interest in submission, and make her + <<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>> + ride <<if ($PC.dick == 0)>>a strap-on you're wearing<<else>>your dick<</if>>. + <<VaginalVCheck>> + <<elseif canDoAnal($activeSlave) && $activeSlave.anus > 0>> + ride <<if ($PC.dick == 0)>>a strap-on you're wearing<<else>>your dick<</if>>. + <<AnalVCheck>> + <<else>> + <<if $PC.dick == 1>>suck you off<<if $PC.vagina == 1>> and eat you out<</if>><<else>>eat you out<</if>> at her own pace. + <<set $activeSlave.oralCount++, $oralTotal++>> + <</if>> + You ensure that she maintains the active role throughout. You'll keep an eye on her, and with this correction @@.hotpink;she'll become more obedient.@@ <<set $activeSlave.devotion += 4>> <</replace>> <</link>> diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw index c41a495ae6a..13dc05917f6 100644 --- a/src/uncategorized/customSlave.tw +++ b/src/uncategorized/customSlave.tw @@ -435,6 +435,7 @@ | <link "Extremely pale">> <<set $customSlave.skin = "extremely pale">> + <<CustomSlaveSkin>> <</link>> | <<link "Pale">> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 87d3a43264d..162c680e2a5 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -212,7 +212,7 @@ <</if>> <<elseif ($slaves[$i].fetish == "submissive")>> <<if ($subID == 0)>> - <<if ($slaves[$i].anus > 0 && canDoAnal($slaves[$i])) || ($slaves[$i].vagina > 0 && canDoVaginal($slaves[$i]))>> + <<if (($slaves[$i].anus > 0 && canDoAnal($slaves[$i])) || ($slaves[$i].vagina > 0 && canDoVaginal($slaves[$i])) && $slaves[$i].belly < 30000)>> <<set $subID = $slaves[$i].ID>> <</if>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index a19b01cbb70..e48ea9b1be1 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -5473,7 +5473,7 @@ Society @@.green;is pleased@@ that $pronoun is allowed to fully indulge $possessive paraphilia. <<FSChangePorn "Hedonism" 1>> <<elseif (_para < 0)>> - Society @@.green;frowns@@ upon $object not being allowed to indulge in $possessive paraphilia. + Society @@.red;frowns@@ upon $object not being allowed to indulge in $possessive paraphilia. <<FSChangePorn "Hedonism" -2>> <</if>> <</if>> diff --git a/src/uncategorized/saStayConfined.tw b/src/uncategorized/saStayConfined.tw index d1ff6702554..b3d3cc4eb0e 100644 --- a/src/uncategorized/saStayConfined.tw +++ b/src/uncategorized/saStayConfined.tw @@ -37,11 +37,10 @@ The stress of confinement @@.red;damages $possessive health@@. <</if>> <<if ($slaves[$i].sentence == 0) && (($slaves[$i].devotion > 20) || (($slaves[$i].devotion >= -20) && ($slaves[$i].trust < -20)) || (($slaves[$i].devotion >= -50) && ($slaves[$i].trust < -50)) || ($slaves[$i].fetish == "mindbroken"))>> - $pronounCap <<if $slaves[$i].fetish == "mindbroken">> - broken mind hinges entirely on other's guidance, + $possessiveCap broken mind hinges entirely on other's guidance, <<else>> - is now willing to @@.hotpink;do as $pronoun's told@@, + $pronounCap is now willing to @@.hotpink;do as $pronoun's told@@, <</if>> so @@.yellow;$possessive assignment has defaulted to rest.@@ <<if $slaves[$i].assignment == "be confined in the cellblock">> -- GitLab