[fixed] some pube_image variable typos, set medium bush upper limit to 35, unified pubestyle shaving across game files + [added] colour specific shaving menu images

locations/_pube_image.qsrc

@@ -8,8 +8,8 @@
 $RESULT = 'images/pc/body/pussy/'
 
 if ARGS[0] ! 0: temp_pubes = ARGS[0] else temp_pubes = pcs_pubes
-if ARGS[1] ! 0: temp_pubecol = $ARGS[1] else temp_pubecol = pcs_pubecol[2]
-if ARGS[2] ! 0: temp_pubestyle = $ARGS[2] else temp_pubestyle = pubestyle
+if ARGS[1] ! 0: temp_pubecol = ARGS[1] else temp_pubecol = pcs_pubecol[2]
+if ARGS[2] ! 0: temp_pubestyle = ARGS[2] else temp_pubestyle = pubestyle
 
 if $ARGS[0] = 0 and lashair = 0:
 	if temp_pubes <= 3:
@@ -94,27 +94,27 @@ if $ARGS[0] = 0 and lashair = 0:
 		elseif temp_pubestyle = 14:
 			$RESULT += 'shave/rectangle'
 		else
-			if pcs_pubecol[2] = 0:
+			if temp_pubecol = 0:
 				$RESULT += 'hair/black_small'
-			elseif temp_pubes = 1:
+			elseif temp_pubecol = 1:
 				$RESULT += 'hair/brunette_small'
-			elseif temp_pubes = 2:
+			elseif temp_pubecol = 2:
 				$RESULT += 'hair/ginger_small'
-			elseif temp_pubes = 3:
+			elseif temp_pubecol = 3:
 				$RESULT += 'hair/blonde_small'
-			elseif temp_pubes = 4:
+			elseif temp_pubecol = 4:
 				$RESULT += 'hair/red'
-			elseif temp_pubes = 5:
+			elseif temp_pubecol = 5:
 				$RESULT += 'hair/blue'
-			elseif temp_pubes = 6:
+			elseif temp_pubecol = 6:
 				$RESULT += 'hair/green'
-			elseif temp_pubes = 7:
+			elseif temp_pubecol = 7:
 				$RESULT += 'hair/pink'
-			elseif temp_pubes = 8:
+			elseif temp_pubecol = 8:
 				$RESULT += 'hair/purple'
 			end
 		end
-	elseif temp_pubes <= 30:
+	elseif temp_pubes <= 35:
 		if temp_pubecol = 0:
 			$RESULT += 'hair/black_mid'
 		elseif temp_pubecol = 1:

locations/din_van.qsrc

@@ -259,7 +259,7 @@ $bath = {
 
 $brit = {
 	if shave_menu = 1  and stanok > 1:
-		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or ((pubestyle = 9 or pubestyle >= 13) and pcs_pubes > 25) or (pubestyle = 10 and pcs_pubes >= 40) or (pubestyle = 11 and pcs_pubes > 10):
+		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or ((pubestyle = 9 or pubestyle >= 13) and pcs_pubes > 25) or (pubestyle = 10 and pcs_pubes >= 35) or (pubestyle = 11 and pcs_pubes > 10):
 			act 'Shave yourself (0:15)':
 				menu_off = 1
 				*clr & cla
@@ -267,9 +267,9 @@ $brit = {
 				pcs_leghair = 0
 				if pubestyle = 1:
 					pcs_pubes = 0
-				elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle = 12 or pubestyle >= 13:
+				elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 					pcs_pubes = 16
-				elseif pubestyle = 10 and pcs_pubes >= 40:
+				elseif pubestyle = 10 and pcs_pubes >= 35:
 					pcs_pubes = 26
 				elseif pubestyle = 11 and pcs_pubes > 10:
 					pcs_pubes = 0
@@ -1615,7 +1615,7 @@ if $ARGS[0] = 'shave_options':
 	!! images handled using FUNC(''$pube_image'')
 	'<h3><center><b><font color="maroon">Shaving optons</b></h3><br><center><font color="maroon">Here you can choose your style for pubic hair and which body parts you wish to shave.</font></center>'
 	'<br><center><table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/v1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/v1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/triangle1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/triangle1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/landing1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/landing1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/heart1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/heart1.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>"></a></center></TD>'
 	'<TR><TD><center>'
 	if pubestyle ! 1:
 		'<a href="exec:pubestyle = 1 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
@@ -1647,7 +1647,7 @@ if $ARGS[0] = 'shave_options':
 		'Heart-shaped'
 	end
 	'</center></TD>'
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/shave/flame1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/flame1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/cross1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/cross1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/s_bush1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/s_bush1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/hair/black_trimmed.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/black_trimmed.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/hair/black_mid.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/black_mid.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>"></a></center></TD>'
 	'<TR><TD><center>'
 	if pubestyle ! 6 and pcs_pubes > 15:
 		'<a href="exec:pubestyle = 6 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
@@ -1673,12 +1673,12 @@ if $ARGS[0] = 'shave_options':
 		'Small Bush'
 	end
 	'</center></TD><TD><center>'
-	if pubestyle ! 10 and pcs_pubes > 30:
+	if pubestyle ! 10 and pcs_pubes > 35:
 		'<a href="exec:pubestyle = 10 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
 	else
 		'Full Bush'
 	end
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/stubble.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/stubble.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/mb.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/mb.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/bstrip.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/bstrip.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/rectangle.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/rectangle.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],13)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],13)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],14)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],14)>>"></a></center></TD>'
 	*nl
 	'<TR><TD><center>'
 	if pubestyle ! 11 and pcs_pubes > 10:
@@ -1708,8 +1708,6 @@ if $ARGS[0] = 'shave_options':
 	end
 	
 	
-	
-	
 	'</center></TD><TR><center>'
 	'Your razor will last for <b><<stanok>></b> more shaves.'
 	*nl

locations/spell.qsrc

@@ -398,14 +398,12 @@ if $ARGS[0] = 'cosmetica':
 			! Shave Pubes
 			if pubestyle = 1:
 				pcs_pubes = 0
-			elseif pubestyle >= 2 and pubestyle <= 7:
-				pcs_pubes = 11
-			elseif pubestyle = 8:
+			elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 				pcs_pubes = 16
-			elseif pubestyle = 9:
-				pcs_pubes = 21
-			elseif pubestyle = 10:
+			elseif pubestyle = 10 and pcs_pubes >= 35:
 				pcs_pubes = 26
+			elseif pubestyle = 11 and pcs_pubes > 10:
+				pcs_pubes = 0
 			end
 		end