From 970b54e6e9a77d6afd7f4bb2c1dea58ec9e08e36 Mon Sep 17 00:00:00 2001
From: fcanon <fcanon@nowhere.na>
Date: Wed, 7 Jun 2017 15:47:02 -0400
Subject: [PATCH] vanilla fixes

---
 src/npc/acquisition.tw                     | 2 +-
 src/uncategorized/RESS.tw                  | 2 +-
 src/uncategorized/randomIndividualEvent.tw | 2 +-
 src/uncategorized/shops.tw                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 7d45408aa26..71be7a05069 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -325,7 +325,7 @@ The previous owner seems to have left in something of a hurry.
 		<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(25,45), $activeSlave.health = 100>>
 		<<set $activeSlave.face = random(15,100)>>
 		<<set $activeSlave.weight = random(-5,5)>>
-		<<set $activeSlave.muscle = random(10,25)>>
+		<<set $activeSlave.muscles = random(10,25)>>
 		<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
 		<<if $activeSlave.vagina > -1>>
 			<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 6f899acddc1..d004fa72dde 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -8723,7 +8723,7 @@ By the time you've finished with her sensitive ass, it shines red, and she is cr
 <br><<link "Let her know you think she's attractive, too">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-		The slaves continue their gossip until $activeSlave.slaveName feels a pair of <<if $PC.title == 1>>strong<<else>>firm, feminine<</if>> hands grip the sides of her <<if $activeSlave.preg > 20>>gravid<<elseif $activeSlave.waist < -95>>cartoonishly narrow<<elseif $activeSlave.weight > 30>>pudgy<<elseif $activeSlave.muscle > 30>>ripped<<elseif $activeSlave.waist < -10>>wasp<<elseif $activeSlave.weight > 10>>plush<<elseif $activeSlave.muscle > 5>>toned<<elseif $activeSlave.weight >= -10>>soft<<else>>thin<</if>> waist. She starts but doesn't try to turn, and shivers as you run your hands up <<if $activeSlave.muscle > 30>>the muscles that jacket her ribs<<elseif $activeSlave.weight > 30>>the soft flesh that pads her ribs<<else>>her ribcage<</if>> and forward <<if $activeSlave.boobs > 3000>>into the soft, weighty place formed by the overhang of her massive breasts<<elseif $activeSlave.boobs > 300>>to cup her breasts<<else>>to clasp her around the sternum<</if>> and pull her back into your arms. The other slave watches silently, awaiting some cue as to whether she's to join in or return to breakfast; you give her a flick of your chin, and she turns away, leaving you with $activeSlave.slaveName, embracing among the eating slaves.
+		The slaves continue their gossip until $activeSlave.slaveName feels a pair of <<if $PC.title == 1>>strong<<else>>firm, feminine<</if>> hands grip the sides of her <<if $activeSlave.preg > 20>>gravid<<elseif $activeSlave.waist < -95>>cartoonishly narrow<<elseif $activeSlave.weight > 30>>pudgy<<elseif $activeSlave.muscles > 30>>ripped<<elseif $activeSlave.waist < -10>>wasp<<elseif $activeSlave.weight > 10>>plush<<elseif $activeSlave.muscles > 5>>toned<<elseif $activeSlave.weight >= -10>>soft<<else>>thin<</if>> waist. She starts but doesn't try to turn, and shivers as you run your hands up <<if $activeSlave.muscles > 30>>the muscles that jacket her ribs<<elseif $activeSlave.weight > 30>>the soft flesh that pads her ribs<<else>>her ribcage<</if>> and forward <<if $activeSlave.boobs > 3000>>into the soft, weighty place formed by the overhang of her massive breasts<<elseif $activeSlave.boobs > 300>>to cup her breasts<<else>>to clasp her around the sternum<</if>> and pull her back into your arms. The other slave watches silently, awaiting some cue as to whether she's to join in or return to breakfast; you give her a flick of your chin, and she turns away, leaving you with $activeSlave.slaveName, embracing among the eating slaves.
 		<br><br>
 		You whisper into her ear that you think she's attractive, <<if $PC.dick == 1>>and point out that she can feel the proof between her buttocks. You're hard, and your stiff prick is poking her in the rear. She gasps and shifts a little, and you nestle your dick even closer into the warm place between her legs and ass.<<else>>and tell her that you can prove it. You grab one of her hands and pull it around behind her, between you, making her feel your pussy. She gasps at how wet it is.<</if>> "An old <<s>>lave like me, <<Master>>?" she echoes in a small voice. An old slave like her, you confirm, and tell her that right now,
 		<<if $PC.dick == 1>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index a5c25026db3..2cd1a4e6629 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -778,7 +778,7 @@
 <</if>>
 
 <<if $eventSlave.health > 90>>
-<<if $eventSlave.muscle > 5>>
+<<if $eventSlave.muscles > 5>>
 <<if $eventSlave.weight <= 30>>
 <<if $eventSlave.weight >= -30>>
 <<if $eventSlave.trust > 50>>
diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw
index 4fc1756fd4f..ab795d99fac 100644
--- a/src/uncategorized/shops.tw
+++ b/src/uncategorized/shops.tw
@@ -31,7 +31,7 @@ This is a section of the promenade
 	dedicated to Transformation Fetishism. Autosurgeries are expensive, and require a lot of infrastructure, so almost all of your citizens have to send their slaves to clinics for surgical transformation. These establishments attempt to differentiate themselves by specializing in different surgeries, and advertising what they're best at.
 	<span id="result"><<link "Shop around">><<replace "#result">>You decide to shop around the best surgery clinics, to put in an appearance and check out the latest developments available to citizens less exalted than yourself. The slave salesgirls are all heavily modified silicone bimbos, with an emphasis on whatever their owner's surgical specialty is. The lip specialists' salesgirls have facepussies so huge they can't talk at all, so they wear touchscreens around their necks that do the talking for them.<</replace>><</link>></span>
 <<case "Youth Preferentialist">>
-	dedicated to Youth Preferentialism. The shops here are quite varied. Some, like the tailors, only betray their focus on young slaves by their selections of schoolgirl outfits, girlish leotards, and the like. There are several high-end slave trainers who specialize in maximizing slaves' <<if $seeDicks != 0>>vaginal and <</if>>anal skills while they're still virgins, with instruction only.
+	dedicated to Youth Preferentialism. The shops here are quite varied. Some, like the tailors, only betray their focus on young slaves by their selections of schoolgirl outfits, girlish leotards, and the like. There are several high-end slave trainers who specialize in maximizing slaves' <<if $seeDicks < 100>>vaginal and <</if>>anal skills while they're still virgins, with instruction only.
 	<span id="result"><<link "Look in on the classes">><<replace "#result">>You decide to put in an appearance and look into the training sessions. Of course, the trainers are very eager to share all the details with the arcology owner, and have you seen displaying an interest in their work. You're shown a classroom of obedient young slaves, right at sale age, paying rapt attention to a male trainer and a slave at the head of the classroom. He's reviewing how to relax during one's first time before 'deflowering' the teacher's assistant, whose <<if $seeDicks > 25>>asshole is allowed to rest and return to virgin tightness<<else>>hymen is surgically restored<</if>> between sessions.<</replace>><</link>></span>
 <<case "Maturity Preferentialist">>
 	dedicated to Maturity Preferentialism. It's not immediately apparent, though the stores here offer fashions that are obviously designed to flatter mature women, and anti-aging products of all kinds are prominently displayed. What there are, though, are quite a number of pretty, scantily clad female citizens here, obviously retired from sexual slavery and looking to slake their still trained libidoes with any handsome fellow citizen interested.
-- 
GitLab