Browse Source

[added] Made function for Sveta's pube images and replaced all the direct image links plus tidied up the pussy image folder and gave teh images more logical names
[added] Ability to dye your pubic hair in the salon in the city and slowed pubic hair growth then tied it in with dye cooldown.

KevinSmarts 4 years ago
parent
commit
1fa94fc4da

+ 1 - 0
glife.qproj

@@ -1037,6 +1037,7 @@
 		<Location name="$buy_single_item"/>
 		<Location name="$face_image"/>
 		<Location name="$body_image"/>
+		<Location name="$pube_image"/>
 	</Folder>
 	<Folder name="Female wrestling">
 		<Location name="generation"/>

+ 1 - 30
locations/_body_image.qsrc

@@ -99,36 +99,7 @@ end
 
 if $ARGS[0] = 'panties':
 	if $pantyworntype = 'none':
-		if pcs_pubes <= 3:
-			$RESULT = 'images/pc/body/pussy/pussy.jpg'
-		elseif pcs_pubes > 3 and pcs_pubes <= 10:
-			$RESULT = 'images/pc/body/pussy/stpussy.jpg'
-		elseif pcs_pubes > 10 and pcs_pubes <= 15:
-			if pubestyle >= 2 and pubestyle <= 7:
-				$RESULT = $pubeimage
-			else
-				$RESULT = 'images/pc/body/pussy/3.jpg'
-			end
-		elseif pcs_pubes > 15 and pcs_pubes <= 20:
-			if pubestyle = 8: $RESULT = $pubeimage
-			if pubestyle ! 8: $RESULT = 'images/pc/body/pussy/spussy.jpg'
-		elseif pcs_pubes > 20 and pcs_pubes <= 25:
-			if pubestyle = 9: 
-				$RESULT = 'images/pc/body/pussy/spussy.jpg'
-			elseif pubestyle = 13:
-				$RESULT = 'images/pc/body/pussy/shave/mb.jpg'
-			elseif pubestyle = 13:
-				$RESULT = 'images/pc/body/pussy/shave/bstrip.jpg'
-			elseif pubestyle = 14:
-				$RESULT = 'images/pc/body/pussy/shave/rectangle.jpg'
-			else
-				$RESULT = 'images/pc/body/pussy/shave/s_bush1.jpg'
-			end
-		elseif pcs_pubes > 25 and pcs_pubes <= 40:
-			$RESULT = 'images/pc/body/pussy/hpussy.jpg'
-		elseif pcs_pubes >= 40:
-			$RESULT = 'images/pc/body/pussy/hrypussy.jpg'
-		end
+		$RESULT = FUNC('$pube_image')
 		$body_image_msg += 'You are not wearing any panties.'
 	else
 		$RESULT = FUNC('$panty_image', $pantyworntype, pantywornnumber)

+ 125 - 0
locations/_pube_image.qsrc

@@ -0,0 +1,125 @@
+# $face_image
+
+!!use with - <img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>">
+
+
+$RESULT = 'images/pc/body/pussy/'
+
+$RESULT += 'pussy'
+
+if lashair = 0:
+	if pcs_pubes <= 3:
+		$RESULT += 'pussy'
+	elseif pcs_pubes <= 10:
+		$RESULT += 'hair/stubble'
+	elseif pcs_pubes <= 15:
+		$RESULT += 'hair/very_short'
+	elseif pcs_pubes <= 20:
+		if pcs_pubecol[2] = 0:
+			$RESULT += 'hair/black_small'
+		elseif pcs_pubecol[2] = 1:
+			$RESULT += 'hair/brunette_small'
+		elseif pcs_pubecol[2] = 2:
+			$RESULT += 'hair/ginger_small'
+		elseif pcs_pubecol[2] = 3:
+			$RESULT += 'hair/blonde_small'
+		elseif pcs_pubecol[2] = 4:
+			$RESULT += 'hair/red'
+		elseif pcs_pubecol[2] = 5:
+			$RESULT += 'hair/blue'
+		elseif pcs_pubecol[2] = 6:
+			$RESULT += 'hair/green'
+		elseif pcs_pubecol[2] = 7:
+			$RESULT += 'hair/pink'
+		elseif pcs_pubecol[2] = 8:
+			$RESULT += 'hair/purple'
+		end
+	elseif pcs_pubes <= 25:
+		elseif pubestyle = 2:
+			$RESULT += 'shave/v1'
+		elseif pubestyle = 3:
+			$RESULT += 'shave/triangle1'
+		elseif pubestyle = 4:
+			$RESULT += 'shave/landing1'
+		elseif pubestyle = 5:
+			$RESULT += 'shave/heart1'
+		elseif pubestyle = 6:
+			$RESULT += 'shave/flame1'
+		elseif pubestyle = 7:
+			$RESULT += 'shave/cross1'
+		elseif pubestyle = 8:
+			$RESULT += 'shave/s_bush1'
+		elseif pubestyle = 12:
+			$RESULT += 'shave/mb'
+		elseif pubestyle = 13:
+			$RESULT += 'shave/bstrip'
+		elseif pubestyle = 14:
+			$RESULT += 'shave/rectangle'
+		else
+			if pcs_pubecol[2] = 0:
+				$RESULT += 'hair/black_mid'
+			elseif pcs_pubecol[2] = 1:
+				$RESULT += 'hair/brunette_mid'
+			elseif pcs_pubecol[2] = 2:
+				$RESULT += 'hair/ginger_mid'
+			elseif pcs_pubecol[2] = 3:
+				$RESULT += 'hair/blonde_mid'
+			elseif pcs_pubecol[2] = 4:
+				$RESULT += 'hair/red'
+			elseif pcs_pubecol[2] = 5:
+				$RESULT += 'hair/blue'
+			elseif pcs_pubecol[2] = 6:
+				$RESULT += 'hair/green'
+			elseif pcs_pubecol[2] = 7:
+				$RESULT += 'hair/pink'
+			elseif pcs_pubecol[2] = 8:
+				$RESULT += 'hair/purple'
+			end
+	elseif pcs_pubes <= 30:
+		if pcs_pubecol[2] = 0:
+			$RESULT += 'hair/black_mid'
+		elseif pcs_pubecol[2] = 1:
+			$RESULT += 'hair/brunette_mid'
+		elseif pcs_pubecol[2] = 2:
+			$RESULT += 'hair/ginger_mid'
+		elseif pcs_pubecol[2] = 3:
+			$RESULT += 'hair/blonde_mid'
+		elseif pcs_pubecol[2] = 4:
+			$RESULT += 'hair/red'
+		elseif pcs_pubecol[2] = 5:
+			$RESULT += 'hair/blue'
+		elseif pcs_pubecol[2] = 6:
+			$RESULT += 'hair/green'
+		elseif pcs_pubecol[2] = 7:
+			$RESULT += 'hair/pink'
+		elseif pcs_pubecol[2] = 8:
+			$RESULT += 'hair/purple'
+		end
+	elseif pcs_pubes >= 40:
+		if pcs_pubecol[2] = 0:
+			$RESULT += 'hair/black_full'
+		elseif pcs_pubecol[2] = 1:
+			$RESULT += 'hair/brunette_full'
+		elseif pcs_pubecol[2] = 2:
+			$RESULT += 'hair/ginger_full'
+		elseif pcs_pubecol[2] = 3:
+			$RESULT += 'hair/blonde_full'
+		elseif pcs_pubecol[2] = 4:
+			$RESULT += 'hair/red'
+		elseif pcs_pubecol[2] = 5:
+			$RESULT += 'hair/blue'
+		elseif pcs_pubecol[2] = 6:
+			$RESULT += 'hair/green'
+		elseif pcs_pubecol[2] = 7:
+			$RESULT += 'hair/pink'
+		elseif pcs_pubecol[2] = 8:
+			$RESULT += 'hair/purple'
+		end
+	end
+end
+	
+
+$RESULT += '.jpg'
+
+--- $face_image ---------------------------------
+

+ 12 - 12
locations/body.qsrc

@@ -2042,13 +2042,13 @@ if lashair = 1:
 	end
 	$pcdesc_pubes = 'hairless'
 	$pcdesc_pubeswordy = 'eternally silky-smooth'
-	$pcs_pubes = 'You have a smooth, <a href="exec:view''images/pc/body/pussy/pussy.jpg''">bald pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+	$pcs_pubes = 'You have a smooth, <a href="exec:view''<<FUNC(''$pube_image'')>>''">bald pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 end
 
 if lashair = 0:
 	if pcs_pubes <= 3:
 		lobkoef = 3 
-		$pcs_pubes = 'You have a smoothly <a href="exec:view''images/pc/body/pussy/pussy.jpg''">shaved pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a smoothly <a href="exec:view''<<FUNC(''$pube_image'')>>''">shaved pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,3)
 		if rand_pubes = 0:
 			$pcdesc_pubesrandom = 'silky'
@@ -2063,7 +2063,7 @@ if lashair = 0:
 		$pcdesc_pubeswordy = 'silky, freshly-shaven'
 	elseif pcs_pubes <= 10:
 		lobkoef = 0
-		$pcs_pubes = 'You have stubble growing around your <a href="exec:view''images/pc/body/pussy/stpussy.jpg''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have stubble growing around your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:
 			$pcdesc_pubesrandom = 'stubbly'
@@ -2076,7 +2076,7 @@ if lashair = 0:
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
 	elseif pcs_pubes <= 15:
 		lobkoef = 0
-		$pcs_pubes = 'You have a tidy patch of hair growing above your '+iif(pubestyle >= 2 and pubestyle <=7,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/3.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a tidy patch of hair growing above your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:
 			$pcdesc_pubesrandom = 'almost bare'
@@ -2089,7 +2089,7 @@ if lashair = 0:
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
 	elseif pcs_pubes <= 20:
 		lobkoef = 0
-		$pcs_pubes = 'You have neatly trimmed section of hair around your '+iif(pubestyle = 8,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/spussy.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have neatly trimmed section of hair around your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,3)
 		if rand_pubes = 0:
 			$pcdesc_pubesrandom = 'wispy-haired'
@@ -2105,15 +2105,15 @@ if lashair = 0:
 	elseif pcs_pubes <= 25:
 		lobkoef = 0
 		if pubestyle = 9:
-			$pcs_pubes = 'You have neatly trimmed section of hair around your '+iif(pubestyle = 9,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/s_bush1.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have neatly trimmed section of hair around your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		elseif pubestyle = 12:
-			$pcs_pubes = 'You have cute little patch of bush at the top of your '+iif(pubestyle = 9,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/shave/mb.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have cute little patch of bush at the top of your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		elseif pubestyle = 13:
-			$pcs_pubes = 'You have tidy strip of bush covering your '+iif(pubestyle = 9,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/shave/bstrip.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have tidy strip of bush covering your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		elseif pubestyle = 14:
-			$pcs_pubes = 'You have neatly trimmed rectangle of hair just above your '+iif(pubestyle = 9,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/shave/rectangle.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have neatly trimmed rectangle of hair just above your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		else
-			$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/hpussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''<<FUNC(''$pube_image'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		end
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:
@@ -2127,7 +2127,7 @@ if lashair = 0:
 		$pcdesc_pubeswordy = 'bushy, thick'
 	elseif pcs_pubes <= 30:
 		lobkoef = 0
-		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/hpussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''<<FUNC(''$pube_image'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:
 			$pcdesc_pubesrandom = 'furred'
@@ -2140,7 +2140,7 @@ if lashair = 0:
 		$pcdesc_pubeswordy = 'bushy, thick'
 	elseif pcs_pubes >= 40:
 		lobkoef = 0
-		$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''images/pc/body/pussy/hrypussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''<<FUNC(''$pube_image'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:
 			$pcdesc_pubesrandom = 'thickly-furred'

+ 1 - 1
locations/brother_lessons.qsrc

@@ -662,7 +662,7 @@ if $ARGS[0] = 'anatomylesson3':
 			
 			gs 'stat'
 			*clr
-			'<center><img <<$set_imgh>> src="images/pc/body/pussy/vag<<vagtype>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>.jpg"></center>'
 			
 			if vagtype = 0:
 				'"Next is a very special part of the vagina," you start. You spread your pussy lips apart and let him look inside. "This is the hymen. Every girl is born with one and will have it until it gets torn."'

+ 15 - 1
locations/cikl.qsrc

@@ -596,7 +596,7 @@ if ArrSize('$MenCal') = 60: killvar '$MenCal',0
 
 if lashair ! 1:
 	pcs_leghair += 1
-	pcs_pubes += 1
+	pcs_pubes += rand(0,1)
 end
 
 if age < 18 and rand (0,2) = 0 and pcs_leghair > 0: pcs_leghair -= 1
@@ -795,6 +795,20 @@ if pcs_haircol ! nathcol:
 	if dyefade = 0: dyevmod = 15
 end
 
+!!pubic hair colouring
+!! pcs_pubecol = natural colour
+!! pcs_pubecol[1] = flag for saveupdate
+!! pcs_pubecol[2] = actual colour
+!! pcs_pubecol[3] = countdown timer for dye
+
+if pcs_pubecol[2] ! pcs_pubecol:
+	pcs_pubecol[3] -=1
+	if pcs_pubecol[3] < 0: pcs_pubecol[3] = 0
+	if pcs_pubecol[3] = 0: pcs_pubecol[2] = pcs_pubecol
+end
+
+if pcs_pubes < 2: pcs_pubecol[2] = pcs_pubecol
+
 if hscrunch > 0:
 	hscrunchrand = rand(1, 100)
 

+ 4 - 17
locations/din_van.qsrc

@@ -1616,23 +1616,10 @@ if $ARGS[0] = 'shave_options':
 	menu_off = 1
 	*clr & cla
 	if shave_img_hgt = 0:shave_img_hgt = 100
-	!if pubestyle = 0 = never shave (uses $pcs_pubes)
-	!if pubestyle = 1: $pubeimage = 'images/pc/body/pussy/pussy.jpg' (uses $pcs_pubes)
-	if pubestyle = 2: $pubeimage = 'images/pc/body/pussy/shave/v1.jpg'
-	if pubestyle = 3: $pubeimage = 'images/pc/body/pussy/shave/triangle1.jpg'
-	if pubestyle = 4: $pubeimage = 'images/pc/body/pussy/shave/landing1.jpg'
-	if pubestyle = 5: $pubeimage = 'images/pc/body/pussy/shave/heart1.jpg'
-	if pubestyle = 6: $pubeimage = 'images/pc/body/pussy/shave/flame1.jpg'
-	if pubestyle = 7: $pubeimage = 'images/pc/body/pussy/shave/cross1.jpg'
-	if pubestyle = 8: $pubeimage = 'images/pc/body/pussy/shave/s_bush1.jpg'
-	!if pubestyle = 9: $pubeimage = 'images/pc/body/pussy/spussy.jpg'  (uses $pcs_pubes)
-	!if pubestyle = 10: $pubeimage = 'images/pc/body/pussy/hpussy.jpg' (uses $pcs_pubes)
-	if pubestyle = 12: $pubeimage = 'images/pc/body/pussy/shave/mb.jpg'
-	if pubestyle = 13: $pubeimage = 'images/pc/body/pussy/shave/bstrip.jpg'
-	if pubestyle = 14: $pubeimage = 'images/pc/body/pussy/shave/rectangle.jpg'
+	!! 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/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/pussy.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/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''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/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>'
 	'<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>'
@@ -1664,7 +1651,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/spussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/spussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/hpussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hpussy.jpg"></a></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>'
 	'<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>'
@@ -1695,7 +1682,7 @@ if $ARGS[0] = 'shave_options':
 	else
 		'Full Bush'
 	end
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/stpussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/stpussy.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''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>'
 	*nl
 	'<TR><TD><center>'
 	if pubestyle ! 11 and pcs_pubes > 10:

+ 265 - 1
locations/salon.qsrc

@@ -28,6 +28,12 @@ if $ARGS[0] = 'start':
 		'Lengthening eyelashes - 5,000 <b>₽</b>'
 		'Wellness massage (accelerates fat loss and rejuvenates the body), 2,500 <b>₽</b>'
 	end
+	if pcs_pubes <= 20:
+		'Dye your pubic hair - 500 <b>₽</b> (Your pubic hair is too short to dye)'
+	else
+		if money >= 500:'<a href="exec:gt ''salon'', ''pubes''">Dye your pubic hair - 500 <b>₽</b></a>'
+		if money < 500:'Dye your pubic hair - 500 <b>₽</b>'
+	end
 	if money >= 2000 and lashair = 0:'<a href="exec:gt ''salon'', ''epilyaciya''">Full body depilation - 2,000 <b>₽</b></a>'
 	if money < 2000 or lashair = 1:'Full body depilation - 2,000 <b>₽</b>'
 	if money >= 5000:'<a href="exec:gt ''salon'', ''uhodkosha''">Skin Care - 5,000 <b>₽</b></a>'
@@ -36,7 +42,7 @@ if $ARGS[0] = 'start':
 	if money < 25000:'Rejuvenation - 25,000 <b>₽</b>'
 	if hour < 8 or hour > 20:
 		cls
-		'As the salon closes you are politely asked to leave and come again.'
+		'As the salon closes you are politely asked to leave but please come again soon.'
 		act 'Leave':minut += 3 & gt 'torgcentr'
 		exit
 	end
@@ -234,6 +240,264 @@ if $ARGS[0] = 'lashExtension':
 	act 'Leave':gt 'salon', 'start'
 end
 
+if $ARGS[0] = 'pubes':
+	cla & *clr
+	$menu_loc = 'salon'
+	$menu_arg = 'pubes'
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/salon.jpg"></center>'
+	'You go to the technician and tell her you want to dye you pubic hair.'
+	'She asks what colour you''d like.'
+	*nl
+
+	if pcs_pubecol[2] ! pcs_pubecol:
+		act'Return to natural colour':
+			cla
+			'"I''m looking to reverse the change of pube colour, I''d like my natural colour back."' 
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				money -= 500
+				pcs_pubecol[2] = pcs_pubecol
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Move away':gt 'hairsalon', 'start'
+			end
+		end
+	end	
+	if pcs_pubecol[2] ! 0:
+		act 'Black':
+			cla
+			'"Black", you say, "I want to be dark and alluring."'
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 0
+				pcs_pubecol[3] = pcs_pubes*2
+				money -= 500
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Look in the mirror':gt 'hairsalon', 'mirror'
+			end
+		end
+	end
+
+	if pcs_pubecol[2] ! 1:
+		act 'Brown':
+			cla
+			'"Brown", you say. "I think that looks nice"'
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 1
+				pcs_pubecol[3] = rand(35,42)
+				money -= 500
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Look in the mirror':gt 'hairsalon', 'mirror'
+			end
+		end
+	end
+
+	if pcs_pubecol[2] ! 2:
+		act 'Ginger':
+			cla
+			'"Ginger, I think that''s a bit different and hot", you say.'
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 2
+				pcs_pubecol[3] = pcs_pubes*2
+				money -= 500
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Look in the mirror':gt 'hairsalon', 'mirror'
+			end
+		end
+	end
+
+	if pcs_haircol ! 3:
+		act 'Blonde':
+			cla
+			'"Blonde! Blondes have more fun. I don''t know if that works for pubes but I want to find out", you giggle.'
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 3
+				pcs_pubecol[3] = pcs_pubes*2
+				money -= 500
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Look in the mirror':gt 'hairsalon', 'mirror'
+			end
+		end
+	end
+	if pcs_haircol ! 4:
+		act 'Red':
+			cla
+			gs 'stat'
+			'"Red. Like really red" you tell her.'
+			'"And what would that be?" The hairdresser asks cheerfully.'
+			'"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':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 4
+				pcs_pubecol[3] = pcs_pubes*2
+				money -= 500
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Move away':gt 'hairsalon', 'start'
+			end
+		end
+	end
+	if pcs_haircol ! 5:
+		act 'Blue':
+			cla
+			gs 'stat'
+			'"This is a bit unusual but I want to try blue." you tell her.'
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 5
+				pcs_pubecol[3] = pcs_pubes*2
+				money -= 500
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Move away':gt 'hairsalon', 'start'
+			end
+		end
+	end
+	if pcs_haircol ! 6:
+		act 'Green':
+			cla
+			gs 'stat'
+			'"Green so as to help the rain forest." you tell her.'
+			'"I don''t think that''s how it works" The hairdresser says looking confused.'
+			'"Can we at least try?." you ask.'
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 6
+				pcs_pubecol[3] = pcs_pubes*2
+				money -= 500
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Move away':gt 'hairsalon', 'start'
+			end
+		end
+	end
+	if pcs_haircol ! 7:
+		act 'Pink':
+			cla
+			gs 'stat'
+			'"I want pink pubes." you tell her.'
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 7
+				pcs_pubecol[3] = pcs_pubes*2
+				money -= 500
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Move away':gt 'hairsalon', 'start'
+			end
+		end
+	end
+	if pcs_haircol ! 8:
+		act 'Purple':
+			cla
+			gs 'stat'
+			'"Do you have any purple dye?" you ask her.'
+			'"Sure thing!", she says in a cheerful way and leads you to a private room, "Why don''t you take a seat and pull down your clothes?"'
+			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
+
+			act 'Sit down':
+				cla
+				*clr
+				minut += 45
+				pcs_pubecol[2] = 8
+				pcs_pubecol[3] = pcs_pubes*2
+				money -= 500
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
+				'45 minutes later, The dye has taken and dried in.'
+				'The beauty technician checks that everything is OK. "All done, you can get dressed."'
+				'You pull your clothes back up and pay her 500 <b>₽</b>.'
+
+				act 'Move away':gt 'hairsalon', 'start'
+			end
+		end
+	end
+end
+
+
 if $ARGS[0] = 'epilyaciya':
 	cla & *clr
 	minut += 60

+ 4 - 4
locations/stat_display.qsrc

@@ -1847,13 +1847,13 @@ if enable_extra_msg = 1:
 
 	if pcs_horny >= 50:
 		if pcs_horny < 90 and $pantyworntype ! 'none':
-			$stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/briefs1.jpg''">itchy</a> from arousal.</font>'
+			$stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/aroused/panties_low.jpg''">itchy</a> from arousal.</font>'
 		elseif pcs_horny < 90 and $pantyworntype = 'none':
-			$stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/briefs1a.jpg''">itchy</a> from arousal.</font>'
+			$stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/aroused/none_low.jpg''">itchy</a> from arousal.</font>'
 		elseif $pantyworntype ! 'none':
-			$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/briefs2.jpg''">soaked</a> from your juices.</font>'
+			$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/aroused/panties_high.jpg''">soaked</a> from your juices.</font>'
 		else
-			$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/briefs2a.jpg''">soaked</a> from your juices.</font>'
+			$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/aroused/panties_high.jpg''">soaked</a> from your juices.</font>'
 		end
 	end