Browse Source

[added] pcs_hairbsh = -1 after sex with a 'rough' tag, causing messy sex hair
[changed] requirement for brushing hair from pcs_hairbsh = 0 to pcs_hairbsh < 1

hornguy6 1 year ago
parent
commit
37db5934c3

+ 1 - 1
locations/BDsex.qsrc

@@ -767,7 +767,7 @@ if $ARGS[0] = 'autobj':
 		gs 'stat'
 	elseif harakBoy = 2:
 		if pcs_makeup > 1:pcs_makeup = 0
-		pcs_hairbsh = 0
+		pcs_hairbsh = -1
 		'<<$boydesc>> grabs your hair and begins to fuck your mouth roughly, each thrust strikes against the back of your throat as tears flow from your eyes.'
 		gs 'arousal', 'bj', 5, 'sub', 'rough'
 		gs 'stat'

+ 4 - 4
locations/FedorEv4.qsrc

@@ -1001,7 +1001,7 @@ if $ARGS[0] = 'Fedor Livingroom':
 	
 	if pcs_health < 100: 'Fedor looks at you and frowns. "<<$pcs_firstname>> you''re hurt. My mother works as a nurse, if she is home then you should have her take a look at you."'
 	if $clothingworntype = 'nude': 'Fedor reaches over, then begins rubbing your ass, "You have a body to die for <<$pcs_nickname>>."'
-	if pcs_hairbsh = 0: 'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
+	if pcs_hairbsh < 1: 'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
 
 	act 'Walk away':gt 'FedorEv4', 'Livingroom'
 	
@@ -1033,7 +1033,7 @@ if $ARGS[0] = 'Fedor Kitchen':
 	
 	if FedorKoz_Daystart ! daystart: '"<<$pcs_firstname>> would you like something to eat?"'
 	if pcs_health < 100: 'Fedor looks at you and frowns. "<<$pcs_firstname>> you''re hurt. My mother works as a nurse, if she is home then you should have her take a look at you."'
-	if pcs_hairbsh = 0: 'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
+	if pcs_hairbsh < 1: 'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
 	if $clothingworntype = 'nude': 'Fedor reaches over, then begins feeling up your legs, "You are so hot, <<$pcs_nickname>>."'
 
 	act 'Walk away':gt 'FedorEv4', 'Kitchen'
@@ -1091,7 +1091,7 @@ if $ARGS[0] = 'Fedor Bedroom':
 		'Fedor looks at you then frowns. "<<$pcs_firstname>> you''re hurt. My mother works as a nurse. You should have her take a look at you."'
 	end
 
-	if pcs_hairbsh = 0:
+	if pcs_hairbsh < 1:
 		'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
 	end
 
@@ -1160,7 +1160,7 @@ if $ARGS[0] = 'Fedor Bedroom 2':
 	'Fedor is watching videos on his computer. As you approach, Fedor turns to you and asks "Hey <<$pcs_nickname>>, wanna check out some videos?"'
 
 	if pcs_health < 100: 'Fedor looks at you and frowns. "<<$pcs_firstname>> you''re hurt. My mother works as a nurse, if she is home then you should have her take a look at you."'
-	if pcs_hairbsh = 0: 'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
+	if pcs_hairbsh < 1: 'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
 	if $clothingworntype = 'nude': 'Fedor reaches over, then begins gently squeezing your breasts, "You have great tits, <<$pcs_firstname>>."'
 	
 	if func('homes_properties', 'has_access', 'parents_home') = 0 and FedorShelter = 0:act 'Ask about moving in':gt 'FedorEv4', 'Fedor Shelter'

+ 1 - 1
locations/FedorMisc.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'Fedor Chat':
 		'Fedor is a decent athlete. He often trains with his good friend Ivan, but lacks the level of talent that Ivan does have.'
 	end
 
-	if pcs_hairbsh = 0:
+	if pcs_hairbsh < 1:
 		'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb'', <<ARGS[1]>>">comb</a>.'
 	end
 

+ 1 - 1
locations/Gnpc.qsrc

@@ -137,7 +137,7 @@ act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $loc_arg
 act 'Take a walk through the park':
 	cla
 
-	if pcs_hairbsh = 0:otnBoyFrend[numnpc] -= 5
+	if pcs_hairbsh < 1:otnBoyFrend[numnpc] -= 5
 	if pcs_hairbsh = 1:otnBoyFrend[numnpc] += 1
 	if pcs_makeup = 2:otnBoyFrend[numnpc] += 1
 	if pcs_makeup = 3:otnBoyFrend[numnpc] += 2

+ 1 - 1
locations/LariskaHome.qsrc

@@ -308,7 +308,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_bathroom.jpg"></center>'
 	'The room is clean, and even smells like sage.'
 	*nl
-	'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a separate bath tub.'
+	'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a separate bath tub.'
 	if locat['Lariska'] = 13:'Since <a href="exec: gt ''LariskaHome'', ''bathroom_join_1''">Lariska</a> didn''t lock the door, you are able to enter unnoticed. Maybe you can join her...'
 	if locat['Lariska'] = 20:'<a href="exec: gt ''LariskaHome'', ''bathroom_cleaning_1''">Lariska</a> is here, cleaning the bathroom.'
 	act 'Return to the hallway':gt 'LariskaHome', 'hallway'

+ 1 - 1
locations/Prostitute.qsrc

@@ -245,7 +245,7 @@ if $ARGS[0] = 'work1':
 	elseif pcs_sweat < 15:
 		vnpr += 1
 	end
-	if pcs_hairbsh = 0:vnpr -= 1
+	if pcs_hairbsh < 1:vnpr -= 1
 	if pcs_lip = 4:vnpr += 1
 
 	if vnpr >= 0:

+ 1 - 1
locations/Zvereva_house.qsrc

@@ -194,7 +194,7 @@ if $ARGS[0] = 'bathr':
 
 	act 'Leave the room': gt 'Zvereva_house', 'hallw'
 
-	'The stylish room has a large glass shower, toilet, sink, and a <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	'The stylish room has a large glass shower, toilet, sink, and a <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	if locat['Christina'] = 13: '<a href="exec:gt ''Zvereva_house_events'',''chris_shower''">Christina</a> is here, taking a shower.'
 	if locat['Silvestr'] = 3: 'Silvestr is in the shower right now.'

+ 1 - 1
locations/abduction.qsrc

@@ -669,7 +669,7 @@ if $ARGS[0] = 'abdFood':
 	end
 
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 	act 'Take a cold shower (0:15)':
 		*clr & cla
 		menu_off = 1

+ 1 - 1
locations/albinahome.qsrc

@@ -161,7 +161,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/bathroom.jpg"></center>'
 	'The bathroom is just as well appointed as the rest of the house, with polished marble used throughout its furnishings.'
 	*nl
-	'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a separate bath tub.'
+	'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a separate bath tub.'
 	act 'Return to the hallway':gt 'albinahome', 'hallway'
 	dynamic $tampon
 	dynamic $quickwash

+ 4 - 0
locations/arousal.qsrc

@@ -202,6 +202,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 70
 		stim_les = 1
 	elseif $ARGS[0] = 'anal':
+		stat['last_sex_day'] = daystart
 		orgasm_flag['anal'] = 1
 		if temp_unaware = 1:
 			count['hidden_anal'] = 1
@@ -303,6 +304,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		gs 'pain', (agrdif + altdif)/5 , 'asshole', 'stretch'
 		stim['act'] = stim['act'] - (agrdif + altdif)
 	elseif $ARGS[0] = 'anal_strap':
+		stat['last_sex_day'] = daystart
 		orgasm_flag['anal'] = 1
 		count['anal_strap'] = 1
 		!! the same as for 'anal'
@@ -348,6 +350,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			count['hidden_vaginal'] = 1
 		else
 			count['vaginal'] = 1
+			stat['last_man_sex_day'] = daystart
 		end
 		stim['mag'] += 3
 		if pcs_vag < dick:pcs_vag += 1
@@ -615,6 +618,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 				stim['pref'] += rough['pref']
 				stim['kinkno'] += 1
 				stim['rough'] = 1
+				pcs_hairbsh = -1
 			elseif $ARGS[i] = 'prostitution':
 				stim['kink'] += prostitution['exp']
 				stim['pref'] += prostitution['pref']

+ 5 - 1
locations/body_desc.qsrc

@@ -958,7 +958,11 @@ if $ARGS[0] = 'hair':
 	end
 
 	!Hair status - whether hair is tangled or combed
-	if pcs_hairbsh = 0:
+	if pcs_hairbsh = -1:
+		$pcs_hairbsh = 'messy from sex. You should brush it so everyone doesn''t know you what you''ve been up to'
+		$pc_desc['hair status'] = func($this, 'ChooseDescWord', 'bed-tangled', 'sex-tousled', 'disheveled', 'mussed')
+		$pc_descWordy['hair status'] = 'messy, just-fucked'
+	elseif pcs_hairbsh = 0:
 		if pcs_hairlng > 30:
 			$pcs_hairbsh = 'tangled. You should comb it to keep it healthy'
 			$pc_desc['hair status'] = func($this, 'ChooseDescWord', 'tangled', 'tousled', 'disheveled', 'mussed')

+ 1 - 1
locations/bordel.qsrc

@@ -64,7 +64,7 @@ if $ARGS[0] = 'brothel':
 		else
 			act 'Go to the reception room and wait for customers':
 
-				if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh = 0:
+				if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh < 1:
 					cla
 					'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
 

+ 2 - 2
locations/brothel.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'toilet':
 	act 'Return to the lobby':gt 'brothel', 'lobby'
 
 	act 'Look into the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash
@@ -279,7 +279,7 @@ end
 
 if $ARGS[0] = 'abducted4':
 	analplugIN = 1
-	pcs_hairbsh = 0
+	pcs_hairbsh = -1
 	InSleep = 1
 	pain['killer'] = 0
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:

+ 1 - 1
locations/butoilet.qsrc

@@ -21,7 +21,7 @@ gs 'themes', 'indoors'
 act 'Leave the toilet':gt 'burger', 'start'
 
 act 'Look in the mirror': gt 'mirror', 'start'
-if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 dynamic $tampon
 dynamic $quickwash

+ 1 - 1
locations/city_house_res_bathr.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'bathr':
 
 	act 'Leave the room': gt 'city_house_res_misc', 'hallw'
 
-	'The ornate room holds a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
+	'The ornate room holds a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh < 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
 
 	gs 'selfplay', 'suction_dildo'
 	*nl

+ 1 - 1
locations/city_industrial_train.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'toilet':
 	act 'Return to the station': minut += 1 & gt 'city_industrial_train', 'inside'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash

+ 1 - 1
locations/city_kafe2.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'toilet':
 	act 'Leave':gt 'city_kafe', 'workPred'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash

+ 1 - 1
locations/city_mansion_residence_1.qsrc

@@ -143,7 +143,7 @@ if $ARGS[0] = 'ybathroom':
 	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
 
 	if ymanrem[5] = 2:
-		'The ornate room holds a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
+		'The ornate room holds a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
 		
 		gs 'selfplay', 'suction_dildo'
 		*nl

+ 1 - 1
locations/city_nightclub.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = 'tou':
 	act 'Leave the toilet':gt 'city_nightclub', 'inside'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash

+ 1 - 1
locations/city_saunawhore.qsrc

@@ -338,7 +338,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
 	''
 	'You enter the staff bathroom, which is usually cleaned by the new girls who have just started working here, whether they want to or not.'
-	'There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower, toilet and a sink.'
+	'There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower, toilet and a sink.'
 
 	act 'Return to they foyer': minut += 1 & gt 'city_saunawhore', 'saunawork'
 

+ 2 - 2
locations/foto.qsrc

@@ -1152,7 +1152,7 @@ if $ARGS[0] = 'makeup':
 	'The backstage area where you and the other girls put on your makeup.'
 	act'Back to the studio':gt'foto','studio'
 
-	if pcs_hairbsh = 0:
+	if pcs_hairbsh < 1:
 		act'Brush your hair':
 			*clr & cla
 			menu_off = 1
@@ -1168,7 +1168,7 @@ if $ARGS[0] = 'makeup':
 		end
 	end
 
-	if pcs_hairbsh = 0 or pcs_makeup = 1:
+	if pcs_hairbsh < 1 or pcs_makeup = 1:
 		act'Do your own makeup': menu_off = 1 & gt'mirror','start'
 
 		act'Go to the makeup artists (0:30)':

+ 1 - 1
locations/gadbana.qsrc

@@ -178,7 +178,7 @@ if mira_guest = 0:
 		end
 	end
 	if stanok > 0:'Your razor will last <b><<stanok>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
-	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> on the window sill, which you can use to ' +iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> on the window sill, which you can use to ' +iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	!WD: heal chafe
 	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -775,7 +775,7 @@ if $ARGS[0] = 'change_room':
 	end
 	dynamic $publicpan
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 	dynamic $quickwash
 	dynamic $basin
 	if shampoo > 0:

+ 1 - 1
locations/gschool_lessons4.qsrc

@@ -1955,7 +1955,7 @@ if $ARGS[0] = 'post_dress':
 		end
 	end
 	act 'Use the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 	if deodorant > 0 and deodorant_on = 0:
 		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':

+ 1 - 1
locations/igorhome.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
 	'The bathroom has a large sink area and tile floors. The toilet sits along the far wall. There is also a walk-in shower and bath tub. It all looks very nice.'
-	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 	*nl
 	act 'Leave the bathroom': gt 'igorhome','hallway'
 	gs 'din_van', 'private'

+ 1 - 1
locations/laketoilet.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'main':
 		act 'Leave the restroom':gt 'lakecafe', 'main'
 		
 		act 'Look in the mirror': gt 'mirror', 'start'
-		if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+		if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 		dynamic $tampon
 		dynamic $quickwash

+ 1 - 1
locations/leonid.qsrc

@@ -853,7 +853,7 @@ if $ARGS[0] = 'toilet':
 	act 'Change your clothes':gt 'wardrobe', 'start'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash

+ 3 - 3
locations/lover_likes.qsrc

@@ -487,7 +487,7 @@ if $ARGS[0] = 'makePrefTmp':
 	if pcs_makeup ! 0 and makePrefTmp ! 0:
 		if haraklover[lover_number] = 0:
 
-			if pcs_hairbsh = 0:
+			if pcs_hairbsh < 1:
 				loverrelation[lover_number] -= 1
 				$meetMake = '<<$loverdesc[lover_number]>> says timidly "I guess you had to leave in a hurry huh?"'
 			elseif pcs_makeup ! makePrefTmp + 1 and makePrefTmp ! 0:
@@ -498,7 +498,7 @@ if $ARGS[0] = 'makePrefTmp':
 				$meetMake = '<<$loverdesc[lover_number]>> looks at your face and says, "I love the way you did your makeup."'
 			end
 		elseif haraklover[lover_number] = 1:
-			if pcs_hairbsh = 0:
+			if pcs_hairbsh < 1:
 				loverrelation[lover_number] -= 1
 				$meetMake = '<<$loverdesc[lover_number]>> says questionly, "I guess you had to leave in a hurry?"'
 			elseif pcs_makeup ! makePrefTmp + 1 and makePrefTmp ! 0:
@@ -511,7 +511,7 @@ if $ARGS[0] = 'makePrefTmp':
 				$meetMake = '<<$loverdesc[lover_number]>> says sweetly, "It seems any way you do your makeup is beautiful."'
 			end
 		elseif haraklover[lover_number] = 2:
-			if pcs_hairbsh = 0:
+			if pcs_hairbsh < 1:
 				loverrelation[lover_number] -= 1
 				$meetMake = '<<$loverdesc[lover_number]>> says rudely, "Couldn''t take the time to brush your hair?"'
 			elseif pcs_makeup ! makePrefTmp + 1 and makePrefTmp ! 0:

+ 1 - 1
locations/lover_pref.qsrc

@@ -412,7 +412,7 @@ if pcs_hairbsh = 1 and curly = 0:
 	loverrelation[lover_number] += 1 
 	$meetHair = 'You have pretty hair today.'
 end
-if pcs_hairbsh = 0:
+if pcs_hairbsh < 1:
 	loverrelation[lover_number] -= 1 
 	$meetHair = 'You look like you were in a hurry.'
 end

+ 5 - 5
locations/mirror.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 		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_hairbsh < 1: $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>'
@@ -243,7 +243,7 @@ if $ARGS[0] = 'start':
 	*nl
 	
 	! WD: Cheat Unused ~ 'AutoHapri'
-	if pcs_hairbsh = 0 and AutoHapri = 1:
+	if pcs_hairbsh < 1 and AutoHapri = 1:
 		minut += 3
 		pcs_hairbsh = 1
 		'<center><img <<$set_imgh>> src="images/pc/activities/routine/3.jpg"></center>'
@@ -294,7 +294,7 @@ if $ARGS[0] = 'start':
 
 	act 'Move away from the mirror':gt 'mirror','fin'
 
-	if pcs_hairbsh = 0: act 'Brush your hair': xgt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': xgt 'mirror', 'brush'
 
 	! WD: Cheat Unused ~ 'AutoLipBalm'
 
@@ -699,7 +699,7 @@ if $ARGS[0] = 'works':
 	elseif kosmetica < $ARGS[1]:
 		'You don''t have enough makeup to apply your chosen option.'
 	end
-	if pcs_hairbsh = 0:
+	if pcs_hairbsh < 1:
 		minut += 3
 		pcs_hairbsh = 1
 		'You brush your hair.'
@@ -765,7 +765,7 @@ if $ARGS[0] = 'd_bag_mirror':
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	'You have '+iif(kosmetitka > 0, '<b><<kosmetitka>></b>', 'no')+' cosmetic applications and '+iif(salfetka > 0, '<b><<salfetka>></b>', 'no')+' tissues left in your purse.'
 	*nl
-	if pcs_hairbsh = 0: '<a href="exec: pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
+	if pcs_hairbsh < 1: '<a href="exec: pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
 	if salfetka > 0 and pcs_makeup ! 1 and cosmetic_tattoo = 0: '<center><a href="exec: salfetka -= 1 & pcs_makeup = 1 & gt ''mirror'', ''d_bag_mirror''"><b>Remove your makeup</b></a>'
 	if kosmetitka > 0 and pcs_makeup = 1:
 		'<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gt ''mirror'', ''d_bag_mirror''"><b>Put on light makeup</b></a>'

+ 1 - 1
locations/nichApartment.qsrc

@@ -322,7 +322,7 @@ if $ARGS[0] = 'hiring':
 		'Looking down and realizing that you are, in fact, not, you shake your head no, and he nods gravely.'
 		'"I expect my maids to have nothing short of a perfect personal hygiene", he states. "If you can''t take care of yourself, how are you going to care for this household? You will take care of this if we hire you."'
 	end
-	if pcs_hairbsh = 0:
+	if pcs_hairbsh < 1:
 		nichImperfections += 1
 		*nl
 		'Of course, he cannot miss the fact that your hair is tangled and uncombed. He almost imperceptibly shakes his head at you.'

+ 1 - 1
locations/nichNicholas.qsrc

@@ -303,7 +303,7 @@ elseif $ARGS[0] = 'evaluation':
 		'<font color = orange>You need to take care of your body hair.</font>'
 		nichTempEval -= 2
 	end
-	if pcs_hairbsh = 0:
+	if pcs_hairbsh < 1:
 		'<font color = orange>You didn''t brush your hair.</font>'
 		nichTempEval -= 2
 	end

+ 1 - 1
locations/nichTanya.qsrc

@@ -1480,7 +1480,7 @@ if $ARGS[0] = 'prepareInterview':
 		'"Your body hair is too long. But you can fix that later, that won''t be a reason not to hire you."'
 	end
 
-	if pcs_hairbsh = 0:
+	if pcs_hairbsh < 1:
 		'"You should brush your hair."'
 		'She hands you a brush and watches you while you do as you are told.'
 		pcs_hairbsh = 1

+ 1 - 1
locations/pav_shared_apt.qsrc

@@ -595,7 +595,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
 	*nl
 	'This is a modest bathroom, containing everything that young people need for their daily life, such as:'
-	'A shower, toilet, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a sink and even a bath tub.'
+	'A shower, toilet, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a sink and even a bath tub.'
 	*nl
 	gs 'din_van', 'private'
 	gs 'stat'

+ 1 - 1
locations/rolanbath.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start':
 		'The bathroom is in much better shape since you worked on it.'
 	end
 
-	'A <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair hangs over the sink.'
+	'A <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair hangs over the sink.'
 
 	if rolanworker = 2 and (RolanLoc[hour] = 9 or RolanLoc[hour] = 10):
 !	if rolanworker = 2 and RolanLoc[hour] = 9 or RolanLoc[hour] = 10:

+ 1 - 1
locations/sexshop.qsrc

@@ -448,7 +448,7 @@ if $ARGS[0] = 'toi':
 	act 'Leave the toilet':gt 'sexshop', 'podval'
 	
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash

+ 1 - 1
locations/succubus.qsrc

@@ -880,7 +880,7 @@ if $args[0] = 'sucwalkinginit':
 
 !!		This covers a high level succubus doing complex activities
 		if succublvl >= 4:
-			if pcs_hairbsh = 0: pcs_hairbsh = 1
+			if pcs_hairbsh < 1: pcs_hairbsh = 1
 			if lipbalm > 0 and pcs_lipbalm <= 0:
 				lipbalm -= 1
 				lipkoef += rand(0, 1)

+ 1 - 1
locations/swamphouse.qsrc

@@ -530,7 +530,7 @@ if $ARGS[0] = 'washstand':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/washstand.jpg"></center>'
 	*nl
-	'An old washstand. You can use the basin to clean yourself, if necessary. There is also an old polished but rusty metal mirror resting on the basin, which you can use to ' +iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	'An old washstand. You can use the basin to clean yourself, if necessary. There is also an old polished but rusty metal mirror resting on the basin, which you can use to ' +iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	if bucket > 0:
 		!use current by illume

+ 1 - 1
locations/vanr.qsrc

@@ -31,7 +31,7 @@ elseif remvanr = 1:
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/home/vanr2.jpg"></center>'
 	'Your bathroom is new and in good condition. The suite is modern, your <a href="exec:gt ''mirror'',''start''">mirror</a> is perfect and everything looks clean and fresh.'
 end
-'Your ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' sits on the small shelf, below the mirror.'
+'Your ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' sits on the small shelf, below the mirror.'
 
 gs'selfplay','suction_dildo'
 gs 'din_van', 'private'

+ 1 - 1
locations/vasilyhome.qsrc

@@ -1005,7 +1005,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna.jpg"></center>'
 	*nl
-	'Uncle Sergey''s bathroom is small and very unpretentious. Nevertheless, it has everything a bathroom needs. There is a <a href="exec: gt ''mirror'',''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower and a bathtub.'
+	'Uncle Sergey''s bathroom is small and very unpretentious. Nevertheless, it has everything a bathroom needs. There is a <a href="exec: gt ''mirror'',''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower and a bathtub.'
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 	act 'Take a shower':
 		*clr & cla

+ 1 - 1
locations/zaprF.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'toilet':
 	act 'Leave the restroom':gt 'zaprF', 'start'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash