[fixed] not being able to use breast massage or breast pump under certain conditions.

[changed] lowered the inhib values for actions (lower than skinny dipping in public).
[changed] can now continue to massage in the bedroom even after owning a pump.
[added] "too sore" message to hand massage.

locations/din_van.qsrc

@@ -254,7 +254,7 @@ $brit = {
 					elseif pubestyle >= 9:
 						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your small neat bush as well.'
 					elseif pubestyle >= 10:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your  bush as well.'
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your	 bush as well.'
 					end
 					dynamic $dryOff
 				end
@@ -563,7 +563,7 @@ $pirTongue = {
 
 	i = 1
 	:looptongue_pir
-		if dyneval('RESULT = PirsA<<i>>_owned') = 1:*p '<a href="exec:pirsA = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/a<<i>>.jpg" 	height="250" ></a>'
+		if dyneval('RESULT = PirsA<<i>>_owned') = 1:*p '<a href="exec:pirsA = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/a<<i>>.jpg"	height="250" ></a>'
 		i += 1
 	if i <= 4:jump 'looptongue_pir'
 }
@@ -573,7 +573,7 @@ $pirLip = {
 
 	i = 1
 	:looplip_pir
-		if dyneval('RESULT = PirsB<<i>>_owned') = 1:*p '<a href="exec:pirsB = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/b<<i>>.jpg" 	height="250" ></a>'
+		if dyneval('RESULT = PirsB<<i>>_owned') = 1:*p '<a href="exec:pirsB = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/b<<i>>.jpg"	height="250" ></a>'
 		i += 1
 	if i <= 6:jump 'looplip_pir'
 }
@@ -583,7 +583,7 @@ $pirEars = {
 
 	i = 1
 	:loopears_pir
-		if dyneval('RESULT = PirsC<<i>>_owned') = 1:*p '<a href="exec:pirsC = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/c<<i>>.jpg" 	height="250" ></a>'
+		if dyneval('RESULT = PirsC<<i>>_owned') = 1:*p '<a href="exec:pirsC = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/c<<i>>.jpg"	height="250" ></a>'
 		i += 1
 	if i <= 24:jump 'loopears_pir'
 }
@@ -593,7 +593,7 @@ $pirNose = {
 
 	i = 1
 	:loopnose_pir
-		if dyneval('RESULT = PirsD<<i>>_owned') = 1:*p '<a href="exec:pirsD = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/d<<i>>.jpg" 	height="250" ></a>'
+		if dyneval('RESULT = PirsD<<i>>_owned') = 1:*p '<a href="exec:pirsD = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/d<<i>>.jpg"	height="250" ></a>'
 		i += 1
 	if i <= 7:jump 'loopnose_pir'
 }
@@ -603,7 +603,7 @@ $pirBrow = {
 
 	i = 1
 	:loopbrow_pir
-		if dyneval('RESULT = PirsE<<i>>_owned') = 1:*p '<a href="exec:pirsE = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/e<<i>>.jpg" 	height="250" ></a>'
+		if dyneval('RESULT = PirsE<<i>>_owned') = 1:*p '<a href="exec:pirsE = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/e<<i>>.jpg"	height="250" ></a>'
 		i += 1
 	if i <= 2:jump 'loopbrow_pir'
 }
@@ -613,7 +613,7 @@ $pirNips = {
 
 	i = 1
 	:loopnipple_pir
-		if dyneval('RESULT = PirsF<<i>>_owned') = 1:*p '<a href="exec:pirsF = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/f<<i>>.jpg" 	height="250" ></a>'
+		if dyneval('RESULT = PirsF<<i>>_owned') = 1:*p '<a href="exec:pirsF = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/f<<i>>.jpg"	height="250" ></a>'
 		i += 1
 	if i <= 4:jump 'loopnipple_pir'
 }
@@ -623,7 +623,7 @@ $pirNavel = {
 
 	i = 1
 	:loopnavel_pir
-		if dyneval('RESULT = PirsN<<i>>_owned') = 1:*p '<a href="exec:pirsN = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/n<<i>>.jpg" 	height="250" ></a>'
+		if dyneval('RESULT = PirsN<<i>>_owned') = 1:*p '<a href="exec:pirsN = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/n<<i>>.jpg"	height="250" ></a>'
 		i += 1
 	if i <= 4:jump 'loopnavel_pir'
 }
@@ -633,7 +633,7 @@ $pirPubic = {
 
 	i = 1
 	:looppubic_pir
-		if dyneval('RESULT = PirsG<<i>>_owned') = 1:*p '<a href="exec:pirsG = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/g<<i>>.jpg" 	height="250" ></a>'
+		if dyneval('RESULT = PirsG<<i>>_owned') = 1:*p '<a href="exec:pirsG = <<i>> & pierWearCount += 1 & dynamic $pirManage"><img src="images/pc/body/piercings/g<<i>>.jpg"	height="250" ></a>'
 		i += 1
 	if i <= 7:jump 'looppubic_pir'
 }
@@ -972,16 +972,16 @@ if $ARGS[0] = 'private':
 		end
 	end
 	
-    !!breast pump is now in the menu, not on the screen
-    if breastpump > 0 and bp_unbox >= 1:
-        act 'Use breast pump':
-            gt 'lact_lib', 'bp_milking'
-        end
-    elseif breastpump > 0 and bp_unbox <= 0:
-        '<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
-    elseif breastpump <= 0 and pcs_horny >= temp_var:
-        gs 'lact_lib', 'massage'
-    end
+	!!breast pump is now in the menu, not on the screen
+	if breastpump > 0 and bp_unbox >= 1:
+		act 'Use breast pump':
+			gt 'lact_lib', 'bp_milking'
+		end
+	elseif breastpump > 0 and bp_unbox <= 0:
+		'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+	elseif breastpump <= 0:
+		gs 'lact_lib', 'massage'
+	end
 end
 
 if $ARGS[0] = 'misery':

locations/lact_lib.qsrc

@@ -518,8 +518,8 @@ if $ARGS[0] = 'bp_milking':
 	pumptype = 0
 	if pump_bottletype < 1500: pump_bottletype = 1500
 	if bpbottles <= 0: bpbottles = 1
-	if $location_type ! 'bathroom' and pcs_inhib < 40:
-		'You can''t use it here.'
+	if $location_type ! 'bathroom' and pcs_inhib < 30:
+		'You aren''t confident enough to do that here.'
 			act 'Finish': menu_off = 0 & gt $loc, $metka
 	elseif bp_unbox <= 0:
 		'You need to unbox your breast pump first.'
@@ -598,7 +598,7 @@ if $ARGS[0] = 'bp_milking':
 				gt 'lact_lib', 'milking'
 			end
 		end
-		act 'Massage your breasts':	gt 'lact_lib','man_milking'
+		act 'Massage your breasts': gt 'lact_lib','man_milking'
 		act 'Don''t pump':menu_off = 0 & gt $loc, $metka
 	end
 end
@@ -613,80 +613,73 @@ if $ARGS[0] = 'massage':
 	else
 		temp_var = (50/breastcounter)
 	end
-	if breastpump = 0 and pcs_horny >= temp_var and pcs_inhib >= 40:
+	if (($location_type ! 'bathroom' and pcs_inhib >= 30) or $location_type = 'bathroom' and breastpump = 0) and pcs_horny >= temp_var:
 		act 'Massage your breasts': gt 'lact_lib','man_milking'
 	end
 end
 
 if $ARGS[0] = 'man_milking':
 	pumptime = 0
-	if pcs_inhib < 40:
-		*clr
-		cla
-		'You can''t do this here.'
-			act 'Finish':menu_off = 0 & gt $loc, $metka
-	else
-		*clr
-		cla
-		'How long do you want to massage your breasts?'
-		if lactatemv > 0:
-			pumptime = (func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10)))
-			if pumptime > 60:
-				act 'Express until breasts are empty':
-					*clr
-					cla
-					minut += 2
-					'You prepare yourself and weight your breasts in your hands. You feel that your breasts carry a large amount of milk and manually expressing it will probably take a long time.'
-					'Getting relieve for your breasts with manual expression will probably take at least <<pumptime>> minutes.'
-					if breastpump <= 0 and bp_unbox <= 1:
-						'You should concider buying a breastpump'
-					elseif breastpump = 1 and bp_unbox <= 1 and pain['nipples'] <= 60:
-						'You should concider using your breastpump.'
-					else
-						'You should concider the use of a breastpump.'
-					end
-					'Do you want to continue?'
-					act 'Don''t express':menu_off = 0 & gt $loc, $metka
-					act 'Express your milk':
-						gt 'lact_lib', 'hand_milking'
-					end
-				end
-			elseif pumptime <= 0:
-				act 'Express milk until breasts are empty':
-					*clr
-					cla
-					minute += 2
-					'As you prepare yourself you feel your breasts in your hands. Your breasts feel really empty. There is no need to express now.'
-					act 'Don''t express milk':menu_off = 0 & gt $loc, $metka
-					act 'back':gt 'lact_lib', 'man_milking'
+	*clr
+	cla
+	'How long do you want to massage your breasts?'
+	if lactatemv > 0:
+		pumptime = (func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10)))
+		if pumptime > 60:
+			act 'Express until breasts are empty':
+				*clr
+				cla
+				minut += 2
+				'You prepare yourself and weight your breasts in your hands. You feel that your breasts carry a large amount of milk and manually expressing it will probably take a long time.'
+				'Getting relieve for your breasts with manual expression will probably take at least <<pumptime>> minutes.'
+				if breastpump <= 0 and bp_unbox <= 1:
+					'You should concider buying a breastpump'
+				elseif breastpump = 1 and bp_unbox <= 1 and pain['nipples'] <= 60:
+					'You should concider using your breastpump.'
+				else
+					'You should concider the use of a breastpump.'
 				end
-			else
-				act 'Express until breasts are empty':
-					pumptime = func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10))
+				'Do you want to continue?'
+				act 'Don''t express':menu_off = 0 & gt $loc, $metka
+				act 'Express your milk':
 					gt 'lact_lib', 'hand_milking'
 				end
 			end
-		end
-		act '5 Minutes':
-			pumptime = 5
-			gt 'lact_lib', 'hand_milking'
-		end
-		act '10 Minutes':
-			pumptime = 10
-			gt 'lact_lib', 'hand_milking'
-		end
-		act 'Custom':
-			pumptime = input ("How long do you plan to massage your breasts? (Not more than 60 minutes)")
-			if pumptime <= 0 or pumptime > 60:
-				minut += 2
-				act 'Don''t express':gt $loc, $metka
+		elseif pumptime <= 0:
+			act 'Express milk until breasts are empty':
+				*clr
+				cla
+				minute += 2
+				'As you prepare yourself you feel your breasts in your hands. Your breasts feel really empty. There is no need to express now.'
+				act 'Don''t express milk':menu_off = 0 & gt $loc, $metka
 				act 'back':gt 'lact_lib', 'man_milking'
-			elseif pumptime > 0 and pumptime <= 60:
+			end
+		else
+			act 'Express until breasts are empty':
+				pumptime = func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10))
 				gt 'lact_lib', 'hand_milking'
 			end
 		end
-		act 'Don''t express':menu_off = 0 & gt $loc, $metka
 	end
+	act '5 Minutes':
+		pumptime = 5
+		gt 'lact_lib', 'hand_milking'
+	end
+	act '10 Minutes':
+		pumptime = 10
+		gt 'lact_lib', 'hand_milking'
+	end
+	act 'Custom':
+		pumptime = input ("How long do you plan to massage your breasts? (Not more than 60 minutes)")
+		if pumptime <= 0 or pumptime > 60:
+			minut += 2
+			act 'Don''t express':gt $loc, $metka
+			act 'back':gt 'lact_lib', 'man_milking'
+		elseif pumptime > 0 and pumptime <= 60:
+			gt 'lact_lib', 'hand_milking'
+		end
+	end
+	act 'Don''t express':menu_off = 0 & gt $loc, $metka
 end
 
 if $ARGS[0] = 'bp_unbox_event':
@@ -1099,19 +1092,21 @@ end
 if $ARGS[0] = 'hand_milking':
 	*clr
 	cla
-	if lactate > 0:
+	if lactate > 0 and pain['nipples'] <= 60:
 		'You start to massage your breasts, your fingers gliding down your breasts skin, over the areolas. Your fingers pressing down into the areola, stretching it forwards to your nipple.'
 		'Several small streams of your milk start to jet out of your nipples.'
 		'You go on for <<pumptime>> minutes until you stop. You clean yourself up and everything else that got wet from your milk.<br>'
 		'<center><video autoplay loop src="images/pc/body/tits/bathroom_milking.mp4"></video></center>'
 		milkedvolume = func('lact_lib','$get_breastmilk', 5, pumptime)
 		minut += pumptime
-	else
+	elseif lactate = 0 and pain['nipples'] <= 60:
 		'You start to massage your breasts, your fingers gliding down your breasts skin, over the areolas. Your fingers pressing down into the areola, stretching it forwards to your nipple,'
 		'kneading your breasts as well.'
 		'<center><video autoplay loop src="images/pc/body/tits/bathroom_massage.mp4"></video></center>'
 		milkedvolume = func('lact_lib','$get_breastmilk', 5, pumptime)
 		minut += pumptime
+	else
+		'Your nipples are too sore to hand massage right now.'
 	end
 	act 'Finish':menu_off = 0 & gt $loc, $metka
 end