Merge remote-tracking branch 'Felix/master'

locations/din_van.qsrc

@@ -1097,9 +1097,15 @@ if $ARGS[0] = 'private':
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:*clr & cla & dynamic $pirManage">Manage your piercings</a>'
 
-	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & bodyVars[''bust_silicone''] += 10 & gt $loc, $loc_arg">Inject silicone into your breast implants.</a>'
-	if fillimplant = 1 and bodyVars['bust_silicone'] >= 20:'<a href="exec:cls & bodyVars[''bust_silicone''] -= 10 & gt $loc, $loc_arg">Drain silicone from your breast implants.</a>'
+	if fillimplant = 1:
+		if siliconeBag >= 1:
+			'<a href="exec:cls & siliconeBag -= 1 & bodyVars[''bust_silicone''] += 10 & gt $loc, $loc_arg">Inject silicone into your breast implants.</a>'
+		end
 
+		if bodyVars['bust_silicone'] >= 20:
+			'<a href="exec:cls & bodyVars[''bust_silicone''] -= 10 & gt $loc, $loc_arg">Drain silicone from your breast implants.</a>'
+		end
+	end
 	dynamic $bteeth
 
 	dynamic $tampon
@@ -1706,104 +1712,117 @@ if $ARGS[0] = 'shave_options':
 	*nl
 	if shave_menu = 0:
 		'Your current routine doesn''t include any shaving options.'
+		$temp_toggle = 'shave_menu = 2'
 	elseif shave_menu = 1:
 		'Your current routine involves shaving your legs and maintaining your current pubic style.'
 		'It takes 15 minutes to complete this routine.'
+		$temp_toggle = 'shave_menu = 2'
 	elseif shave_menu = 2:
 		'Your current routine involves not shaving your legs and maintaining your current pubic style.'
 		'It takes 10 minutes to complete this routine.'
+		$temp_toggle = 'shave_menu = 2'
 	elseif shave_menu = 3:
 		'Your current routine involves shaving your legs and not maintaining any chosen pubic style.'
 		'It takes 5 minutes to complete this routine.'
+		$temp_toggle = 'shave_menu = 1'
 	end
 	*nl
 	*p '<table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
 
 	!! ROW 1: IMAGES
-		*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>'
+		*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>'
+		*P '<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>'
+		*P '<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>'
+		*P '<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>'
+		*P '<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>'
 
 	!! ROW 1: TEXT
 		*p '<TR><TD><center>'
 		if pubestyle ! 1:
-			*p '<a href="exec:pubestyle = 1 & shave_length = 0 & shave_trigger = 3 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
+			*p '<a href="exec:pubestyle = 1 & shave_length = 0 & shave_trigger = 3 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Clean Shave</a>'
 		else
 			*p 'Clean Shave'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 2 and pcs_pubes > 15:
-			*p '<a href="exec:pubestyle = 2 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">V-shaped</a>'
+			*p '<a href="exec:pubestyle = 2 & shave_length = 16 & shave_trigger = 21 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">V-shaped</a>'
 		else
 			*p 'V-shaped'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 3 and pcs_pubes > 15:
-			*p '<a href="exec:pubestyle = 3 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
+			*p '<a href="exec:pubestyle = 3 & shave_length = 16 & shave_trigger = 21 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
 		else
 			*p 'Triangle-shaped'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 4 and pcs_pubes > 15:
-			*p '<a href="exec:pubestyle = 4 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Landing-strip</a>'
+			*p '<a href="exec:pubestyle = 4 & shave_length = 16 & shave_trigger = 21 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Landing-strip</a>'
 		else
 			*p 'Landing-strip'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 5 and pcs_pubes > 15:
-			*p '<a href="exec:pubestyle = 5 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
+			*p '<a href="exec:pubestyle = 5 & shave_length = 16 & shave_trigger = 21 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
 		else
 			*p 'Heart-shaped'
 		end
 		*p '</center></TD></TR>'
 
 	!! ROW 2: IMAGES
-		*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>'
+		*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>'
+		*P '<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>'
+		*P '<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>'
+		*P '<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>'
+		*P '<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>'
 	
 	!! ROW 2: TEXT
 		*p '<TR><TD><center>'
 		if pubestyle ! 6 and pcs_pubes > 15:
-			*p '<a href="exec:pubestyle = 6 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
+			*p '<a href="exec:pubestyle = 6 & shave_length = 16 & shave_trigger = 21 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
 		else
 			*p 'Flame-shaped'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 7 and pcs_pubes > 15:
-			*p '<a href="exec:pubestyle = 7 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
+			*p '<a href="exec:pubestyle = 7 & shave_length = 16 & shave_trigger = 21 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
 		else
 			*p 'Cross-Shaped'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 8 and pcs_pubes > 16:
-			*p '<a href="exec:pubestyle = 8 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Trimmed</a>'
+			*p '<a href="exec:pubestyle = 8 & shave_length = 16 & shave_trigger = 21 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Trimmed</a>'
 		else
 			*p 'Trimmed'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 9 and pcs_pubes > 20:
-			*p '<a href="exec:pubestyle = 9 & shave_length = 20 & shave_trigger = 26 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Small Bush</a>'
+			*p '<a href="exec:pubestyle = 9 & shave_length = 20 & shave_trigger = 26 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Small Bush</a>'
 		else
 			*p 'Small Bush'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 10:
-			*p '<a href="exec:pubestyle = 10 & shave_length = 26 & shave_trigger = 31 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
+			*p '<a href="exec:pubestyle = 10 & shave_length = 26 & shave_trigger = 31 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Full Bush</a>'
 		else
 			*p 'Full Bush'
 		end
 		*p '</center></TD></TR>'
 
 	!! ROW 3: IMAGES
-		*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></TR>'
+		*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>'
+		*P '<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></TR>'
 
 	!! ROW 3: TEXT
 		*p '<TR><TD><center>'
 		if pubestyle ! 11 and pcs_pubes > 10:
-			*p '<a href="exec:pubestyle = 11 & shave_length = 0 & shave_trigger = 8 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Lazy</a>'
+			*p '<a href="exec:pubestyle = 11 & shave_length = 0 & shave_trigger = 8 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Lazy</a>'
 		else
 			*p 'Lazy'
 		end
 		*p '</center></TD><TD><center>'
 		if pubestyle ! 12 and pcs_pubes > 15:
-			*p '<a href="exec:pubestyle = 12 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Mini Bush</a>'
+			*p '<a href="exec:pubestyle = 12 & shave_length = 16 & shave_trigger = 21 & <<$temp_toggle>> & gt ''din_van'', ''shave_options''">Mini Bush</a>'
 		else
 			*p 'Mini Bush'
 		end
@@ -1811,6 +1830,8 @@ if $ARGS[0] = 'shave_options':
 	*p '</center></TD></TR></table>'
 	*p '<sub><small>Lazy - (don''t immediately shave stubble)</small></sub></center>'
 
+	killvar '$temp_toggle'
+
 	act 'Return':menu_off = 0 & gt $loc, $loc_arg
 	act 'Set image height for this view':
 		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 100, min 50, max 500)")

locations/pav_park_sex.qsrc

@@ -342,7 +342,7 @@ if $ARGS[0] = 'pressured_for_bra':
 		gs 'arousal', 'flashlite', 5, 'sub', 'inhibition', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		killvar $grp_msg
+		killvar '$grp_msg'
 		act 'Leave':gt 'pav_park', 'deeper_park'
 	
 	end
@@ -411,7 +411,7 @@ if $ARGS[0] = 'pressured_for_panties':
 		gs 'arousal', 'flashlite', 5, 'sub', 'inhibition', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		killvar $grp_msg
+		killvar '$grp_msg'
 		act 'Leave':gt 'pav_park', 'deeper_park'
 	end
 	gs 'willpower', 'action', 'resist', 'medium'
@@ -478,7 +478,7 @@ if $ARGS[0] = 'pressured_for_tits':
 		gs 'arousal', 'flash', 5, 'sub', 'inhibition', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		killvar $grp_msg
+		killvar '$grp_msg'
 		act 'Leave':gt 'pav_park', 'deeper_park'
 	end
 	gs 'willpower', 'action', 'resist', 'medium'
@@ -546,7 +546,7 @@ if $ARGS[0] = 'pressured_for_pussy':
 		gs 'arousal', 'flash', 5, 'sub', 'inhibition', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		killvar $grp_msg
+		killvar '$grp_msg'
 		act 'Leave':gt 'pav_park', 'deeper_park'
 	end
 	gs 'willpower', 'action', 'resist', 'medium'
@@ -863,8 +863,7 @@ if $ARGS[0] = 'pressured_for_gangbang':
 											'Some crawl under you, sliding their dick inside your pussy, while another shoves his cock up your ass. Finally, a dick is shoved in your mouth. You''re fucked like this for several minutes before they change places. After that, you lose track of who is fucking you and in which hole.'
 											gs 'arousal', 'bj', 5, 'sub', 'inhibition', 'humiliation', 'group', 'gangbang'
 											gs 'arousal', 'vaginal', -5, 'sub', 'inhibition', 'humiliation', 'group', 'gangbang'
-											gs 'arousal', 'anal', 5, 'sub', 'inhibition', 'humiliation', 'group', 'gangbang'
-											minut -5
+											gs 'arousal', 'anal', -5, 'sub', 'inhibition', 'humiliation', 'group', 'gangbang'
 											!!not sure how to code this since Sveta is doing all three for 5 mins
 											gs 'stat'
 											act 'It doesn''t end':
@@ -873,8 +872,7 @@ if $ARGS[0] = 'pressured_for_gangbang':
 												'Dicks just keep sliding in and out of your holes before you start hearing some of them grunt, and then Vitek barks out. "Get on your knees, slut." As he does, you feel all the dicks slide out of you. You get to your knees, feeling exhausted and sore all over.'
 												gs 'arousal', 'bj', 5, 'sub', 'inhibition', 'humiliation', 'group', 'gangbang'
 												gs 'arousal', 'vaginal', -5, 'sub', 'inhibition', 'humiliation', 'group', 'gangbang'
-												gs 'arousal', 'anal', 5, 'sub', 'inhibition', 'humiliation', 'group', 'gangbang'
-												minut -5
+												gs 'arousal', 'anal', -5, 'sub', 'inhibition', 'humiliation', 'group', 'gangbang'
 												gs 'arousal', 'end'
 												gs 'stat'
 												act 'Kneel':