From 9925dae09ab5cabbebfebb95cb87d3511ae64a0a Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 8 Mar 2020 22:37:27 -0400
Subject: [PATCH] fixes

---
 src/npc/interaction/fAbuse.tw | 2 +-
 src/npc/interaction/fFeet.tw  | 4 ++--
 src/npc/interaction/fPat.tw   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/npc/interaction/fAbuse.tw b/src/npc/interaction/fAbuse.tw
index be8c317e9b6..41fbf1d0e50 100644
--- a/src/npc/interaction/fAbuse.tw
+++ b/src/npc/interaction/fAbuse.tw
@@ -434,7 +434,7 @@ from your victim.
 			The anal rape leaves $him with a sore butthole.
 		<<elseif random(1,100) > 50>>
 			<<set getSlave($AS).minorInjury = either("black eye", "bruise", "split lip")>>
-			Your abuse gave $him a getSlave($AS).minorInjury.
+			Your abuse gave $him a <<= getSlave($AS).minorInjury>>.
 		<</if>>
 	<</if>>
 <</if>>
diff --git a/src/npc/interaction/fFeet.tw b/src/npc/interaction/fFeet.tw
index 3cb0ee3014e..06f7459aea7 100644
--- a/src/npc/interaction/fFeet.tw
+++ b/src/npc/interaction/fFeet.tw
@@ -217,9 +217,9 @@
 <</if>>
 
 <<if (getSlave($AS).skin == getSlave($AS).race) || (getSlave($AS).race == "white") || (getSlave($AS).race == "black") || ($seeRace == 0)>>
-	<<set _skin = "getSlave($AS).skin">>
+	<<set _skin = getSlave($AS).skin>>
 <<else>>
-	<<set _skin = "getSlave($AS).skin getSlave($AS).race">>
+	<<set _skin = getSlave($AS).skin + " " + getSlave($AS).race>>
 <</if>>
 
 <<if hasBothLegs(getSlave($AS))>>
diff --git a/src/npc/interaction/fPat.tw b/src/npc/interaction/fPat.tw
index c9eed459551..a56458e24b4 100644
--- a/src/npc/interaction/fPat.tw
+++ b/src/npc/interaction/fPat.tw
@@ -138,7 +138,7 @@ You walk around $him, drawing closer and slowly resting your hand on $his head.
 <<elseif getSlave($AS).devotion > 20>>
 	$He willingly accepts it. As you tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's roiling emotions, and finally submission. You can still sense considerable turmoil in the <<if (getSlave($AS).physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch. As you continue your ministrations, your slave slowly, and with more then a bit of uncertainty, finally starts to relax. $He looks at you with confusion and trepidation. Your eyes betray nothing however — you simply smile and press $his head into your <<if $PC.boobs >= 300>>soft breasts<<else>>masculine chest<</if>>, all the while enjoying the feeling of your <<if getSlave($AS).hStyle == "shaven bald" || getSlave($AS).bald == 1>>hands gliding over $his smooth head<<else>>fingers gliding through $his hair<</if>>.
 <<elseif (getSlave($AS).devotion < -20) && (getSlave($AS).trust >= 20)>>
-	$He doesn't react to your touch, remaining as still as statue, the same defiant expression on $his face. $He still doesn't react when you brush your fingers down the side of $his head or when you <<if getSlave($AS).hStyle == "shaven bald" || getSlave($AS).bald == 1>>stroke $his smooth head<<else>>run your fingers through $his hair<</if>>. $He does react when you gently rest your thumb on $his lips, however, by suddenly giving you a fierce bite. Cursing, you pull your hand back and examine it — $he didn't bite deep enough to draw blood, but the area is now red and puffy. Furious, you backhand $him across the face<<if random(1,100) > 80>><<set getSlave($AS).minorInjury = either("black eye", "bruise", "split lip")>>, giving $him a @@.red;getSlave($AS).minorInjury@@<</if>>.
+	$He doesn't react to your touch, remaining as still as statue, the same defiant expression on $his face. $He still doesn't react when you brush your fingers down the side of $his head or when you <<if getSlave($AS).hStyle == "shaven bald" || getSlave($AS).bald == 1>>stroke $his smooth head<<else>>run your fingers through $his hair<</if>>. $He does react when you gently rest your thumb on $his lips, however, by suddenly giving you a fierce bite. Cursing, you pull your hand back and examine it — $he didn't bite deep enough to draw blood, but the area is now red and puffy. Furious, you backhand $him across the face<<if random(1,100) > 80>><<set getSlave($AS).minorInjury = either("black eye", "bruise", "split lip")>>, giving $him a @@.red;<<= getSlave($AS).minorInjury>>@@<</if>>.
 <<elseif getSlave($AS).devotion >= -20 && getSlave($AS).trust < -20>>
 	$He shakes at your touch fearfully. As you tenderly brush your fingers down $his unresisting head, you appreciate this expression of your slave's subservience, $his eagerness to avoid punishment making $him stiffen, $his nervousness easily apparent. You continue stroking $him, enjoying $his fear, as the physical intimacy slowly does its work. $He starts to relax, $his resistance easing as $his eyes start to close. Your hands continue to gently scratch at $his scalp, and you enjoy the sensation as well as the feeling of power over your hapless slave. Gently, slowly, so not as to spook $him, you ease your property's head back into your <<if $PC.boobs >= 300>>breasts<<else>>chest<</if>>. Nevertheless your slave starts at the action, but at your insistence finally gives in to the motion, and finally relaxes against you.
 <<elseif getSlave($AS).trust < -50>>
-- 
GitLab