Merge remote-tracking branch 'Milky_boobs/master'

locations/gpoli.qsrc

@@ -1370,7 +1370,7 @@ if $ARGS[0] = 'maternity_ward':
 						end
 						'Donation count: <<pcs_gpoli_totalmilkdonation_count>>'
 						'Average milk volume per donation in ml: <<pcs_gpoli_totalmilkdonation/pcs_gpoli_totalmilkdonation_count>>'
-						'Paid money: <<(((pcs_gpoli_totalmilkdonation*10)/3)*75)/100>><b>₽</b>'
+						'Paid money: <<((pcs_gpoli_totalmilkdonation/50)*100)>><b>₽</b>'
 						'<br>----------------------------------------'
 					end
 					act 'Leave': gt 'gpoli', 'maternity_ward'
@@ -1819,7 +1819,7 @@ if $ARGS[0] = 'maternity_ward_donation':
 			end
 			lact_ev['gpoli_milkedvolume'] = 0
 			if pcs_gpoli_donationsessioncount > 0:
-				mward_donatemoney = (((pcs_gpoli_donationsessioncount*500)/3)*75)/100
+				mward_donatemoney = (pcs_gpoli_donationsessioncount*100)
 			else
 				mward_donatemoney = 0
 			end

locations/lact_bp.qsrc

@@ -337,7 +337,7 @@ if $ARGS[0] = 'bp_milking':
 		end
 
 		if lactation['breastmv'] > 0 and (func('lact_bp','useable_sbottle_count') > 0 or func('lact_bp','useable_mbottle_count') > 0):
-			pumptime = (func('lact_lib','$get_breastmilk_time', 3, (lactation['breastmv']/10)))
+			pumptime = (func('lact_lib','$get_breastmilk_time', 3, (lactation['breastmv']/1000)))
 			if pumptime > 5:
 				pumptime -= 2
 			end
@@ -370,7 +370,7 @@ if $ARGS[0] = 'bp_milking':
 				end
 			else
 				act 'Pump until breasts are empty':
-					pumptime = func('lact_lib','$get_breastmilk_time', 3, (lactation['breastmv']/10))
+					pumptime = func('lact_lib','$get_breastmilk_time', 3, (lactation['breastmv']/1000))
 					if pumptime > 5:
 						pumptime -= 2
 					end
@@ -437,7 +437,7 @@ if $ARGS[0] = 'man_milking':
 		'How long do you want to massage your breasts?'
 	end
 	if lactation['breastmv'] > 0:
-		pumptime = (func('lact_lib','$get_breastmilk_time', 5, (lactation['breastmv']/10)))
+		pumptime = (func('lact_lib','$get_breastmilk_time', 5, (lactation['breastmv']/1000)))
 		if pumptime > 60:
 			act 'Express until breasts are empty':
 				*clr
@@ -469,7 +469,7 @@ if $ARGS[0] = 'man_milking':
 			end
 		else
 			act 'Express until breasts are empty':
-				pumptime = func('lact_lib','$get_breastmilk_time', 5, (lactation['breastmv']/10))
+				pumptime = func('lact_lib','$get_breastmilk_time', 5, (lactation['breastmv']/1000))
 				gt 'lact_bp', 'hand_milking'
 			end
 		end

locations/lact_lib.qsrc

@@ -927,6 +927,7 @@ if $ARGS[0] = '$get_breastmilk':
 			breastcounter += pumptime/10
 		end
 		lactation['dailyoverdemand'] += lactation['max_sucktion_demand']
+		func('lact_lib','breast_engorment')
 		result = 0
 	elseif lactation['active'] > 0:
 		!!	How much milk demand is applied to the breasts.
@@ -1054,6 +1055,8 @@ if $ARGS[0] = '$get_breastmilk':
 		else
 			breastcounter += pumptime/10
 		end
+		!!	checking for engorgement
+		func('lact_lib','breast_engorment')
 		!!	Done - Result is the milked volume.
 		result = lactation['get_bm_milkedvolume']
 	end