Merge remote-tracking branch 'Milky_boobs/master'

locations/gpoli.qsrc

@@ -1823,39 +1823,25 @@ if $ARGS[0] = 'maternity_ward_donation':
 			end
 			lactation['nipple_cream_applied'] = 0
 			minut += 15
-			if lactation['breastmv'] > lactation['breastmm']/2:
+			if lactation['breastmv'] > lactation['breastmm']/2 and lactation['breastmv'] >= 100000:
 				'The nurse looks at your breasts'
 				'Nurse: Looks like you could go for another pumping...shall we?'
 				act 'Have your breasts pumped again': gt 'gpoli', 'maternity_ward_donation'
-				act 'Enough for today':
-					*clr & cla
-					gs 'stat'
-					if pcs_gpoli_donationsessioncount > 0:
-						money += mward_donatemoney
-						'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
-					else
-						'You put on your top'
-					end
-					act 'Leave':
-						lact_ev['gpoli_milkedvolume'] = 0
-						gt 'gpoli', 'maternity_ward'
-					end
-				end
 			else
 				act 'Ask to donate more': gt 'gpoli', 'maternity_ward_donation'
-				act 'Enough for today':
-					*clr & cla
-					gs 'stat'
-					if pcs_gpoli_donationsessioncount > 0:
-						money += mward_donatemoney
-						'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
-					else
-						'You put on your top'
-					end
-					act 'Leave':
-						lact_ev['gpoli_milkedvolume'] = 0
-						gt 'gpoli', 'maternity_ward'
-					end
+			end
+			act 'Enough for today':
+				*clr & cla
+				gs 'stat'
+				if pcs_gpoli_donationsessioncount > 0:
+					money += mward_donatemoney
+					'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
+				else
+					'You put on your top'
+				end
+				act 'Leave':
+					lact_ev['gpoli_milkedvolume'] = 0
+					gt 'gpoli', 'maternity_ward'
 				end
 			end
 		end

locations/lact_lib.qsrc

@@ -5,8 +5,8 @@
 !!	lactation['induced'] = old lactateinduced variable
 !!	lactation['pc_aware'] = old pcs_knowsaboutlactation variable
 !!	lactation['lactaterate'] = old lactaterate variable now in ml*1000
-!!	lactation['breastmv'] = old lactatemv variable now in ml*1000
-!!	lactation['breastmm'] = old lactatemm variable now in ml*1000
+!!	lactation['breastmv'] = old lactatemv variable now in ml*1000 - current milk volume in breasts
+!!	lactation['breastmm'] = old lactatemm variable now in ml*1000 - maximal milk volume
 !!	lactation['prolactinlvl'] = old prolactinlvl variable
 !!	lactation['milkedvolume'] = old milkedvolume variable
 !!	lactation['lactmess'] = old lactatemess variable

locations/parkivent.qsrc

@@ -1070,9 +1070,10 @@ if $ARGS[0] = 'find_baby':
 								milkedvolume = 0
 								minut += temp_var
 								if pcs_mood < 20:
-									act 'Leave him here':
+									act 'Call an ambulance and leave.':
 										*clr & cla
-										'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+										minut += 10
+										'You call an ambulance. It takes them 10 minutes to get here. They take the baby with them and thank you for the report.'
 										act 'Finish your walk': gt $loc, $metka
 									end
 								end
@@ -1091,9 +1092,10 @@ if $ARGS[0] = 'find_baby':
 							end
 						end
 						if pcs_mood < 20:
-							act 'Leave him here':
+							act 'Call an ambulance and leave.':
 								*clr & cla
-								'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+								minut += 10
+								'You call an ambulance. It takes them 10 minutes to get here. They take the baby with them and thank you for the report.'
 								act 'Finish your walk': gt $loc, $metka
 							end
 						end
@@ -1121,10 +1123,11 @@ if $ARGS[0] = 'find_baby':
 				minut += 30
 				act 'Finish': gt 'poli', 'start'
 			end
-			if pcs_mood < 20:
-				act 'Leave him here':
+			if pcs_mood < 20:				
+				act 'Call an ambulance and leave.':
 					*clr & cla
-					'You look around, someone probably left him here for good. You leave the baby behind and finish your walk.'
+					minut += 10
+					'You call an ambulance. It takes them 10 minutes to get here. They take the baby with them and thank you for the report.'
 					act 'Finish your walk': gt $loc, $metka
 				end
 			end

locations/poli.qsrc

@@ -1703,39 +1703,25 @@ if $ARGS[0] = 'milk_donation':
 			end
 			lactation['nipple_cream_applied'] = 0
 			minut += 15
-			if lactation['breastmv'] > lactation['breastmm']/2:
+			if lactation['breastmv'] > lactation['breastmm']/2 and lactation['breastmv'] >= 100000:
 				'The employee looks at your breasts'
 				'Nurse: It seems there is still some milk left, do you want to donate more?'
 				act 'have your breasts pumped again': gt 'poli','milk_donation'
-				act 'enough for today':
-					*clr & cla
-					gs 'stat'
-					if lact_ev['poli_donationsessioncount'] > 0:
-						money += lact_ev['poli_donatemoney']
-						'You put on your top, and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
-					else
-						'You put on your top'
-					end
-					act 'leave':
-						lact_ev['poli_milkedvolume'] = 0
-						gt 'poli', 'milk_donation_room'
-					end
-				end
 			else
 				act 'ask to donate more': gt 'poli','milk_donation'
-				act 'enough for today':
-					*clr & cla
-					gs 'stat'
-					if lact_ev['poli_donationsessioncount'] > 0:
-						money += lact_ev['poli_donatemoney']
-						'You put on your top, and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
-					else
-						'You put on your top'
-					end
-					act 'leave':
-						lact_ev['poli_milkedvolume'] = 0
-						gt 'poli', 'milk_donation_room'
-					end
+			end
+			act 'enough for today':
+				*clr & cla
+				gs 'stat'
+				if lact_ev['poli_donationsessioncount'] > 0:
+					money += lact_ev['poli_donatemoney']
+					'You put on your top, and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
+				else
+					'You put on your top'
+				end
+				act 'leave':
+					lact_ev['poli_milkedvolume'] = 0
+					gt 'poli', 'milk_donation_room'
 				end
 			end
 		end