1
0
Prechádzať zdrojové kódy

Added therapist hairstyle event.

Thavus 2 rokov pred
rodič
commit
64ac6c1e23

+ 17 - 14
locations/barbershop.qsrc

@@ -65,19 +65,22 @@ if $ARGS[0] = 'start':
 	end
 
 	*nl
-
-	if pcs_hairlng <= 80:
-		'Your hair is not long enough to be curled.'
-	else
-		'<a href=' + iif(money >= 1500, '"exec:gt ''barbershop'', ''perm''"','') + '>Curl your hair - 1500 <b>₽</b></a>'
-	end
+	if hypnoHairStyle ! 1:
+		if pcs_hairlng <= 80:
+			'Your hair is not long enough to be curled.'
+		else
+			'<a href=' + iif(money >= 1500, '"exec:gt ''barbershop'', ''perm''"','') + '>Curl your hair - 1500 <b>₽</b></a>'
+		end
 	
-	*nl
-
-	if pcs_hairlng <= 80:
-		'Your hair is not long enough to be straightened.'
+		*nl
+	
+		if pcs_hairlng <= 80:
+			'Your hair is not long enough to be straightened.'
+		else
+			'<a href=' + iif(money >= 1500, '"exec:gt ''barbershop'', ''perm2''"', '') + '>Straighten your hair - 1500 <b>₽</b></a>'
+		end
 	else
-		'<a href=' + iif(money >= 1500, '"exec:gt ''barbershop'', ''perm2''"', '') + '>Straighten your hair - 1500 <b>₽</b></a>'
+
 	end
 	
 	*nl
@@ -188,7 +191,7 @@ if $ARGS[0] = 'cuthair':
 	'You look at your yourself in the mirror then ask Mr. Syomin if you can get your hair cut.'
 	'"Of course, how would you like your hair cut?", he asks you.'
 
-	if pcs_hairlng > 10:
+	if pcs_hairlng > 10 and hypnoHairStyle ! 1:
 		act 'Very short':
 			cla
 			*clr
@@ -210,7 +213,7 @@ if $ARGS[0] = 'cuthair':
 		end
 	end
 
-	if pcs_hairlng > 31:
+	if pcs_hairlng > 31 and hypnoHairStyle ! 1:
 		act 'Short, but not too short':
 			cla
 			*clr
@@ -267,7 +270,7 @@ if $ARGS[0] = 'cuthair':
 		end
 	end
 
-	if pcs_hairlng > 81:
+	if pcs_hairlng > 81 and hypnoHairStyle ! 1:
 		act 'About chin-line length':
 			cla
 			*clr

+ 40 - 0
locations/bed2.qsrc

@@ -550,6 +550,14 @@ if $ARGS[0] = 'wake':
 			minut += 15
 			gs 'wardrobe', 'school_outfit'
 			gs 'bed2', 'end'
+			if hscrunchw ! 2 and hypnoHairStyle = 1:
+				''
+				'You fix your hair into pigtails. You feel it''s only natural to keep your hair this way.'
+				hpingripw = 0
+				hscrunchw = 2
+				hpigtail = 1
+				''
+			end
 		end
 	end
 
@@ -563,6 +571,14 @@ if $ARGS[0] = 'wake':
 				gs 'shoes', 'wear', $bed['shoetype'], bed['shoenumber']
 			end
 			gs 'bed2', 'end'
+			if hscrunchw ! 2 and hypnoHairStyle = 1:
+				''
+				'You fix your hair into pigtails. You feel it''s only natural to keep your hair this way.'
+				hpingripw = 0
+				hscrunchw = 2
+				hpigtail = 1
+				''
+			end
 		end
 	end
 	if enfullmorrout = 1 and hour >= 4 and hour < 12:
@@ -576,6 +592,14 @@ if $ARGS[0] = 'wake':
 				gs 'shoes', 'wear', $bed['shoetype'], bed['shoenumber']
 			end
 			gs 'bed2', 'end'
+			if hscrunchw ! 2 and hypnoHairStyle = 1:
+				''
+				'You fix your hair into pigtails. You feel it''s only natural to keep your hair this way.'
+				hpingripw = 0
+				hscrunchw = 2
+				hpigtail = 1
+				''
+			end
 		end
 		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9 and suspended['on'] ! 1:
 			act 'Full morning routine for School (01:00)':
@@ -583,6 +607,14 @@ if $ARGS[0] = 'wake':
 				minut += 15
 				gs 'wardrobe', 'school_outfit'
 				gs 'bed2', 'end'
+				if hscrunchw ! 2 and hypnoHairStyle = 1:
+					''
+					'You fix your hair into pigtails. You feel it''s only natural to keep your hair this way.'
+					hpingripw = 0
+					hscrunchw = 2
+					hpigtail = 1
+					''
+				end
 			end
 		end
 	end
@@ -591,6 +623,14 @@ if $ARGS[0] = 'wake':
 		minut += 10
 		slept_in = 0
 		gs 'bed2', 'end'
+		if hscrunchw ! 2 and hypnoHairStyle = 1:
+			''
+			'You fix your hair into pigtails. You feel it''s only natural to keep your hair this way.'
+			hpingripw = 0
+			hscrunchw = 2
+			hpigtail = 1
+			''
+		end
 	end
 end
 

+ 29 - 16
locations/din_bad.qsrc

@@ -148,22 +148,35 @@ if $ARGS[0] = 'd_bag':
 	end
 !! Hair options
 	*nl
-	if (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 0: 
-		'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	elseif (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 1: 
-		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
-	end
-	if pcs_hairlng > 80 and hscrunch >= 1 and hbraids = 0:
-		if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''din_bad'', ''d_bag''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
-		if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''din_bad'', ''d_bag''">scrunchie</a> to get rid of the ponytail.'
-	end
-	if pcs_hairlng > 80 and hpingrip >= 1 and hbraids = 0:
-		if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''din_bad'', ''d_bag''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
-		if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''din_bad'', ''d_bag''">flow free</a>.'
-	end
-	if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
-		if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''din_bad'', ''d_bag''">pigtails</a>.'
-		if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''din_bad'', ''d_bag''">Remove</a> your scrunchies and let your hair flow free again.'
+	if hypnoHairStyle ! 1:
+		if (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 0: 
+			'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
+		elseif (compact_mirror = 1 or greben = 1) and pcs_hairbsh = 1: 
+			'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+		end
+		if pcs_hairlng > 80 and hscrunch >= 1 and hbraids = 0:
+			if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''din_bad'', ''d_bag''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
+			if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''din_bad'', ''d_bag''">scrunchie</a> to get rid of the ponytail.'
+		end
+		if pcs_hairlng > 80 and hpingrip >= 1 and hbraids = 0:
+			if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''din_bad'', ''d_bag''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
+			if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''din_bad'', ''d_bag''">flow free</a>.'
+		end
+		if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
+			if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''din_bad'', ''d_bag''">pigtails</a>.'
+			if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''din_bad'', ''d_bag''">Remove</a> your scrunchies and let your hair flow free again.'
+		end
+	else
+		if hscrunchw ! 2:
+			hpingripw = 0
+			hscrunchw = 2
+			hpigtail = 1
+			gs 'din_bad', 'd_bag'
+			''
+			'You notice your hair is all messed up, so you fix it into pigtails.'
+		else
+			'You think your hair looks perfect the way it is! There''s no reason to change it.'
+		end
 	end
 	
 	*nl

+ 90 - 62
locations/mirror.qsrc

@@ -26,51 +26,65 @@ if $ARGS[0] = 'start':
 			$serv['avatar']='<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 		end
 		! ----- hair
-		if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
-
-		!!!!!!!! Maruda Hair Mod
-		if hscrunch < 1:hscrunchw = 0
-		if hpingrip < 1:hpingripw = 0
-		if hscrunch < 2:hpigtail = 0
-
-		if pcs_hairbsh = 0: $serv['hairbrush']='<a href="exec: xgt ''mirror'', ''brush''"><img src="images/system/icons/action/hairbrush.png"></a>'
-		if pcs_hairlng > 80 and hscrunch >= 1 and hbraids = 0:
-			if hscrunchw = 0 and hpingripw = 0:
-				$serv['ponytail']='<a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''"><img src="images/system/icons/action/scrunchy.png"></a>'
-				$serv['ponytail desc']='As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''">ponytail</a>. You have <b><<hscrunch>></b> scrunchies left.'
-			end
-			if hscrunchw = 1:
-				$serv['ponytail']='<a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''"><img src="images/system/icons/action/ponytail.png"></a>'
-				$serv['ponytail desc']='Remove the <a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''">scrunchie</a> to get rid of the ponytail.'
+		
+		if hypnoHairStyle ! 1:
+			if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
+
+			!!!!!!!! Maruda Hair Mod
+			if hscrunch < 1:hscrunchw = 0
+			if hpingrip < 1:hpingripw = 0
+			if hscrunch < 2:hpigtail = 0
+
+			if pcs_hairbsh = 0: $serv['hairbrush']='<a href="exec: xgt ''mirror'', ''brush''"><img src="images/system/icons/action/hairbrush.png"></a>'
+			if pcs_hairlng > 80 and hscrunch >= 1 and hbraids = 0:
+				if hscrunchw = 0 and hpingripw = 0:
+					$serv['ponytail']='<a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''"><img src="images/system/icons/action/scrunchy.png"></a>'
+					$serv['ponytail desc']='As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''">ponytail</a>. You have <b><<hscrunch>></b> scrunchies left.'
+				end
+				if hscrunchw = 1:
+					$serv['ponytail']='<a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''"><img src="images/system/icons/action/ponytail.png"></a>'
+					$serv['ponytail desc']='Remove the <a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''">scrunchie</a> to get rid of the ponytail.'
+				end
 			end
-		end
-		if pcs_hairlng > 80 and hpingrip >= 1 and hbraids = 0:
-			if hscrunchw = 0 and hpingripw = 0:
-				$serv['bun']='<a href="exec:hpingripw = 1 & gs ''mirror'', ''start''"><img src="images/system/icons/action/clips_pins_grips.png"></a>'
-				$serv['bun desc']='You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''mirror'', ''start''">updo your hair</a>. You have <b><<hpingrip>></b> hair accessories at your disposal.'
+			if pcs_hairlng > 80 and hpingrip >= 1 and hbraids = 0:
+				if hscrunchw = 0 and hpingripw = 0:
+					$serv['bun']='<a href="exec:hpingripw = 1 & gs ''mirror'', ''start''"><img src="images/system/icons/action/clips_pins_grips.png"></a>'
+					$serv['bun desc']='You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''mirror'', ''start''">updo your hair</a>. You have <b><<hpingrip>></b> hair accessories at your disposal.'
+				end
+				if hpingripw = 1:
+					$serv['bun']='<a href="exec:hpingripw = 0 & gs ''mirror'', ''start''"><img src="images/system/icons/action/bun.png"></a>'
+					$serv['bun desc']='Let your hair <a href="exec:hpingripw = 0 & gs ''mirror'', ''start''">flow free</a>.'
+				end
 			end
-			if hpingripw = 1:
-				$serv['bun']='<a href="exec:hpingripw = 0 & gs ''mirror'', ''start''"><img src="images/system/icons/action/bun.png"></a>'
-				$serv['bun desc']='Let your hair <a href="exec:hpingripw = 0 & gs ''mirror'', ''start''">flow free</a>.'
+			if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
+				if hscrunchw = 0 and hpingripw = 0:
+					$serv['pigtails']='<a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''"><img src="images/system/icons/action/hair_ties.png"></a>'
+					$serv['pigtails desc']='You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''">pigtails</a>.'
+				end
+				if hscrunchw = 2:
+					$serv['pigtails']='<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''"><img src="images/system/icons/action/pigtails.png"></a>'
+					$serv['pigtails desc']='<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
+				end
 			end
-		end
-		if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
-			if hscrunchw = 0 and hpingripw = 0:
-				$serv['pigtails']='<a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''"><img src="images/system/icons/action/hair_ties.png"></a>'
-				$serv['pigtails desc']='You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''">pigtails</a>.'
+			if canBraidHair = 1 and hscrunch >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
+				$serv['braid']='<a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braiding.png"></a>'
+				$serv['braid desc']='You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
+			elseif hbraids > 0:
+				$serv['braid']='<a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braid.png"></a>'
+				$serv['braid desc']='Take half an hour removing your <a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''">braid</a>.'
 			end
-			if hscrunchw = 2:
-				$serv['pigtails']='<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''"><img src="images/system/icons/action/pigtails.png"></a>'
-				$serv['pigtails desc']='<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
+		else
+			if hscrunchw ! 2:
+				hpingripw = 0
+				hscrunchw = 2
+				hpigtail = 1
+				gs 'mirror', 'start'
+				''
+				'You notice your hair is all messed up, so you fix it into pigtails.'
+			else
+				'You think your hair looks perfect the way it is! There''s no reason to change it.'
 			end
 		end
-		if canBraidHair = 1 and hscrunch >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
-			$serv['braid']='<a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braiding.png"></a>'
-			$serv['braid desc']='You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
-		elseif hbraids > 0:
-			$serv['braid']='<a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braid.png"></a>'
-			$serv['braid desc']='Take half an hour removing your <a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''">braid</a>.'
-		end
 		! ----- actions
 		$serv['back']='<a href="exec: gt ''mirror'',''fin''"><img src="images/system/icons/action/back.png"></a>'
 		! ----- lip balm and false lashes
@@ -199,35 +213,49 @@ if $ARGS[0] = 'start':
 			if dyefade > 0 and dyefade < 7: '<br>Your hair dye is beginning to fade and your roots are showing.'
 			if dyefade = 0: '<br>Your hair dye has faded and looks terrible.'
 		end
-		if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
+		
+		if hypnoHairStyle ! 1:
+			if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
 
-		!!!!!!!! Maruda Hair Mod
-		if hscrunch < 1:hscrunchw = 0
-		if hpingrip < 1:hpingripw = 0
-		if hscrunch < 2:hpigtail = 0
+			!!!!!!!! Maruda Hair Mod
+			if hscrunch < 1:hscrunchw = 0
+			if hpingrip < 1:hpingripw = 0
+			if hscrunch < 2:hpigtail = 0
 
-		if pcs_hairlng > 80 and hscrunch >= 1 and hbraids = 0:
-			*nl
-			if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
-			if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''">scrunchie</a> to get rid of the ponytail.'
-		end
+			if pcs_hairlng > 80 and hscrunch >= 1 and hbraids = 0:
+				*nl
+				if hscrunchw = 0 and hpingripw = 0: 'As you have a scrunchy, you can arrange your hair into a <a href="exec:hscrunchw = 1 & gs ''mirror'', ''start''">ponytail</a>. You have <<hscrunch>> scrunchies left.'
+				if hscrunchw = 1: 'Remove the <a href="exec:hscrunchw = 0 & gs ''mirror'', ''start''">scrunchie</a> to get rid of the ponytail.'
+			end
 
-		if pcs_hairlng > 80 and hpingrip >= 1 and hbraids = 0:
-			if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''mirror'', ''start''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
-			if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''mirror'', ''start''">flow free</a>.'
-		end
+			if pcs_hairlng > 80 and hpingrip >= 1 and hbraids = 0:
+				if hscrunchw = 0 and hpingripw = 0: 'You have several clips, pins and grips for you hair. Hence, you can <a href="exec:hpingripw = 1 & gs ''mirror'', ''start''">updo your hair</a>. You have <<hpingrip>> hair accessories at your disposal.'
+				if hpingripw = 1: 'Let your hair <a href="exec:hpingripw = 0 & gs ''mirror'', ''start''">flow free</a>.'
+			end
 
-		if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
-			if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''">pigtails</a>.'
-			if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
-		end
+			if pcs_hairlng > 80 and hscrunch >= 2 and hbraids = 0:
+				if hscrunchw = 0 and hpingripw = 0: 'You can use two hair ties to make yourself some <a href="exec:hpigtail = 1 & hscrunchw = 2 & gs ''mirror'', ''start''">pigtails</a>.'
+				if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
+			end
 
-		if canBraidHair = 1 and hscrunch >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
-			'You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
-		end
+			if canBraidHair = 1 and hscrunch >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
+				'You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
+			end
 
-		if hbraids > 0:
-			'Take half an hour removing your <a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''">braid</a>.'
+			if hbraids > 0:
+				'Take half an hour removing your <a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''">braid</a>.'
+			end
+		else
+			if hscrunchw ! 2:
+				hpingripw = 0
+				hscrunchw = 2
+				hpigtail = 1
+				gs 'mirror', 'start'
+				''
+				'You notice your hair is all messed up, so you fix it into pigtails.'
+			else
+				'You think your hair looks perfect the way it is! There''s no reason to change it.'
+			end
 		end
 		!!!!!!!! Maruda Hair Mod
 	end

+ 36 - 1
locations/therapist.qsrc

@@ -1696,6 +1696,41 @@ if $ARGS[0] = 'hypnoRandom':
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
+	! sveta will now wear a hairstyle he picks
+	elseif hypnoHairStyle ! 1:
+		cla
+		*clr
+		hypnoRandomCounter = 0
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+		''
+		'"Listen <i>Cunt</i>, <font color=brown>You will feel the need to wear your hair in pigtails. When you think about why you like pigtails, you''ll remember that pigtails give men something to hold onto while they fuck your throat. So, it''s obvious that you should keep your hair like that. You wont think this is strange in the slightest, but if anyone asks you, you''ll tell them you think they look cute.</font>"'
+		if hscrunchw ! 2:
+			''
+			'He hands you a pair of hair ties and commands you to fix your hair.'
+			act 'Fix your hair':
+				cla
+				*clr
+				hpingripw = 0
+				hscrunchw = 2
+				hpigtail = 1
+				''
+				'You fix your hair into pigtails.'
+				'He tells you to keep your hair that way.'
+
+				act 'Continue':
+					gt 'therapist', 'hypnoEnd'
+				end
+			end
+		else
+			'"<font color=brown>Your pigtails look good. Keep it that way</font>, <i>Cunt</i>."'
+			'"Yes, <i>Master</i>."'
+
+			act 'Continue':
+				gt 'therapist', 'hypnoEnd'
+			end
+		end
+
+		hypnoHairStyle = 1
 	! sveta will now hate wearing panties.
 	elseif hypnoPanty ! 1:
 		cla
@@ -1703,7 +1738,7 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
 		''
-		'"Listen <i>Cunt</i>, <font color=brown>You do not like to wear panties. You enjoy the thought that people may notice that you do not wear them, maybe catch a glimpse of your naked pussy or ass. You won''t even think of putting them on anymore."'
+		'"Listen <i>Cunt</i>, <font color=brown>You do not like to wear panties. You enjoy the thought that people may notice that you do not wear them, maybe catch a glimpse of your naked pussy or ass. You won''t even think of putting them on anymore.</font>"'
 		if $pantyworntype ! 'none':
 			''
 			'He commands you to strip off your panties and hand them to him.'

BIN
tools/Player-video/plugins/plugins.dat