diff --git a/src/npc/interaction/passage/fMarry.tw b/src/npc/interaction/passage/fMarry.tw index 8d540ccc7688abf7f63e996b0428ae018e5fe711..82a603b0b961e64a088c67eb6b4405f66ae2c2ab 100644 --- a/src/npc/interaction/passage/fMarry.tw +++ b/src/npc/interaction/passage/fMarry.tw @@ -435,20 +435,20 @@ You tell <<= getSlave($AS).slaveName>> that you're going to marry $him. (A propo <<link "Give $him your surname">> <<replace "#surnaming">> <<set getSlave($AS).slaveSurname = $PC.slaveSurname>> - You also command $assistant.name to rename your new slave $wife <<= getSlave($AS).slaveName>> getSlave($AS).slaveSurname. + You also command $assistant.name to rename your new slave $wife <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>>. <<if getSlave($AS).fetish == "mindbroken">> - The new Mrs. getSlave($AS).slaveSurname <<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and shows no reaction. Like many things, names mean nothing to $him now. + The new Mrs. <<= getSlave($AS).slaveSurname>><<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and shows no reaction. Like many things, names mean nothing to $him now. <<elseif getSlave($AS).devotion+getSlave($AS).trust >= 175>> - The new Mrs. getSlave($AS).slaveSurname <<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and breaks down again. Being brusquely redesignated as your slave $wife was such a sterile experience that $he wasn't sure it was real, and hearing that $he's to take your surname @@.mediumaquamarine;reassures $him@@ that it is. Not to mention, $he might be a $desc, but $he's still a $girl, and hearing that $he wouldn't get a decent wedding did disappoint $him, but this makes up for it. You might not be all that expressive, but @@.hotpink;$he's your $wife,@@ and that's what matters to $him. + The new Mrs. <<= getSlave($AS).slaveSurname>><<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and breaks down again. Being brusquely redesignated as your slave $wife was such a sterile experience that $he wasn't sure it was real, and hearing that $he's to take your surname @@.mediumaquamarine;reassures $him@@ that it is. Not to mention, $he might be a $desc, but $he's still a $girl, and hearing that $he wouldn't get a decent wedding did disappoint $him, but this makes up for it. You might not be all that expressive, but @@.hotpink;$he's your $wife,@@ and that's what matters to $him. <<set getSlave($AS).devotion += 5, getSlave($AS).trust += 5>> <<elseif getSlave($AS).devotion < -20 && getSlave($AS).trust > 20>> - The new Mrs. getSlave($AS).slaveSurname <<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and scoffs audibly. @@.mediumorchid;$He'll remember $his name, even if you try to take it away.@@ $He can't hide @@.mediumorchid;$his annoyance@@ that you couldn't even spring for a fancy wedding. + The new Mrs. <<= getSlave($AS).slaveSurname>><<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and scoffs audibly. @@.mediumorchid;$He'll remember $his name, even if you try to take it away.@@ $He can't hide @@.mediumorchid;$his annoyance@@ that you couldn't even spring for a fancy wedding. <<set getSlave($AS).devotion -= 10>> <<elseif getSlave($AS).devotion < -20>> - The new Mrs. getSlave($AS).slaveSurname <<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and breaks down again. Not only have you taken $his hand, but now also $his name; @@.hotpink;$he's yours now,@@ nothing $he thinks can change that. + The new Mrs. <<= getSlave($AS).slaveSurname>><<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and breaks down again. Not only have you taken $his hand, but now also $his name; @@.hotpink;$he's yours now,@@ nothing $he thinks can change that. <<set getSlave($AS).devotion += 5>> <<else>> - The new Mrs. getSlave($AS).slaveSurname <<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and nods acceptingly. Being trusted with your surname @@.mediumaquamarine;reassures $him@@ that $he must mean something to you, though $he is a @@.mediumorchid;little disappointed@@ by the lack of a wedding, however. + The new Mrs. <<= getSlave($AS).slaveSurname>><<if canHear(getSlave($AS))>>hears<<else>>understands<</if>> this, of course, and nods acceptingly. Being trusted with your surname @@.mediumaquamarine;reassures $him@@ that $he must mean something to you, though $he is a @@.mediumorchid;little disappointed@@ by the lack of a wedding, however. <<set getSlave($AS).devotion--, getSlave($AS).trust += 5>> <</if>> <</replace>> @@ -677,23 +677,23 @@ You tell <<= getSlave($AS).slaveName>> that you're going to marry $him. (A propo <<link "Give $him your surname">> <<replace "#surnaming">> <<set getSlave($AS).slaveSurname = $PC.slaveSurname>> - You also command $assistant.name to rename your new slave $wife <<= getSlave($AS).slaveName>> getSlave($AS).slaveSurname. + You also command $assistant.name to rename your new slave $wife <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>>. <<if getSlave($AS).fetish == "mindbroken">> - Before you get too distracted, you tell your lovely new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> getSlave($AS).slaveSurname. You are uncertain if it sunk in or not. + Before you get too distracted, you tell your lovely new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>>. You are uncertain if it sunk in or not. <<elseif getSlave($AS).devotion+getSlave($AS).trust >= 175>> - Before you get too distracted, you tell your lovely new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> getSlave($AS).slaveSurname. It would be an understatement to say $he's delighted. $He's a good $desc, but even $he has to retain a kernel of doubt about whether a marriage between an owner and a piece of property is really worth much. This @@.mediumaquamarine;reassures $him@@ that it is. $His special day probably wasn't exactly like $he might once have imagined it, but $he obviously thinks it's been @@.hotpink;very nice,@@ all things considered. + Before you get too distracted, you tell your lovely new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>>. It would be an understatement to say $he's delighted. $He's a good $desc, but even $he has to retain a kernel of doubt about whether a marriage between an owner and a piece of property is really worth much. This @@.mediumaquamarine;reassures $him@@ that it is. $His special day probably wasn't exactly like $he might once have imagined it, but $he obviously thinks it's been @@.hotpink;very nice,@@ all things considered. <<if canTalk(getSlave($AS))>>"_myName _playerSurname," $he murmurs to $himself occasionally, smiling.<</if>> <<set getSlave($AS).devotion += 5, getSlave($AS).trust += 5>> <<elseif getSlave($AS).devotion < -20 && getSlave($AS).trust > 20>> - Before you get too distracted, you tell your lovely new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> getSlave($AS).slaveSurname. @@.mediumorchid;$He'll remember $his name, even if you try to take it away.@@ + Before you get too distracted, you tell your lovely new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>>. @@.mediumorchid;$He'll remember $his name, even if you try to take it away.@@ <<if canTalk(getSlave($AS))>>"_myName _playerSurname," $he mutters to $himself occasionally; their is a distinct distaste to the way $he says it.<</if>> <<set getSlave($AS).devotion -= 10>> <<elseif getSlave($AS).devotion < -20>> - Before you get too distracted, you tell your quivering new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> getSlave($AS).slaveSurname. $He nods in terror. Not only have you taken $his hand, but now also $his name; @@.hotpink;$he's yours now,@@ nothing $he thinks can change that. + Before you get too distracted, you tell your quivering new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>>. $He nods in terror. Not only have you taken $his hand, but now also $his name; @@.hotpink;$he's yours now,@@ nothing $he thinks can change that. <<if canTalk(getSlave($AS))>>"_myName _playerSurname," $he mutters to $himself occasionally, $his voice wavering as $he struggles to hold back the tears.<</if>> <<set getSlave($AS).devotion += 5>> <<else>> - Before you get too distracted, you tell your lovely new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> getSlave($AS).slaveSurname. $He nods acceptingly. $He's a good $desc, but $he has doubts about whether a marriage between an owner and a piece of property is really worth much. That doesn't matter, @@.mediumaquamarine;it's worth something to $him.@@ + Before you get too distracted, you tell your lovely new $wife that $he's now to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>>. $He nods acceptingly. $He's a good $desc, but $he has doubts about whether a marriage between an owner and a piece of property is really worth much. That doesn't matter, @@.mediumaquamarine;it's worth something to $him.@@ <<if canTalk(getSlave($AS))>>"_myName _playerSurname," $he murmurs to $himself occasionally<<if canHear(getSlave($AS))>>, listening to how it sounds<</if>>.<</if>> <<set getSlave($AS).trust += 5>> <</if>> diff --git a/src/npc/interaction/passage/matchmaking.tw b/src/npc/interaction/passage/matchmaking.tw index 577e2d70f3d9a2ea5d6b7c32f04f8b093194ad8d..944831f5b47b1f792203ff271de7b9276f753a1c 100644 --- a/src/npc/interaction/passage/matchmaking.tw +++ b/src/npc/interaction/passage/matchmaking.tw @@ -25,7 +25,7 @@ <</if>> /* 000-250-006 */ -You order getSlave($activeSlave.ID).slaveName to come to your office. The <<if getSlave($activeSlave.ID).relationship == -2>>worshipful<<else>>slutty<</if>> $desc arrives promptly, greets you correctly, and waits <<if getSlave($activeSlave.ID).relationship == -2>>adoringly for a command<<else>>eagerly for you to fuck $him<</if>>. You consider the situation carefully. +You order <<= getSlave($activeSlave.ID).slaveName>> to come to your office. The <<if getSlave($activeSlave.ID).relationship == -2>>worshipful<<else>>slutty<</if>> $desc arrives promptly, greets you correctly, and waits <<if getSlave($activeSlave.ID).relationship == -2>>adoringly for a command<<else>>eagerly for you to fuck $him<</if>>. You consider the situation carefully. <<if getSlave($activeSlave.ID).relationship == -2>> $He's emotionally bonded to you, and loves you with all $his heart. $He would probably do anything you command and love you all the more for it. If you were to decide that you were tired of $his adoration, you could probably set $him up with another similarly broken slave. If you ordered them to love each other like they love you, they'd obey. <<else>> @@ -64,7 +64,7 @@ Their relationship would probably be somewhat artificial at first, and they'd ha <<setLocalPronouns $subSlave 2>> -You decide to set getSlave($activeSlave.ID).slaveName up with $subSlave.slaveName. Telling the former to wait, you have the latter hurry up to your office. When the <<if getSlave($activeSlave.ID).relationship == -2>>slaves are waiting adoringly<<else>>sluts are waiting with barely concealed lust<</if>> in front of your desk together, you inform them of your decision. +You decide to set <<= getSlave($activeSlave.ID).slaveName>> up with $subSlave.slaveName. Telling the former to wait, you have the latter hurry up to your office. When the <<if getSlave($activeSlave.ID).relationship == -2>>slaves are waiting adoringly<<else>>sluts are waiting with barely concealed lust<</if>> in front of your desk together, you inform them of your decision. <<if getSlave($activeSlave.ID).relationship == -2>> You commend their love for you, and let them know that it's all right for it to continue, but command them to love each other, too. They look doubtful, but at your orders they obediently take each other by the hand, and share a kiss. It will do for now. You assign them to live together as much as possible for a few days, and inform them that you'll be limiting your personal contact with them during this period. They give you identical looks of horror, and fail to notice how much of a perfect couple they already are. <<else>> @@ -74,47 +74,47 @@ You decide to set getSlave($activeSlave.ID).slaveName up with $subSlave.slaveNam Being ordered into a relationship would be difficult for anyone, but they're so obedient that @@.lightgreen;they do their best and make it work.@@ You ensure that they do, and your determined efforts to do so @@.mediumorchid;reduce their devotion to you,@@ though it's mostly by redirection towards each other. And in any case, they remain devoted enough, and will likely return to their earlier worshipfulness in a few weeks at most. <<set _matched = 1>> <<if (getSlave($activeSlave.ID).fetish == "submissive") && ($subSlave.fetish == "dom")>> - $subSlave.slaveName is a dom and getSlave($activeSlave.ID).slaveName is a sub. It's a match out of bad fiction. + $subSlave.slaveName is a dom and <<= getSlave($activeSlave.ID).slaveName>> is a sub. It's a match out of bad fiction. <<elseif ($subSlave.fetish == "submissive") && (getSlave($activeSlave.ID).fetish == "dom")>> - getSlave($activeSlave.ID).slaveName is a dom and $subSlave.slaveName is a sub. It's a match out of bad fiction. + <<= getSlave($activeSlave.ID).slaveName>> is a dom and $subSlave.slaveName is a sub. It's a match out of bad fiction. <<elseif (getSlave($activeSlave.ID).fetish == "masochist") && ($subSlave.fetish == "sadist")>> - $subSlave.slaveName is a sadist and getSlave($activeSlave.ID).slaveName is a masochist. They're a perfect ouroboros of agony. + $subSlave.slaveName is a sadist and <<= getSlave($activeSlave.ID).slaveName>> is a masochist. They're a perfect ouroboros of agony. <<elseif ($subSlave.fetish == "masochist") && (getSlave($activeSlave.ID).fetish == "sadist")>> - getSlave($activeSlave.ID).slaveName is a sadist and $subSlave.slaveName is a masochist. They're a perfect ouroboros of agony. + <<= getSlave($activeSlave.ID).slaveName>> is a sadist and $subSlave.slaveName is a masochist. They're a perfect ouroboros of agony. <<elseif (getSlave($activeSlave.ID).fetish == "cumslut") && ($subSlave.balls > 0)>> - $subSlave.slaveName has balls and getSlave($activeSlave.ID).slaveName has the appetite to drain them of every drop of cum. + $subSlave.slaveName has balls and <<= getSlave($activeSlave.ID).slaveName>> has the appetite to drain them of every drop of cum. <<elseif ($subSlave.fetish == "cumslut") && (getSlave($activeSlave.ID).balls > 0)>> - getSlave($activeSlave.ID).slaveName has balls and $subSlave.slaveName has the appetite to drain them of every drop of cum. + <<= getSlave($activeSlave.ID).slaveName>> has balls and $subSlave.slaveName has the appetite to drain them of every drop of cum. <<elseif (getSlave($activeSlave.ID).fetish == "humiliation") && ($subSlave.fetish == "sadist")>> - getSlave($activeSlave.ID).slaveName loves to be humiliated, and $subSlave.slaveName can definitely get off on another $girl's shame. + <<= getSlave($activeSlave.ID).slaveName>> loves to be humiliated, and $subSlave.slaveName can definitely get off on another $girl's shame. <<elseif ($subSlave.fetish == "humiliation") && (getSlave($activeSlave.ID).fetish == "sadist")>> - $subSlave.slaveName loves to be humiliated, and getSlave($activeSlave.ID).slaveName can definitely get off on another _girl2's shame. + $subSlave.slaveName loves to be humiliated, and <<= getSlave($activeSlave.ID).slaveName>> can definitely get off on another _girl2's shame. <<elseif (getSlave($activeSlave.ID).fetish == "buttslut") && ($subSlave.fetish == "dom")>> - $subSlave.slaveName likes fucking other girls, so once getSlave($activeSlave.ID).slaveName asks _him2 to just do it to $his ass all the time, they're both happy. + $subSlave.slaveName likes fucking other girls, so once <<= getSlave($activeSlave.ID).slaveName>> asks _him2 to just do it to $his ass all the time, they're both happy. <<elseif ($subSlave.fetish == "buttslut") && (getSlave($activeSlave.ID).fetish == "dom")>> - getSlave($activeSlave.ID).slaveName likes fucking other girls, so once $subSlave.slaveName asks $him to just do it to _his2 ass all the time, they're both happy. + <<= getSlave($activeSlave.ID).slaveName>> likes fucking other girls, so once $subSlave.slaveName asks $him to just do it to _his2 ass all the time, they're both happy. <<elseif (getSlave($activeSlave.ID).fetish == "boobs") && ($subSlave.boobs > 4000)>> - getSlave($activeSlave.ID).slaveName fetishized breasts so much that $he thinks $subSlave.slaveName's udders are one of the sexiest things $he's ever seen. + <<= getSlave($activeSlave.ID).slaveName>> fetishized breasts so much that $he thinks $subSlave.slaveName's udders are one of the sexiest things $he's ever seen. <<elseif ($subSlave.fetish == "boobs") && (getSlave($activeSlave.ID).boobs > 4000)>> $subSlave.slaveName fetishized breasts so much that _he2 thinks getSlave($activeSlave.ID).slaveName's udders are one of the sexiest things _he2's ever seen. <<elseif (getSlave($activeSlave.ID).fetish == "pregnancy") && ($subSlave.fetish == "pregnancy") && $subSlave.bellyPreg >= 300000 && getSlave($activeSlave.ID).bellyPreg >= 300000>> - getSlave($activeSlave.ID).slaveName and $subSlave.slaveName are both enormously laden with children, much to the other's delight. They can't wait to explore each other's baby filled middle. + <<= getSlave($activeSlave.ID).slaveName>> and $subSlave.slaveName are both enormously laden with children, much to the other's delight. They can't wait to explore each other's baby filled middle. <<elseif (getSlave($activeSlave.ID).fetish == "pregnancy") && ($subSlave.fetish == "pregnancy") && $subSlave.preg > $subSlave.pregData.normalBirth/2 && getSlave($activeSlave.ID).preg > getSlave($activeSlave.ID).pregData.normalBirth/2>> - getSlave($activeSlave.ID).slaveName and $subSlave.slaveName are both heavily pregnant, much to the other's delight. + <<= getSlave($activeSlave.ID).slaveName>> and $subSlave.slaveName are both heavily pregnant, much to the other's delight. <<elseif ($subSlave.fetish == "pregnancy") && getSlave($activeSlave.ID).bellyPreg >= 300000>> $subSlave.slaveName fetishizes pregnant bellies so much that _he2 is awestruck by getSlave($activeSlave.ID).slaveName's enormous, baby filled middle. <<elseif (getSlave($activeSlave.ID).fetish == "pregnancy") && $subSlave.bellyPreg >= 300000>> - getSlave($activeSlave.ID).slaveName fetishizes pregnant bellies so much that $he is awestruck by $subSlave.slaveName's enormous, baby filled middle. + <<= getSlave($activeSlave.ID).slaveName>> fetishizes pregnant bellies so much that $he is awestruck by $subSlave.slaveName's enormous, baby filled middle. <<elseif ($subSlave.fetish == "pregnancy") && getSlave($activeSlave.ID).preg > getSlave($activeSlave.ID).pregData.normalBirth/2>> - $subSlave.slaveName fetishizes pregnant bellies so much that _he2 thinks getSlave($activeSlave.ID).slaveName gravid middle is one of the sexiest things _he2's ever seen. + $subSlave.slaveName fetishizes pregnant bellies so much that _he2 thinks <<= getSlave($activeSlave.ID).slaveName>> gravid middle is one of the sexiest things _he2's ever seen. <<elseif (getSlave($activeSlave.ID).fetish == "pregnancy") && $subSlave.preg > $subSlave.pregData.normalBirth/2>> - getSlave($activeSlave.ID).slaveName fetishizes pregnant bellies so much that $he thinks $subSlave.slaveName's gravid middle is one of the sexiest things $he's ever seen. + <<= getSlave($activeSlave.ID).slaveName>> fetishizes pregnant bellies so much that $he thinks $subSlave.slaveName's gravid middle is one of the sexiest things $he's ever seen. <<elseif (getSlave($activeSlave.ID).fetish == "pregnancy") && ($subSlave.fetish == "pregnancy") && $subSlave.bellyPreg >= 100 && getSlave($activeSlave.ID).bellyPreg >= 100>> - getSlave($activeSlave.ID).slaveName and $subSlave.slaveName are both pregnant and just beginning to show. They'll both be able to enjoy the other's swelling body. + <<= getSlave($activeSlave.ID).slaveName>> and $subSlave.slaveName are both pregnant and just beginning to show. They'll both be able to enjoy the other's swelling body. <<elseif (getSlave($activeSlave.ID).fetish == "pregnancy") && canAchieveErection($subSlave)>> - getSlave($activeSlave.ID).slaveName can indulge the fantasy that $he's getting pregnant each and every time $subSlave.slaveName cums inside $him. + <<= getSlave($activeSlave.ID).slaveName>> can indulge the fantasy that $he's getting pregnant each and every time $subSlave.slaveName cums inside $him. <<elseif ($subSlave.fetish == "pregnancy") && canAchieveErection(getSlave($activeSlave.ID))>> - $subSlave.slaveName can indulge the fantasy that _he2's getting pregnant each and every time getSlave($activeSlave.ID).slaveName cums inside _him2. + $subSlave.slaveName can indulge the fantasy that _he2's getting pregnant each and every time <<= getSlave($activeSlave.ID).slaveName>> cums inside _him2. <<else>> <<set _matched = 0>> <</if>> diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw index e057206ee1815b49a2f8511d4e37959d9d585382..79313cd2ed1a5dfe069ed90d84bde892ecda4444 100644 --- a/src/pregmod/analyzePregnancy.tw +++ b/src/pregmod/analyzePregnancy.tw @@ -120,7 +120,7 @@ <<if ndef getSlave($activeSlave.ID).womb[_ap].genetics.fatherName>> name not registered <<else>> - getSlave($activeSlave.ID).womb[_ap].genetics.fatherName + <<= getSlave($activeSlave.ID).womb[_ap].genetics.fatherName>> <</if>> </div> <div class="indent"> @@ -131,7 +131,7 @@ <<if ndef getSlave($activeSlave.ID).womb[_ap].genetics.motherName>> name not registered <<else>> - getSlave($activeSlave.ID).womb[_ap].genetics.motherName + <<= getSlave($activeSlave.ID).womb[_ap].genetics.motherName>> <</if>> </div> <div class="indent">