From 51b588c8c069de1dc9c93d9dd07417e232f7feb6 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Mon, 9 Mar 2020 23:53:56 -0700 Subject: [PATCH] Fix some overzealous regexing --- src/npc/interaction/fButt.tw | 6 +++--- src/npc/interaction/fFeet.tw | 2 +- src/npc/interaction/passage/fMarry.tw | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/npc/interaction/fButt.tw b/src/npc/interaction/fButt.tw index 20c237d1b00..182ef51602e 100644 --- a/src/npc/interaction/fButt.tw +++ b/src/npc/interaction/fButt.tw @@ -101,7 +101,7 @@ You call $him over so you can <<set getSlave($AS).anus++>> <<= VCheck.Anal()>> <<elseif getSlave($AS).devotion < -20>> - <<if ($PC.dick == 0)>>You don a cruelly large strap-on, and you do it so $he can <<if canSee(getSlave($AS))>>see<<elseif canHear(getSlave($AS))>>hear<<else>>notice<</if>> it. <</if>>$He tries to refuse you, so you throw $him across the back of the couch next to your desk with $his <<if $seeRace == 1>><<= <<= getSlave($AS).race>>>> <</if>>ass in the air. You finger $his anus<<if (getSlave($AS).vagina != -1)>> while fucking $his pussy<<elseif hasBothLegs(getSlave($AS))>> while frotting $his thighs<</if>> for a bit and then switch to $his now-ready anus. $He sobs as you penetrate $his rectum. + <<if ($PC.dick == 0)>>You don a cruelly large strap-on, and you do it so $he can <<if canSee(getSlave($AS))>>see<<elseif canHear(getSlave($AS))>>hear<<else>>notice<</if>> it. <</if>>$He tries to refuse you, so you throw $him across the back of the couch next to your desk with $his <<if $seeRace == 1>><<= getSlave($AS).race>> <</if>>ass in the air. You finger $his anus<<if (getSlave($AS).vagina != -1)>> while fucking $his pussy<<elseif hasBothLegs(getSlave($AS))>> while frotting $his thighs<</if>> for a bit and then switch to $his now-ready anus. $He sobs as you penetrate $his rectum. <<if (getSlave($AS).dick != 0) && canAchieveErection(getSlave($AS))>> <<if getSlave($AS).prostate == 0>> $He lacks a prostate, denying $him any real pleasure. $His dick stays flaccid as you rape $him. @@ -117,7 +117,7 @@ You call $him over so you can <</if>> <<= VCheck.Both()>> <<elseif getSlave($AS).devotion <= 50>> - You throw $him across the back of the couch next to your desk with $his ass in the air<<if ($PC.dick == 0)>>, and don a strap-on<</if>>. You finger $his <<if $seeRace == 1>><<= <<= getSlave($AS).race>>>> <</if>>ass while <<if (getSlave($AS).vagina !== -1)>>fucking $his pussy<<else>>frotting $his thighs<</if>> for a bit and then switch to $his now-ready anus. <<if (getSlave($AS).anus == 1)>>$His ass is so tight that you have to work yourself in.<<elseif (getSlave($AS).anus == 2)>>Your <<if ($PC.dick == 0)>>fake dick<<else>>cock<</if>> slides easily up $his ass.<<else>>You slide into $his already-gaping asspussy with ease.<</if>> $He gasps as you penetrate $his rectum, but you timed the switch so that $he was on the verge of orgasm, and $he comes immediately. + You throw $him across the back of the couch next to your desk with $his ass in the air<<if ($PC.dick == 0)>>, and don a strap-on<</if>>. You finger $his <<if $seeRace == 1>><<= getSlave($AS).race>> <</if>>ass while <<if (getSlave($AS).vagina !== -1)>>fucking $his pussy<<else>>frotting $his thighs<</if>> for a bit and then switch to $his now-ready anus. <<if (getSlave($AS).anus == 1)>>$His ass is so tight that you have to work yourself in.<<elseif (getSlave($AS).anus == 2)>>Your <<if ($PC.dick == 0)>>fake dick<<else>>cock<</if>> slides easily up $his ass.<<else>>You slide into $his already-gaping asspussy with ease.<</if>> $He gasps as you penetrate $his rectum, but you timed the switch so that $he was on the verge of orgasm, and $he comes immediately. <<if (getSlave($AS).dick !== 0) && canAchieveErection(getSlave($AS))>> <<if getSlave($AS).chastityPenis>> $He managed to stay soft within $his dick chastity, but $he dribbled a lot of precum onto the couch. You make $his lick it up, and $he obeys, shuddering with unsatisfied arousal. @@ -129,7 +129,7 @@ You call $him over so you can <</if>> <<= VCheck.Both()>> <<else>> - <<if hasAnyLegs(getSlave($AS))>>$He kneels on the floor<<else>>You lay $him on the floor<</if>> so you can take $him at will<<if ($PC.dick == 0)>>, and don a strap-on<</if>>. You finger $his <<if $seeRace == 1>><<= <<= getSlave($AS).race>>>> <</if>>ass while + <<if hasAnyLegs(getSlave($AS))>>$He kneels on the floor<<else>>You lay $him on the floor<</if>> so you can take $him at will<<if ($PC.dick == 0)>>, and don a strap-on<</if>>. You finger $his <<if $seeRace == 1>><<= getSlave($AS).race>> <</if>>ass while <<if canDoVaginal(getSlave($AS))>> fucking $his pussy <<else>> diff --git a/src/npc/interaction/fFeet.tw b/src/npc/interaction/fFeet.tw index 06f7459aea7..e1c6bdc4d19 100644 --- a/src/npc/interaction/fFeet.tw +++ b/src/npc/interaction/fFeet.tw @@ -395,7 +395,7 @@ You call <<= getSlave($AS).slaveName>> to your office, telling $him to use $his <</if>> shivering in anticipation. <<elseif getSlave($AS).fetish == "humiliation" && getSlave($AS).fetishKnown == 1 && getSlave($AS).fetishStrength >= 60>> - <<= getSlave($AS).slaveName>> slowly strokes your cock with $his _nounF, getting off on the degrading use of $his _nounF and avoiding your gaze. $He is showing an embarrassed smile<<if (skinToneLevel(<<= getSlave($AS).skin>>) > 22)>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks. + <<= getSlave($AS).slaveName>> slowly strokes your cock with $his _nounF, getting off on the degrading use of $his _nounF and avoiding your gaze. $He is showing an embarrassed smile<<if (skinToneLevel(getSlave($AS).skin) > 22)>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks. <<elseif getSlave($AS).fetish == "boobs" && getSlave($AS).fetishKnown == 1 && getSlave($AS).fetishStrength >= 60 && hasAnyArms(getSlave($AS))>> As <<= getSlave($AS).slaveName>> deftly strokes your cock with $his _nounF, $his hand<<if hasBothArms(getSlave($AS))>>s<</if>> play<<if !hasBothArms(getSlave($AS))>>s<</if>> with $his <<if getSlave($AS).boobs < 300>>erect nipples. <<elseif getSlave($AS).boobs < 500>>small chest. <<elseif getSlave($AS).boobs >= 18000>>_boobs breasts, though $he can't reach $his nipples. <<else>>_boobs breasts and erect nipples. <</if>> $He is certainly giving you plenty of sexy options for you to watch. <<elseif getSlave($AS).fetish == "sadist" && getSlave($AS).fetishKnown == 1 && getSlave($AS).fetishStrength >= 60>> diff --git a/src/npc/interaction/passage/fMarry.tw b/src/npc/interaction/passage/fMarry.tw index 62d81f1156f..54cb46b5594 100644 --- a/src/npc/interaction/passage/fMarry.tw +++ b/src/npc/interaction/passage/fMarry.tw @@ -25,10 +25,10 @@ <</if>> <</if>> <<if SlaveStatsChecker.checkForLisp(getSlave($AS))>> - <<set _myName = lispReplace(<<= getSlave($AS).slaveName>>)>> + <<set _myName = lispReplace(getSlave($AS).slaveName)>> <<set _playerSurname = lispReplace($PC.slaveSurname)>> <<else>> - <<set _myName = <<= getSlave($AS).slaveName>>>> + <<set _myName = getSlave($AS).slaveName>> <<set _playerSurname = $PC.slaveSurname>> <</if>> -- GitLab