Browse Source

[added] hair status to pre-sleep screen in bed2.
[fixed] unnecessary space in body hairstyle descriptions (not used anywhere but bed2).

3xpurt 5 years ago
parent
commit
2991076411
2 changed files with 20 additions and 4 deletions
  1. 16 0
      locations/bed2.qsrc
  2. 4 4
      locations/body.qsrc

+ 16 - 0
locations/bed2.qsrc

@@ -233,6 +233,22 @@ if $ARGS[0] = 'sleep':
 		*nl
 		'You were too tired to worry about your underwear, so for tonight you left it as is.'
 	end
+	if hscrunchw = 1:
+		*nl
+		'<<$hscrunch>>.'
+	elseif hscrunchw = 2:
+		*nl
+		'<<$hpigtail>>'
+	elseif hpingripw > 0:
+		*nl
+		'<<$hpingrip>>'
+	elseif hbraids > 0:
+		*nl
+		'<<$hbraids>>'
+	else
+		*nl
+		'Your hair is loose and free.'
+	end
 	if pcs_makeup > 1:
 		pcs_makeup = 0
 		vidageday -= 1

+ 4 - 4
locations/body.qsrc

@@ -786,7 +786,7 @@ if hscrunchw <= 0:
 	$pcdesc_hairobject = 'hair'
 	$pcdesc_hairobjectwordy = 'loose and free <<$pcs_haircol>> hair'
 elseif hscrunchw = 1:
-	$hscrunch = ' A hair-tie holds your hair in place with a ponytail.'
+	$hscrunch = 'A hair-tie holds your hair in place with a ponytail.'
 	$hpigtail = ''
 	rand_hairstyle = rand(0)
 	rand_hairobject = rand(0)
@@ -798,7 +798,7 @@ elseif hscrunchw = 1:
 else
 	!! The actual, specific setting for hscrunchw when pigtails are desired is 2, but it is better to have a catch-all. Adjust the else above into an elseif set for 2 if more styles involving scrunchies are added.
 	$hscrunch = ''
-	$hpigtail = ' Two scrunchies hold your hair up into two cute, playful twin tails.'
+	$hpigtail = 'Two scrunchies hold your hair up into two cute, playful twin tails.'
 	rand_hairstyle = rand(0)
 	rand_hairobject = rand(0)
 	if rand_hairstyle = 0:$pcdesc_hairstylerandom = 'pigtailed'
@@ -818,7 +818,7 @@ if hpingripw <= 0:
 	$pcdesc_hairobject = 'hair'
 	$pcdesc_hairobjectwordy = 'loose and free <<$pcs_haircol>> hair'
 else
-	$hpingrip = ' Hair-pins hold your hair in place in a stylish updo.'
+	$hpingrip = 'Hair-pins hold your hair in place in a stylish updo.'
 	rand_hairstyle = rand(0,1)
 	rand_hairobject = rand(0)
 	if rand_hairstyle = 0:$pcdesc_hairstylerandom = 'upswept'
@@ -839,7 +839,7 @@ if hbraids <= 0:
 	$pcdesc_hairobject = 'hair'
 	$pcdesc_hairobjectwordy = 'loose and free <<$pcs_haircol>> hair'
 else	
-	$hbraids = ' Your hair is beautifully braided.'
+	$hbraids = 'Your hair is beautifully braided.'
 	rand_hairstyle = rand(0,1)
 	rand_hairobject = rand(0,1)
 	if rand_hairstyle = 0:$pcdesc_hairstylerandom = 'braided'