From f0a2571211c3621f06798760d3a2cc89299aabf9 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 10 Apr 2018 13:42:34 -0400
Subject: [PATCH] whiny merges
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 11 ++++
src/npc/descriptions/fFuckdollWidgets.tw | 9 +++
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/seWedding.tw | 67 ++++++++++++++++++++
src/uncategorized/slaveInteract.tw | 2 +-
src/utility/miscWidgets.tw | 2 +-
6 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c5e3da8cc1b..93cabc58918 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,17 @@
0.10.7.1-0.1.x
+4/10/2018
+
+ 37
+ -added ability to give slaves your surname during marriage
+ -unbound slaveInteract impreg block from fuckdoll suit (it now checks .fuckdoll instead)
+
+ 36
+ -code cleanup
+ -many more cases caught for supremacist's law
+ -defiant slaves get excess trust converted into negative rep
+
4/09/2018
35
diff --git a/src/npc/descriptions/fFuckdollWidgets.tw b/src/npc/descriptions/fFuckdollWidgets.tw
index 169364f7405..2b1affc9d8d 100644
--- a/src/npc/descriptions/fFuckdollWidgets.tw
+++ b/src/npc/descriptions/fFuckdollWidgets.tw
@@ -95,6 +95,15 @@ You climax<<if $PC.dick == 1>>, your cum shooting forward to splash against its
<</widget>>
+<<widget "FFuckdollImpreg">>
+
+<<if passage() != "Slave Interact">>
+ <<set _i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
+ <<set $slaves[_i] = $activeSlave>>
+<</if>>
+
+<</widget>>
+
<<widget "FFuckdollAnal">>
<<set $activeSlave.analCount++, $analTotal++>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 7f6239626b1..6e7a0415f38 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -10466,7 +10466,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<elseif $activeSlave.weight > 95>>
well padded
<<elseif $activeSlave.weight > 30>>
- fat
+ chubby
<<elseif ($activeSlave.muscles > 30)>>
muscular
<<elseif ($activeSlave.weight > 10)>>
diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw
index e0a03369301..eb36f2eee50 100644
--- a/src/uncategorized/seWedding.tw
+++ b/src/uncategorized/seWedding.tw
@@ -376,6 +376,28 @@
on her <<if $activeSlave.devotion < -20 && $activeSlave.trust <= 20>>trembling <</if>>finger.
<</if>>
There is no ring for you, since this marriage does not bind you.
+ <br>
+ <<if $PC.surname>>
+ <br><br><span id="surnaming">
+ <<link "Give her your surname too">>
+ <<replace "#surnaming">>
+ <<set $activeSlave.slaveSurname = $PC.surname>>
+ You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname.
+ <<if $activeSlave.fetish == "mindbroken">>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and shows no reaction. Like many things, names mean nothing to her now. Your guests, on the other hand, appreciate the gift.
+ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again. Not only is she to be blessed with your child, but she's to take your surname as well.
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and scoffs audibly. Just another burden for her to carry; just like the child soon to be growing in her womb.
+ <<elseif $activeSlave.devotion < -20>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again. Not only are you binding her to you with your child, but with your name as well.
+ <<else>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and nods acceptingly. Your will is her will, after all.
+ <</if>>
+ <</replace>>
+ <</link>>
+ </span>
+ <</if>>
<br><br>
<<if $activeSlave.fetish == "mindbroken">>
$activeSlave.slaveName is mindbroken, so you gather her up and hold her in front of you, pulling her panties off as you do. She follows your motions like a ragdoll. You maneuver your dick inside her while holding her against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>. Then you pull her knees up to give your guests a good view as you fuck her fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>cunt<</if>>. She is left to face them, staring off into space. Though she faces the crowd, her mind is empty; this might as well be any other fucking to her. She twitches ever so slightly when your seed flows into her, orgasming robotically to @@.green;applause from your guests.@@ You’ll fuck her repeatedly over the next few days, ensuring impregnation.
@@ -526,7 +548,30 @@
<br><br>
Once the ceremony is complete, you scoop up your new slave wife to carry her back into the master bedroom. She rests her head against you, so tired that she’s grateful for the break from standing. By the time she’s home, she’s fast asleep. You set her gently down on the bed and curl up behind her, feeling the animal warmth of her body as the exhausted slave’s chest rises and falls with her breathing.
<</if>>
+ <br>
+ <<if $PC.surname>>
+ <br><br><span id="surnaming">
+ <<link "Give her your surname as well">>
+ <<replace "#surnaming">>
+ <<set $activeSlave.slaveSurname = $PC.surname>>
+ You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname.
+ <<if $activeSlave.fetish == "mindbroken">>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and shows no reaction. Like many things, names mean nothing to her now.
+ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again.
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and scoffs audibly.
+ <<elseif $activeSlave.devotion < -20>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again.
+ <<else>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and nods acceptingly.
+ <</if>>
+ <</replace>>
+ <</link>>
+ </span>
+ <</if>>
+
<<if ndef $activeSlave.publicCount>>
<<set $activeSlave.publicCount = 0>>
<</if>>
@@ -695,6 +740,28 @@
<</if>>
<br><br>
When she's in front of you, <<if $activeSlave.amp == 1>>the slave carrying her limbless torso sets her down on the floor in front of you and props her up so her head is level with your crotch<<else>>she gets down on her knees so her head is level with your crotch<</if>>. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around her neck, since she lacks fingers to wear it on<<else>>on her finger<</if>>. There is no ring for you, since this marriage does not bind you.
+ <br>
+ <<if $PC.surname>>
+ <br><br><span id="surnaming">
+ <<link "Give her your surname">>
+ <<replace "#surnaming">>
+ <<set $activeSlave.slaveSurname = $PC.surname>>
+ You also proclaim your new slave wife $activeSlave.slaveName $activeSlave.slaveSurname.
+ <<if $activeSlave.fetish == "mindbroken">>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and shows no reaction. Like many things, names mean nothing to her now. Your guests, on the other hand, appreciate the gift.
+ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again; it's like a dream come true.
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and scoffs audibly; just another burden for her to carry.
+ <<elseif $activeSlave.devotion < -20>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again; this is nothing more than another unwanted link to you.
+ <<else>>
+ The new Mrs. $activeSlave.slaveSurname hears this, of course, and nods acceptingly. Your will is her will, after all.
+ <</if>>
+ <</replace>>
+ <</link>>
+ </span>
+ <</if>>
<br><br>
<<if $activeSlave.fetish == "mindbroken">>
Then, you flip her veil over her head so she can <<if $PC.dick == 1>>suck your dick<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>> in front of your guests, as the ceremony requires. She approaches her task with robotic obedience. You climax promptly, <<if $PC.dick == 1>>shooting your cum down her throat<<else>>covering her face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave wife to carry her back into the master bedroom. She absentmindedly rests her head against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle her in your arms, gazing up at you with empty eyes.
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 6fa4f11c1f2..ac208055a7d 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -115,7 +115,7 @@
| <<link "Get a footjob">><<replace "#miniscene">><<include "FFeet">><br> <</replace>><</link>>
<</if>>
<span id = "impreg">
- <<if (canGetPregnant($activeSlave)) && ($activeSlave.clothes != "a Fuckdoll suit") && $seePreg != 0>>
+ <<if (canGetPregnant($activeSlave)) && ($activeSlave.fuckdoll == 0) && $seePreg != 0>>
<<if ($PC.dick != 0 && $activeSlave.eggType == "human")>>
| <<link "Impregnate her yourself">><<replace "#miniscene">><<include "FPCImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 7197bfab903..4d6a56df854 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -576,7 +576,7 @@
%/
<<widget "SlaveInteractImpreg">>
<<replace #impreg>>
- <<if (canGetPregnant($activeSlave)) && ($activeSlave.clothes != "a Fuckdoll suit") && $seePreg != 0>>
+ <<if (canGetPregnant($activeSlave)) && ($activeSlave.fuckdoll == 0) && $seePreg != 0>>
<<if ($PC.dick != 0 && $activeSlave.eggType == "human")>>
| <<link "Impregnate her yourself">><<replace "#miniscene">><<include "FPCImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<</if>>
--
GitLab