Merge remote-tracking branch 'upstream/master'

locations/belpicknick.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'vb_hard':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/bottle2.jpg"></center>'
 	gs 'dinsex2', 'd_vag_sex_bottle', 5, 'dick1'
-	if prevdance = 1
+	if prevdance = 1:
 		'Okay, so dancing is not something you do well. You have to entertain them with the bottle now, but don''t want to anger them by taking the easy way out. You spread your legs and put the bottom of the bottle against your pussy lips, and slowly begin to push it in. You try to make a show of it by spreading your legs as far as you can and fucking yourself slowly with the bottom of the bottle, which is stretching your pussy out a great deal.'
 	else
 		'Not sure what they want to see you consider putting it in your ass but at the last second you turn the bottle around in your hand. You spread your legs and put the bottom of the bottle against your pussy lips, and slowly begin to push it in. You try to make a show of it by spreading your legs as far as you can and fucking yourself slowly with the bottom of the bottle, which is stretching your pussy out a great deal.'
@@ -98,7 +98,7 @@ if $ARGS[0] = 'ab_light':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/bottle3.jpg"></center>'
 	gs 'dinsex2', 'd_analsex_bottle',5,'dick1'
-	if prevdance = 1
+	if prevdance = 1:
 		'Okay, so dancing is not something you do well. You have to entertain them with the bottle now, and decide to impress them: you spread your legs and put the neck of the bottle against your puckered butthole. After lubricating it with a bit of saliva you slowly push it in as far as it will go, trying to make a show of it by spreading your legs as far as you can and fucking yourself slowly with the neck of the bottle.'
 	else
 		'Realising they want you to put it in your ass, you spread your legs and put the neck of the bottle against your puckered butthole. After lubricating it with a bit of saliva you slowly push it in as far as it will go, trying to make a show of it by spreading your legs as far as you can and fucking yourself slowly with the neck of the bottle.'
@@ -118,7 +118,7 @@ if $ARGS[0] = 'ab_hard':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/bottle4.jpg"></center>'
 	gs 'dinsex2', 'd_analsex_bottle',5,'dick1'
-	if prevdance = 1
+	if prevdance = 1:
 		'Okay, so dancing is not something you do well. You have to entertain them with the bottle now, and decide to go as far as you can with this: you spread your legs and put the bottom of the bottle against your puckered butthole. After lubricating it with a bit of saliva and stretching a bit with your fingers you actually manage to get it in, even though it hurts a lot. Deciding you don''t want the guys to take over for you, you soldier on and slowly push it in as far as it will go, trying to make a show of it by spreading your legs as far as you can and fucking yourself slowly with the bottom of the bottle.'
 	else
 		'The realization of what they really want from you scares you. But not as much as earning their displeasure does. So you decide to go as far as you can with this: you spread your legs and put the bottom of the bottle against your puckered butthole. After lubricating it with a bit of saliva and stretching a bit with your fingers you actually manage to get it in, even though it hurts a lot. Deciding you don''t want the guys to take over for you, you soldier on and slowly push it in as far as it will go, trying to make a show of it by spreading your legs as far as you can and fucking yourself slowly with the bottom of the bottle.'

locations/cikl.qsrc

@@ -711,6 +711,11 @@ if pcs_horny < 0:pcs_horny = 0
 
 !!------------------------------------------------------------------------------------------------------------
 
+!reset Natasha Belova''s clothes
+if natseethroughwearing = 1: natseethroughwearing = 0
+
+!!------------------------------------------------------------------------------------------------------------
+
 !counter for Dimka avoidance
 if dimaFilm = 1 and dimaRudeBlock = 0:
 	nodimkaK += 1
@@ -1253,14 +1258,6 @@ if storyline = 1:
 
 	if sisboyparty = 2 and sisboyparty_day + 1 < daystart: sisboyparty = 3
 
-!!missed graduation
-	if month = 5 and day = 26:
-		if school_year = 2001 and year = 2018 and kanikuli ! 7:
-			grad_miss = daystart + 1
-		elseif school_year = 2000 and year = 2017 and kanikuli ! 7:
-			grad_miss = daystart + 1
-		end
-	end
 
 	if SchoolAtestat = 0:
 		if month = 12 and day > 25:
@@ -1294,13 +1291,14 @@ if storyline = 1:
 				end
 			end
 		elseif month = 5:
-			if ( (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018) ) and day >= 19 and day <= 25:
+			if (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018):
 				if day = 25:
 					kanikuli = 6
+                    SchoolAtestat = -1
 					$holyday = '<b>Your graduation is today. Be there by 8:00.</b>'
 				elseif day = 24:
 					$holyday = '<b>Your graduation is tomorrow. Be there by 8:00.</b>'
-				else
+				elseif day >= 19:
 					$holyday = '<b>Your graduation is in <<26-day>> days.</b>'
 				end
 			elseif day >= 25:
@@ -1339,6 +1337,12 @@ if storyline = 1:
 				$holyday = '<b>Last day of Autumn Break.</b>'
 			end
 		end
+    elseif SchoolAtestat = -1:
+        if ParHomeBlock = 1:
+            $holyday = '<b>You missed your graduation. You could pick up your diploma at the school.</b>'
+        else
+            $holyday = '<b>You missed your graduation. Maybe your mother picked up your diploma.</b>'
+        end
 	end
 	!!Brother''s dick growth as he gets older
 	kolka_dick_month = daystart/30

locations/gschool_grounds.qsrc

@@ -42,13 +42,29 @@ if $ARGS[0] = 'main':
 		act 'Go to your graduation':
 			*clr & cla
 			menu_off = 1
-			miunt += 120
+            hour = 10
+			minut = 0
 			SchoolAtestat = 1
-			intel_exp += 10
 			kanikuli = 7
 			gs 'stat'
-			'Everyone from your year is assembled in the classroom. Your teachers have gathered in front of the class, and congratulate all of you on completing high school. As they hand everyone their well-earned diplomas, they wish you luck for the future.'
-
+            
+            if ParHomeBlock = 1:
+                'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
+            else
+                'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
+            end
+            
+			'Your Principial begins calling your classmates in alphabetical order. Finally it''s your turn.'
+            
+            if pcs_grades >= 90:
+                'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause.'
+                if ParHomeBlock = 0:'As you return to your place you see your mother smiling brightly.'
+            elseif pcs_grades >= 70:
+                'You go up to the podium. The Principal shakes your hand and gives you your diploma. "Well done, Miss <<$pcs_lastname>>!" she says before you return to your place.'
+            else
+                'You go up to the podium. The Principal shakes your hand and gives you your diploma and you return to your place.'
+            end
+            
 			act 'Return to town': minut += 2 & gt 'pavResidential'
 
 			act 'Go to the prom party':
@@ -73,6 +89,24 @@ if $ARGS[0] = 'main':
 	exit
 	end
 
+    if SchoolAtestat = -1 and week < 6 and hour >= 6 and hour < 14:
+		act 'Get your diploma':
+			*clr & cla
+			menu_off = 1
+			minut += 20
+			SchoolAtestat = 1
+			kanikuli = 7
+			gs 'stat'
+			if pcs_grades >= 70:
+				'The Principal hands you your diploma. "Well done, Miss <<$pcs_lastname>>! Good luck in your future!" she says as she shakes your hand.'
+			else 
+				'The Principal hands you your diploma. "Good luck in your future!" she says as she shakes your hand.'
+			end
+				
+			act 'Return to town': minut += 2 & gt 'pavResidential'    
+        end
+    end
+    
 !!	act 'Go to old school building': gt
 
 !!	act 'Go to the Principals Office': gt

locations/gschool_socialchg1.qsrc

@@ -371,7 +371,7 @@ if $ARGS[0] = 'tLariska':
 		'"No need to be humble, it was really amazing, trust me... You''re one of the best volleyball players I''ve ever seen." you genuinely respond, "I''ll let you go back to it, I didn''t want to bother." you smile.'
 		'Smiling back Lariska turns back towards the wall and smashes it as usual, but instead of catching the ball it ends up hitting her in the head and you can see her whole face turn red as you quickly walk away from there.'
 		
-		act 'Continue on': gt 'pavComplex'
+		act 'Continue on': gt 'pavComplex', 'start'
 	end
 	
 	act 'Play it off':
@@ -386,7 +386,7 @@ if $ARGS[0] = 'tLariska':
 		'By now you can clearly notice that you''ve gotten under Lariska''s skin, "Go away, <<$pcs_nickname>>... Or else I''ll make you regret it..."'
 		'Knowing she''s close to Christina you take the hint and nod your head. As you''re walking away you can hear the bouncing sounds clearly louder...'
 		
-		act 'Walk away': gt 'pavComplex'
+		act 'Walk away': gt 'pavComplex', 'start'
 	end
 end
 

locations/hotel_resep.qsrc

@@ -677,7 +677,7 @@ if $ARGS[0] = 'pavgenprosff':
 							'While <<$boydesc>> is regaining her breath you start getting up off the bed.'
 							'She opens her eyes and starts giggling. "Oh <<$pcs_nickname>>, dear, I seem to have made a mess of your makeup."'
 							'"I can''t say I mind how that happened..." You tell her as she gets up herself and starts walking to the bathroom.'
-							'"I could use a shower." She says, looking over her shoulder before dissapearing into the bathroom and leaving the door open.'
+							'"I could use a shower." She says, looking over her shoulder before disappearing into the bathroom and leaving the door open.'
 							act 'Follow her':gt 'hotel_resep', 'ffshower'
 							act 'Wait for her to finish showering':
 								cla

locations/korrPar.qsrc

@@ -328,14 +328,6 @@ if hour >= 10 and hour <= 23 and pav_slut >= 125 and podwhoreQW >= 3:
 	end
 end
 
-if grad_miss ! 0 and grad_miss <= daystart:
-	SchoolAtestat = 1
-	intel_exp += 10
-	grad_miss = 0
-	gs 'stat'
-	'Your diploma from school has arrived in the post.'
-end
-
 if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- korrPar ---------------------------------

locations/lact_lib.qsrc

@@ -344,6 +344,86 @@ if $ARGS[0] = 'show_breast_stat':
 	'lactation[''breastmv''] = <<lactation[''breastmv'']>>'
 end
 
+!!	milk production function
+if $ARGS[0] = 'prod_milk':
+	!!	function for Svetas milk production. Milk production will cost stamina, hydration, and hunger. this function is used in breastcycle
+	!!	func('lact_lib','prod_milk',milkamount)
+	!!	result = produced breast milk amount in ml*1000
+	!!	ARGS[1] = Requested milk production amount produced in ml*1000. Usually should be the lactaterate.
+	!!	If Sveta has salo <= 15, she will not produce breast milk as she is basically starving and her body will shut down everything that is causing too much energy consumption.
+	if lactation['active'] > 0 and salo > 15:
+		!!	checking how much hydration, stamina and hunger is needed to produce x amount of breast milk
+		!!	checking if enough stamina and hydra is available
+		if (ARGS[1]/10000) < pcs_stam and (ARGS[1]/10000) < pcs_hydra:
+			!!	full requested milk amount can be produced. substracting from stamina, hydration energy.
+			if (ARGS[1]/10000) < 1:
+				pcs_stam -= 1
+				pcs_hydra -= 1
+			else
+				pcs_stam -= (ARGS[1]/10000)
+				pcs_hydra -= (ARGS[1]/10000)
+			end
+			if pcs_stam < 1: pcs_stam = 1
+			if pcs_hydra < 1: pcs_hydra = 1
+			if (ARGS[1]/9000) < pcs_energy:
+				if (ARGS[1]/9000) < 1:
+					pcs_energy -= 1
+				else
+					pcs_energy -= (ARGS[1]/9000)
+					if pcs_energy < 1: pcs_energy = 1
+				end
+				result = ARGS[1]
+			else
+				!!	If energy is too low, milk will be produced but there is a chance that salo will shrink.
+				pcs_energy = 1
+				if rand(0,100) > 95: salo -= 1
+				if pain['breasts'] < 20: pain['breasts'] += 1
+				result = ARGS[1]
+			end
+		elseif pcs_stam <= 0 or pcs_hydra <= 0:
+			!!	if sveta has not enough hydration or stamina, no milk is produced.
+			result = 0
+		else
+			if (pcs_stam*10000) < (pcs_hydra*10000):
+				temp_var = (pcs_stam*10000)
+				pcs_stam = 1
+				if (ARGS[1]/10000) < pcs_hydra:
+					pcs_hydra -= (ARGS[1]/10000)
+				else
+					pcs_hydra = 1
+				end
+			else
+				temp_var = (pcs_hydra*10000)
+				pcs_hydra = 1
+				if (ARGS[1]/10000) < pcs_stam:
+					pcs_stam -= (ARGS[1]/10000)
+				else
+					pcs_stam = 1
+				end
+			end
+			if (temp_var/9000) < pcs_energy:
+				if (temp_var/9000) < 1:
+					pcs_energy -= 1
+				else
+					pcs_energy -= (temp_var/9000)
+					if pcs_energy < 1: pcs_energy = 1
+				end
+			else
+				!!	If energy is too low, milk will be produced but there is a chance that salo will shrink.
+				pcs_energy = 1
+				if rand(0,100) > 95: salo -= 1
+				if pain['breasts'] < 20: pain['breasts'] += 1
+			end
+			if pcs_energy < 1: pcs_energy = 1
+			if pcs_hydra < 1: pcs_hydra = 1
+			if pcs_stam < 1: pcs_stam = 1
+			result = temp_var			
+		end
+	else
+		result = 0
+	end	
+end
+
 !!	Lactation On/Off switch function
 if $ARGS[0] = 'lact_switch':
 	!!	Usage
@@ -486,10 +566,9 @@ if $ARGS[0] = 'breastcycle':
 		end
 		!!	Filling lactaterate into svetas breast every hour
 		if lactation['breastmv'] < lactation['breastmm'] and lactation['lactaterate'] > 50:
-			lactation['breastmv'] += lactation['lactaterate']
+			lactation['breastmv'] += func('lact_lib','prod_milk',lactation['lactaterate'])
 			if lactation['breastmv'] > lactation['breastmm']: lactation['breastmv'] = lactation['breastmm']
 		end
-		
 	end
 	if lactation['milkgrowday'] < daystart:
 		func('lact_lib','BreastGrowth')

locations/mother.qsrc

@@ -214,11 +214,46 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if SchoolAtestat = 1 and SAtestatGift = 0:
-		SAtestatGift = 1
-		money += 5000
-		gs 'stat'
-		'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. Please, take these 5000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
+    if SchoolAtestat = -1:
+        if month = 5 and day = 25 and hour <= 8:
+            '"<<$pcs_nickname>>, make sure you don''t miss your graduation today. Your brother and I will also be there to watch you getting your diploma."'
+        else
+            if month = 5 and day = 25 and hour > 8:
+                '"<<$pcs_nickname>>, where have you been? You have missed your graduation today! I told everybody that you''re sick. So your Principal gave me your diploma." She hands it to you.'
+            elseif month = 5 and day = 26:
+                '"<<$pcs_nickname>>, where have you been? You have missed your graduation yesterday! I told everybody that you''re sick. So your Principal gave me your diploma." She hands it to you.'
+            elseif (month = 5 and day > 26) or month > 5:
+                '"<<$pcs_nickname>>, where have you been? You have missed your graduation! I told everybody that you''re sick. So your Principal gave me your diploma." She hands it to you.'
+            end
+            SchoolAtestat = 1
+            intel_exp += 10
+            grad_miss = 0
+            kanikuli = 7
+            gs 'stat'
+        end
+    end
+    
+    if SchoolAtestat = 1 and SAtestatGift = 0:
+		if pcs_grades >= 90:
+			npc_rel['A29']+=40
+			'Your mother is delighted you graduated. "I''m so proud right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. And you outdid all my expectations. When the Principal mentioned you being the best student of the year I could not have been happier. Your stepfather and I saved some money to reward you for your efforts. Please, take these 10000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
+			gs 'stat'
+            SAtestatGift = 10000
+		elseif pcs_grades >= 70:
+			npc_rel['A29']+=20
+			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. You did really well. Please, take these 7000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
+			gs 'stat'
+            SAtestatGift = 7000
+		elseif pcs_grades > 40:
+			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. You did really well. Please, take these 5000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
+			gs 'stat'
+            SAtestatGift = 5000
+		else
+			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. To be honest I wasn''t sure you would manage to get your diploma. But somehow you did it. Please, take these 5000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
+			gs 'stat'
+            SAtestatGift = 5000
+		end
+		money += SAtestatGift
 	end
 
 	if hour > 5:

locations/stat_display.qsrc

@@ -162,7 +162,7 @@ if Enable_statfsize>0:$stat_msg = '<font size=<<Enable_statfsize>>><<$stat_msg>>
 $stat_msg += '<BR><<$stat_android>> <<$week[week]>> <<day>> <<$month>> <<year>>'
 $stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ₽, <a href="exec:clr & pl $stat_android">Status</a>'
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
-if StoryLine > 0 and SchoolAtestat = 0 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
+if StoryLine > 0 and SchoolAtestat ! 1 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
 if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
 
 !New icon based menu.