Merge remote-tracking branch 'Milky_boobs/master'

locations/Cheatmenu_din.qsrc

@@ -516,10 +516,10 @@ $cheatmenu['state'] = {
 	if lactation['active'] <= 0:
 		'You are not lactating'
 		'Your current prolactinlvl is <<prolactinlvl>>ng/ml.'
-		'<a href="exec:lactation[''active''] = 1 & lactateinduced = 1 & total_milkinduce_growth = 8 & nbsize += 8 & prolactinlvl = 200 & lactaterate = 100 & lactatemv = 0 & lactatemm = func(''lact_lib'',''$calc_lactatemm'') & dynamic $cheatmenu[''state'']">Switch ON</a>'
+		'<a href="exec:lactation[''active''] = 1 & lactation[''induced''] = 1 & total_milkinduce_growth = 8 & nbsize += 8 & prolactinlvl = 200 & lactaterate = 100 & lactatemv = 0 & lactatemm = func(''lact_lib'',''$calc_lactatemm'') & dynamic $cheatmenu[''state'']">Switch ON</a>'
 	else
 		'You are lactating'
-		'<a href="exec:lactation[''active''] = 0 & lactateinduced = 0 & total_milkinduce_growth = 0 & nbsize -= 8 & prolactinlvl = 0 & lactaterate = 0 & lactatemv = 0 & lactatemm = 0 & dynamic $cheatmenu[''state'']">Switch OFF</a>'
+		'<a href="exec:lactation[''active''] = 0 & lactation[''induced''] = 0 & total_milkinduce_growth = 0 & nbsize -= 8 & prolactinlvl = 0 & lactaterate = 0 & lactatemv = 0 & lactatemm = 0 & dynamic $cheatmenu[''state'']">Switch OFF</a>'
 		if lactaterate <= 0:
 			'Lactate Rate: <<lactaterate/10>>ml/h <a href="exec:lactaterate += 100 & dynamic $cheatmenu[''state'']">+10</a>'
 		elseif lactaterate >= 6000:
@@ -530,10 +530,10 @@ $cheatmenu['state'] = {
 		'Milk in Breasts: <<lactatemv/10>>ml'
 		'Max Milk Storage: <<lactatemm/10>>ml'
 		'<font color="grey">Maximum milk storage changes with breast size, and if <<$pcs_firstname>> went through pregnancy</font>'
-		if lactateinduced <= 0:
-			'Is <<$pcs_firstname>>''s lactation Induced?: <a href="exec:lactateinduced = 1 & dynamic $cheatmenu[''state'']">no</a>'
+		if lactation['induced'] <= 0:
+			'Is <<$pcs_firstname>>''s lactation Induced?: <a href="exec:lactation[''induced''] = 1 & dynamic $cheatmenu[''state'']">no</a>'
 		else
-			'Is <<$pcs_firstname>>''s lactation Induced?: <a href="exec:lactateinduced = 0 & dynamic $cheatmenu[''state'']">yes</a>'
+			'Is <<$pcs_firstname>>''s lactation Induced?: <a href="exec:lactation[''induced''] = 0 & dynamic $cheatmenu[''state'']">yes</a>'
 		end
 		'<font color="grey">Does <<$pcs_firstname>> know she induced lactation herself, or not? (This is only used for some events.)</font>'
 	end

locations/din_van.qsrc

@@ -105,13 +105,13 @@ $shower = {
 		if lactation['active'] > 0 and pain['nipples'] < 60 and pcs_knowsaboutlactation <= 0:
 			if pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts <= 0:
 				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. It is milk.<br>Using the breast pump regularily probably made you lactate!'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			elseif pcs_usedbreastpumponherself <= 0 and pcs_massagedherbreasts > 0:
 				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. It is milk. Regularily massaging your breasts probably made you lactate!<br>'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			elseif pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts > 0:
 				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. It is milk. All that pumping and massaging your breasts probably caused you to lactate!<br>'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			else
 				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. To your surprise it is milk. You started lactating!<br>'
 				if thinkpreg = 1 or knowpreg = 1:
@@ -119,7 +119,7 @@ $shower = {
 				else
 					'You should have this checked out by a doctor. You could be pregnant.'
 				end
-				lactateinduced = 0
+				lactation['induced'] = 0
 			end
 			pcs_usedbreastpumponherself = 0
 			pcs_massagedherbreasts = 0

locations/femcyc.qsrc

@@ -213,7 +213,7 @@ if $ARGS[0] = '':
 	if lactation['active'] = 0 and milkoverdemand >= 0 and prolactinlvl >= 0:
 		!! Even if Sveta doesn''t massage her breasts or pumps proactively, NPCs will work her breasts eventually. This can cause her to lactate without knowledge.
 		if rand(1,50) + prolactinlvl >= rand(200,250) and milkinduceday >= 5:
-			lactateinduced = 0
+			lactation['induced'] = 0
 			pcs_knowsaboutlactation = 0
 			lactation['active'] = 1
 			if func('lact_lib','$calc_lactatemm') > 0: lactatemm = func('lact_lib','$calc_lactatemm')
@@ -322,7 +322,7 @@ if $ARGS[0] = '':
 	elseif lactation['active'] > 0 and milkoverdemand => 0 and prolactinlvl >= 0:
 		lactatemm = func('lact_lib','$calc_lactatemm')
 		!! checking if induced or not and if girl went through pregnancy already.
-		if lactateinduced > 0 and kid <= 0:
+		if lactation['induced'] > 0 and kid <= 0:
 			if milkgrowday < daystart:
 				!! first breast growth with first pregnancy
 				if prolactinlvl >= 100 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
@@ -375,7 +375,7 @@ if $ARGS[0] = '':
 						end
 					elseif lactaterate = 0 and pregchem < 1000:
 						lactation['active'] = 0
-						lactateinduced = 0
+						lactation['induced'] = 0
 						nbsize -= total_milkinduce_growth
 						milkinduceday = 0
 						if pcs_knowsaboutlactation > 0:
@@ -456,7 +456,7 @@ if $ARGS[0] = '':
 						end
 					elseif lactaterate = 0 and pregchem < 1000:
 						lactation['active'] = 0
-						lactateinduced = 0
+						lactation['induced'] = 0
 						if total_milkinduce_growth > 0: nbsize -= total_milkinduce_growth
 						if total_preg_growth > 0:
 							nbsize -= total_preg_growth

locations/gpoli.qsrc

@@ -1487,7 +1487,7 @@ if $ARGS[0] = 'maternity_ward':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/old_nurse.jpg"></center>'
 							if preg = 0 and pregtimes = 0:
 								pcs_gpolimilkdonation = 2
-								if lactateinduced = 1:
+								if lactation['induced'] = 1:
 									'You: Erm ... I used a breast pump on myself...'
 									'You blush a bit from embarresment, while telling it to her.'
 								else

locations/lact_lib.qsrc

@@ -399,7 +399,7 @@ end
 if $ARGS[0] = '$calc_lactatemm':
 
 	!! func('lact_lib', 'calc_lactatemm')
-	!! No arguments at the moment. Information is taken from the global variables 'nbsize', lactation['active'],'lactateinduced','kid'.
+	!! No arguments at the moment. Information is taken from the global variables 'nbsize', lactation['active'],'lactation['induced']','kid'.
 	!! lactatemm should be calculated every day, so if the breasts size is changed naturally the lactatemm will get higher. No change when silicone tits happen. Only natural breast tissue should make milk.
 	!! Usage: lactatemm = func('lact_lib','$calc_lactatemm')
 	!! RESULT = lactatemm in ml*10
@@ -1136,13 +1136,13 @@ if $ARGS[0] = 'bp_unbox_event':
 				if lactation['active'] > 0 and pain['nipples'] < 60 and pcs_knowsaboutlactation <= 0:
 					if pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts <= 0:
 						'You are surprised to see that you are lactating!'
-						lactateinduced = 1
+						lactation['induced'] = 1
 					elseif pcs_usedbreastpumponherself <= 0 and pcs_massagedherbreasts > 0:
 						'Regularily massaging your breasts probably made you lactate!<br>'
-						lactateinduced = 1
+						lactation['induced'] = 1
 					elseif pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts > 0:
 						'All that pumping and massaging your breasts probably caused you to lactate!<br>'
-						lactateinduced = 1
+						lactation['induced'] = 1
 					else
 						'To your surprise it is milk. You started lactating!<br>'
 						if thinkpreg = 1 or knowpreg = 1:
@@ -1150,7 +1150,7 @@ if $ARGS[0] = 'bp_unbox_event':
 						else
 							'You should have this checked out by a doctor. You could be pregnant.'
 						end
-						lactateinduced = 0
+						lactation['induced'] = 0
 					end
 					pcs_knowsaboutlactation = 1
 				end
@@ -1560,13 +1560,13 @@ if $ARGS[0] = 'milking':
 			'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
 			if pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts <= 0:
 				'As usual, you attach the pump, but after a few pumps white liquid suddenly starts flowing from your nipples.<br>Using the breast pump regularily probably made you lactate!'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			elseif pcs_usedbreastpumponherself <= 0 and pcs_massagedherbreasts > 0:
 				'You attach the pump but after a few pumps white liquid suddenly comes from your nipples. Regularily massaging your breasts probably made you lactate!<br>'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			elseif pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts > 0:
 				'You attach the pump but after a few pumps white liquid suddenly comes from your nipples. All that pumping and massaging your breasts probably caused you to lactate!<br>'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			else
 				'You attach the pump and give it a few pumps. To your surprise white liquid suddenly comes from your nipples. You started lactating!<br>'
 				if thinkpreg = 1 or knowpreg = 1:
@@ -1574,7 +1574,7 @@ if $ARGS[0] = 'milking':
 				else
 					'You should have this checked out by a doctor. You could be pregnant.'
 				end
-				lactateinduced = 0
+				lactation['induced'] = 0
 			end
 			pcs_usedbreastpumponherself = 0
 			pcs_massagedherbreasts = 0
@@ -1700,13 +1700,13 @@ if $ARGS[0] = 'hand_milking':
 			'<center><img <<$set_imgh>> src="images/pc/body/tits/lactate_start.jpg"></center>'
 			if pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts <= 0:
 				'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. After a few squeezes white liquid suddenly starts flowing from your nipples.<br>Using the breast pump regularily probably made you lactate!'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			elseif pcs_usedbreastpumponherself <= 0 and pcs_massagedherbreasts > 0:
 				'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. After a few squeezes white liquid suddenly starts flowing from your nipples. Regularily massaging your breasts probably made you lactate!<br>'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			elseif pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts > 0:
 				'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. After a few squeezes white liquid suddenly starts flowing from your nipples. All that pumping and massaging your breasts probably caused you to lactate!<br>'
-				lactateinduced = 1
+				lactation['induced'] = 1
 			else
 				'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. To your surprise white liquid suddenly starts flowing from your nipples. You started lactating!<br>'
 				if thinkpreg = 1 or knowpreg = 1:
@@ -1714,7 +1714,7 @@ if $ARGS[0] = 'hand_milking':
 				else
 					'You should have this checked out by a doctor. You could be pregnant.'
 				end
-				lactateinduced = 0
+				lactation['induced'] = 0
 			end
 			pcs_usedbreastpumponherself = 0
 			pcs_massagedherbreasts = 0