From 423099e91f0ed0c9adb6040f684023dd4ccaaee8 Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Sun, 15 Jul 2018 17:24:05 -0400 Subject: [PATCH] Fixes --- src/SecExp/attackReport.tw | 20 -------------------- src/pregmod/fSlaveSlaveDickConsummate.tw | 8 ++++---- src/pregmod/fSlaveSlaveVagConsummate.tw | 2 +- src/uncategorized/REFI.tw | 1 - src/uncategorized/saLongTermEffects.tw | 4 ++-- src/utility/miscWidgets.tw | 2 +- 6 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 82a8c2056d6..83696e8eb68 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -862,16 +862,6 @@ Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander. <</if>> <<elseif $Bodyguard.prestige >= 2>> - <<if $deployingMilitia == 1>> - Your volunteers - <<if $deployingMercs == 1>> - and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. - <<else>> - are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. - <</if>> - <<elseif $deployingMercs == 1>> - Your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. - <</if>> <<if $deployingMilitia == 1>> Your <<if $deployingMercs == 1 && $SFIntervention == 1>> @@ -1008,16 +998,6 @@ Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander. <</if>> <<elseif $HeadGirl.prestige >= 2>> - <<if $deployingMilitia == 1>> - Your volunteers - <<if $deployingMercs == 1>> - and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. - <<else>> - are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. - <</if>> - <<elseif $deployingMercs == 1>> - Your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave. - <</if>> <<if $deployingMilitia == 1>> Your <<if $deployingMercs == 1 && $SFIntervention == 1>> diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw index b2c04bd4c67..aea96c436eb 100644 --- a/src/pregmod/fSlaveSlaveDickConsummate.tw +++ b/src/pregmod/fSlaveSlaveDickConsummate.tw @@ -133,7 +133,7 @@ You call $slaverapistx.slaveName into the room. <<if _isIncest == 1>> <<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>> the slave that is both $his mother and $his father, - <<elseif $slaverapistx.mother == $activeSlave.ID>> + <<elseif $slaverapistx.mother == $activeSlave.ID || $slaverapistx.father == $activeSlave.ID>> $his own daughter, <<elseif $activeSlave.mother == $slaverapistx.ID>> $his own mother, @@ -151,7 +151,7 @@ You call $slaverapistx.slaveName into the room. $activeSlave.slaveName's simple mind does not even acknowledge that $slaverapistx.slaveName is <<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>> the slave that is both $his mother and $his father, - <<elseif $slaverapistx.mother == $activeSlave.ID>> + <<elseif $slaverapistx.mother == $activeSlave.ID || $slaverapistx.father == $activeSlave.ID>> $his own daughter, <<elseif $activeSlave.mother == $slaverapistx.ID>> $his own mother, @@ -170,7 +170,7 @@ You call $slaverapistx.slaveName into the room. $activeSlave.slaveName is fully naked and <<if canSee($activeSlave)>>looking up at<<else>>waiting in front of<</if>> <<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>> the slave that is both $his mother and $his father, - <<elseif $slaverapistx.mother == $activeSlave.ID>> + <<elseif $slaverapistx.mother == $activeSlave.ID || $slaverapistx.father == $activeSlave.ID>> $his own daughter, <<elseif $activeSlave.mother == $slaverapistx.ID>> $his own mother, @@ -229,7 +229,7 @@ You call $slaverapistx.slaveName into the room. $slaverapistx.slaveName sees <<if $slaverapistx.father == $activeSlave.ID && $slaverapistx.mother == $activeSlave.ID>> the slave that is both _his2 mother and _his2 father - <<elseif $activeSlave.mother == $slaverapistx.ID>> + <<elseif $activeSlave.mother == $slaverapistx.ID || $activeSlave.father == $slaverapistx.ID>> _his2 own daughter <<elseif $slaverapistx.mother == $activeSlave.ID>> _his2 own mother diff --git a/src/pregmod/fSlaveSlaveVagConsummate.tw b/src/pregmod/fSlaveSlaveVagConsummate.tw index 6c68793ec9e..fee45e8ed23 100644 --- a/src/pregmod/fSlaveSlaveVagConsummate.tw +++ b/src/pregmod/fSlaveSlaveVagConsummate.tw @@ -104,7 +104,7 @@ Next, you see to $activeSlave.slaveName. $activeSlave.slaveName is fully naked and <<if canSee($activeSlave)>>looking up at<<else>>waiting in front of<</if>> <<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>> the slave that is both $his mother and $his father, - <<elseif $slaverapistx.mother == $activeSlave.ID>> + <<elseif $slaverapistx.mother == $activeSlave.ID || $slaverapistx.father == $activeSlave.ID>> $his own daughter, <<elseif $activeSlave.mother == $slaverapistx.ID>> $his own mother, diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw index 5fbe202a885..1b6b60fe1ec 100644 --- a/src/uncategorized/REFI.tw +++ b/src/uncategorized/REFI.tw @@ -741,7 +741,6 @@ There was a glint of envy <<if canSee($activeSlave)>>in her eyes when she saw<<e <<else>> urethral torment. <</if>> - <<if $activeSlave.dick > 0>>dick abuse<<else>>clit torture<</if>> @@.hotpink;She has become more devoted to you,@@ and @@.lightcoral;she has started to get off on pain.@@ <<set $activeSlave.devotion += 4>> <<set $activeSlave.fetish = "masochist", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 986e158c00a..6a4a356daed 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6450,9 +6450,9 @@ ** Voice. ** Small chance for any non-childlike voice. */ - <<if ((_countNCS < 3) && ($slaves[$i].voice < 3) && (random(1,100) > ($slaves[$i].voice * 15)))>> + <<if ((_countNCS < 3) && ($slaves[$i].voice < 3) && $slaves[$i].voice != 0 && (random(1,100) > ($slaves[$i].voice * 15)))>> $possessiveCap @@.orange;NCS@@ has @@.lime;raised the pitch of $possessive voice, $pronoun now sounds more <<if $slaves[$i].voice == 1>>feminine<<else>>childlike<</if>>.@@ - <<set $slaves[$i].voice -= 1, _countNCS++>> + <<set $slaves[$i].voice += 1, _countNCS++>> <</if>> /* * Pussy/Ass-Pussy rejuvination. diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 690460ea8cc..3140f743a2d 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -2028,7 +2028,7 @@ This experience Call as <<EventNameLink>> $args[0]: Slave. */ -<<widget "EventNameLink">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><<else>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</if>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>> +<<widget "EventNameLink">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>><<set _nameLink = $args[0].slaveSurname>><<set _nameLink += " " + $args[0].slaveName>><<else>><<set _nameLink = $args[0].slaveName>><</if>><<default>><<set _nameLink = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _nameLink += " " + $args[0].slaveSurname>><</if>><</switch>><<else>><<set _nameLink = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _nameLink += " " + $args[0].slaveSurname>><</if>><</if>><span id="name"><<print "[[_nameLink|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>> /* Call as <<EventNameDelink>> -- GitLab