Browse Source

[added[ 2 new hair colours and slight change to an old one

KevinSmarts 5 years ago
parent
commit
33c6a7819f
4 changed files with 152 additions and 15 deletions
  1. 61 3
      locations/barbershop.qsrc
  2. 21 5
      locations/body.qsrc
  3. 59 3
      locations/hairsalon.qsrc
  4. 11 4
      locations/katjaEv.qsrc

+ 61 - 3
locations/barbershop.qsrc

@@ -29,7 +29,7 @@
 !!pcs_haircol 1 = Brown
 !!pcs_haircol 2 = Red
 !!pcs_haircol 3 = Blonde
-!!pcs_haircol 4 = Bright Red
+!!pcs_haircol 4 = Light Red
 !!pcs_haircol 5 = Dark Blue
 !!pcs_haircol 6 = Medium Blue
 !!pcs_haircol 7 = Light Blue
@@ -42,6 +42,8 @@
 !!pcs_haircol 15 = Medium Purple
 !!pcs_haircol 16 = Light Purple
 !!pcs_haircol 17 = Orange
+!!pcs_haircol 16 = Dark Red
+!!pcs_haircol 17 = Medium Red
 
 $menu_loc = 'barbershop'
 $menu_arg = 'start'
@@ -796,13 +798,13 @@ if $ARGS[0] = 'dyehair':
 	end
 
 	if pcs_haircol ! 4:
-		act 'Bright Red':
+		act 'Light Red':
 			cla
 			*clr
 			gs 'stat'
 			'"I want to try something really different." you tell him.'
 			'"And what would that be?" Mr. Syomin asks cheerfully.'
-			'"Really bright red, like a fire truck." you announce.'
+			'"Light red, like a fire truck." you announce.'
 			'"As you wish, although I''ve not done too many like that. Please have a seat.", he says and turns around one of the chairs for you.'
 
 			act 'Sit down':
@@ -1182,6 +1184,62 @@ if $ARGS[0] = 'dyehair':
 				'Mr. Syomin removes the dryer hood. "And we''re all done."'
 				'You stand up from the chair and pay him 750 <b>₽</b>.'
 
+				act 'Leave':gt 'barbershop', 'start'
+			end
+		end
+	end
+	if pcs_haircol ! 18:
+		act 'Dark Red':
+			cla
+			*clr
+			gs 'stat'
+			'"I want to try something really different." you tell him.'
+			'"And what would that be?" Mr. Syomin asks cheerfully.'
+			'"Dark Red, like a fine wine." you announce.'
+			'"As you wish, although I''ve not done too many like that. Please have a seat.", he says and turns around one of the chairs for you.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_haircol = 18
+				dyefade = rand(23,30)
+				collength = pcs_hairlng
+				money -= 750
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+				'About an hour later, everything should be dried up.'
+				'Mr. Syomin removes the dryer hood. "And we''re all done."'
+				'You stand up from the chair and pay him 750 <b>₽</b>.'
+
+				act 'Leave':gt 'barbershop', 'start'
+			end
+		end
+	end
+	if pcs_haircol ! 18:
+		act 'Medium Red':
+			cla
+			*clr
+			gs 'stat'
+			'"I want to try something really different." you tell him.'
+			'"And what would that be?" Mr. Syomin asks cheerfully.'
+			'"Medium Red, like a cherry." you announce.'
+			'"As you wish, although I''ve not done too many like that. Please have a seat.", he says and turns around one of the chairs for you.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_haircol = 18
+				dyefade = rand(23,30)
+				collength = pcs_hairlng
+				money -= 750
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+				'About an hour later, everything should be dried up.'
+				'Mr. Syomin removes the dryer hood. "And we''re all done."'
+				'You stand up from the chair and pay him 750 <b>₽</b>.'
+
 				act 'Leave':gt 'barbershop', 'start'
 			end
 		end

+ 21 - 5
locations/body.qsrc

@@ -631,13 +631,13 @@ elseif pcs_haircol = 3:
 	if rand_hair = 3:$pcdesc_hairrandom = 'fair, blonde'
 	$pcdesc_haircolourwordy = 'beautiful golden-blonde'
 elseif pcs_haircol = 4:
-	$pcs_haircol = 'bright red'
-	$pcdesc_haircolour = 'bright red'
+	$pcs_haircol = 'light red'
+	$pcdesc_haircolour = 'light red'
 	rand_hair = rand(0,2)
-	if rand_hair = 0:$pcdesc_hairrandom = 'candy-apple red'
+	if rand_hair = 0:$pcdesc_hairrandom = 'strawberry blonde'
 	if rand_hair = 1:$pcdesc_hairrandom = 'fire-engine red'
-	if rand_hair = 2:$pcdesc_hairrandom = 'vibrantly-dyed red'
-	$pcdesc_haircolourwordy = 'vibrant, candy-apple red'
+	if rand_hair = 2:$pcdesc_hairrandom = 'scarlet'
+	$pcdesc_haircolourwordy = 'glowing, pale red'
 elseif pcs_haircol = 5:
 	$pcs_haircol = 'dark blue'
 	$pcdesc_haircolour = 'dark blue'
@@ -749,6 +749,22 @@ elseif pcs_haircol = 17:
 	if rand_hair = 1:$pcdesc_hairrandom = 'pumpkin orange'
 	if rand_hair = 2:$pcdesc_hairrandom = 'bright orange'
 	$pcdesc_haircolourwordy = 'bright, fiery orange'
+elseif pcs_haircol = 18:
+	$pcs_haircol = 'medium red'
+	$pcdesc_haircolour = 'medium red'
+	rand_hair = rand(0,2)
+	if rand_hair = 0:$pcdesc_hairrandom = 'medium red'
+	if rand_hair = 1:$pcdesc_hairrandom = 'cherry red'
+	if rand_hair = 2:$pcdesc_hairrandom = 'bronze'
+	$pcdesc_haircolourwordy = 'strong, fiery red'
+elseif pcs_haircol = 19:
+	$pcs_haircol = 'dark red'
+	$pcdesc_haircolour = 'dark red'
+	rand_hair = rand(0,2)
+	if rand_hair = 0:$pcdesc_hairrandom = 'dark red'
+	if rand_hair = 1:$pcdesc_hairrandom = 'wine red'
+	if rand_hair = 2:$pcdesc_hairrandom = 'auburn'
+	$pcdesc_haircolourwordy = 'deep, seductive red'
 !! This below is a catch-all, it should not actually ever wind up occurring, but just in case it does...
 else
 	$pcs_haircol = 'strangely-coloured'

+ 59 - 3
locations/hairsalon.qsrc

@@ -700,13 +700,13 @@ if $ARGS[0] = 'dyehair':
 		end
 	end
 	if pcs_haircol ! 4:
-		act 'Bright Red':
+		act 'Light Red':
 			cla
 			*clr
 			gs 'stat'
 			'"I want to try something really different." you tell her.'
 			'"And what would that be?" The hairdresser asks cheerfully.'
-			'"Really bright red, like a fire truck." you announce.'
+			'"light red red, like a fire truck." you announce.'
 			'"No problem, this''ll be fun. Please have a seat.", she says and turns around one of the chairs for you.'
 
 			act 'Sit down':
@@ -718,7 +718,7 @@ if $ARGS[0] = 'dyehair':
 				collength = pcs_hairlng
 				money -= 1000
 				gs 'stat'
-				'About an hour later, everything should be dried up.'
+				'About an hour later, every	thing should be dried up.'
 				'The hairdresser removes the dryer hood. "And we''re all done."'
 				'You stand up from the chair and pay her 1000 <b>₽</b>.'
 
@@ -1076,6 +1076,62 @@ if $ARGS[0] = 'dyehair':
 			end
 		end
 	end
+	if pcs_haircol ! 18:
+		act 'Dark Red':
+			cla
+			*clr
+			gs 'stat'
+			'"I want to try something really different." you tell him.'
+			'"And what would that be?" The hairdresser asks cheerfully.'
+			'"Dark Red, like a fine wine." you announce.'
+			'"As you wish, please have a seat.", she says and turns around one of the chairs for you.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_haircol = 18
+				dyefade = rand(23,30)
+				collength = pcs_hairlng
+				money -= 1000
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+				'About an hour later, everything should be dried up.'
+				'The hairdresser removes the dryer hood. "And we''re all done."'
+				'You stand up from the chair and pay her 1000 <b>₽</b>.'
+
+				act 'Move away':gt 'hairsalon', 'start'
+			end
+		end
+	end
+	if pcs_haircol ! 18:
+		act 'Medium Red':
+			cla
+			*clr
+			gs 'stat'
+			'"I want to try something really different." you tell him.'
+			'"And what would that be?" The hairdresser asks cheerfully.'
+			'"Medium Red, like a cherry." you announce.'
+			'"As you wish, please have a seat.", she says and turns around one of the chairs for you.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_haircol = 18
+				dyefade = rand(23,30)
+				collength = pcs_hairlng
+				money -= 750
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+				'About an hour later, everything should be dried up.'
+				'The hairdresser removes the dryer hood. "And we''re all done."'
+				'You stand up from the chair and pay her 1000 <b>₽</b>.'
+
+				act 'Leave':gt 'barbershop', 'start'
+			end
+		end
+	end
 	gs 'stat'
 end
 

+ 11 - 4
locations/katjaEv.qsrc

@@ -477,10 +477,17 @@ if $ARGS[0] = 'kiss_events':
 		end
 	elseif flag_start_parc = 1:
 		flag_start_parc += 1
-		if pcs_haircol = 0: $textEvent = 'fire in the night'
-		if pcs_haircol = 1: $textEvent = 'the sun in the autumn sky'
-		if pcs_haircol = 2: $textEvent = 'two intertwining flames,'
-		if pcs_haircol = 3: $textEvent = 'the sun at the dawn'
+		if pcs_haircol = 0:
+			$textEvent = 'fire in the night'
+		elseif pcs_haircol = 1:
+			$textEvent = 'the sun in the autumn sky'
+		elseif pcs_haircol = 2:
+			$textEvent = 'two intertwining flames,'
+		elseif pcs_haircol = 3:
+			$textEvent = 'the sun at the dawn'
+		elseif pcs_haircol = 3:
+			$textEvent = 'a fiery rainbow'
+		end
 		'While you kissed Katja, someone came nearby sighed loudly, probably, appreciating the view.'
 		'"Like <<$textEvent>>, you girls are just so a part of each other. Are all girls as close as the two of you?" You''re so surprised with this unexpectedly accurate comparison, then turned around and saw Ivan Prokhorov, who tenderly looked at you and Katja.'
 		'"Thank you, MAN and I don''t know." you reply. He again sighed, and left misty-eyed.'