Browse Source

[fixes] I did these new hair colours all wrong, thanks LoverOfArt for spotting it.

KevinSmarts 5 years ago
parent
commit
5b981e0421
3 changed files with 12 additions and 12 deletions
  1. 2 2
      locations/barbershop.qsrc
  2. 8 8
      locations/body.qsrc
  3. 2 2
      locations/hairsalon.qsrc

+ 2 - 2
locations/barbershop.qsrc

@@ -1216,7 +1216,7 @@ if $ARGS[0] = 'dyehair':
 			end
 		end
 	end
-	if pcs_haircol ! 18:
+	if pcs_haircol ! 19:
 		act 'Medium Red':
 			cla
 			*clr
@@ -1230,7 +1230,7 @@ if $ARGS[0] = 'dyehair':
 				cla
 				*clr
 				minut += 45
-				pcs_haircol = 18
+				pcs_haircol = 19
 				dyefade = rand(23,30)
 				collength = pcs_hairlng
 				money -= 750

+ 8 - 8
locations/body.qsrc

@@ -750,14 +750,6 @@ elseif pcs_haircol = 17:
 	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)
@@ -765,6 +757,14 @@ elseif pcs_haircol = 19:
 	if rand_hair = 1:$pcdesc_hairrandom = 'wine red'
 	if rand_hair = 2:$pcdesc_hairrandom = 'auburn'
 	$pcdesc_haircolourwordy = 'deep, seductive red'
+elseif pcs_haircol = 19:
+	$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'
 !! 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'

+ 2 - 2
locations/hairsalon.qsrc

@@ -1104,7 +1104,7 @@ if $ARGS[0] = 'dyehair':
 			end
 		end
 	end
-	if pcs_haircol ! 18:
+	if pcs_haircol ! 19:
 		act 'Medium Red':
 			cla
 			*clr
@@ -1118,7 +1118,7 @@ if $ARGS[0] = 'dyehair':
 				cla
 				*clr
 				minut += 45
-				pcs_haircol = 18
+				pcs_haircol = 19
 				dyefade = rand(23,30)
 				collength = pcs_hairlng
 				money -= 750