Merge remote-tracking branch 'upstream/master'

locations/Cheatmenu_din.qsrc

@@ -304,7 +304,7 @@ $cheatmenu['addict'] = {
 	end
 }
 
-$cheatmenu['willpower'] = {
+$cheatmenu['willpower2'] = {
 	if InfWillpwer = 0:
 		InfWillpwer = 1
 		dynamic $cheatmenu['permanent']
@@ -589,6 +589,7 @@ $cheatmenu['permanent'] = {
 	'<td width="450" cellspacing="0" cellpadding="20" valign="top">'
 	'More than one job is possible: <a href="exec:dynamic $cheatmenu[''work'']"><<$cheatWork>></a>'
 	'Willpower cost always zero: <a href="exec:dynamic $cheatmenu[''willpower'']"><<$cheatWillpower>></a>'
+	'Infinite willpower: <a href="exec:dynamic $cheatmenu[''willpower2'']"><<$InfWillpwer>></a>'
 	'Always combed: <a href="exec:dynamic $cheatmenu[''hair'']"><<$cheatHapri>></a>'
 	'Cosmetics never smeared: <a href="exec:dynamic $cheatmenu[''nomakeup'']"><<$cheatNomakeup>></a>'
 	'Never sweat: <a href="exec:dynamic $cheatmenu[''nosweat'']"><<$cheatNoSweat>></a>'
@@ -599,7 +600,6 @@ $cheatmenu['permanent'] = {
 	'Never lose or gain weight: <a href="exec:dynamic $cheatmenu[''noFat'']"><<$cheatNoFat>></a>'
 	'Never get addicted: <a href="exec:dynamic $cheatmenu[''addict'']"><<$NarkImmune>></a>'
 	'Never shave legs: <a href="exec:dynamic $cheatmenu[''shaveLegs'']"><<$cheatShaveLegs>></a>'
-	'Infinite willpower: <a href="exec:dynamic $cheatmenu[''willpower'']"><<$InfWillpwer>></a>'
 
 	if Enable_sforma = 1:
 		'Allow any clothing for school: <a href="exec:Enable_sforma = 0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'

locations/KatjaHomeTalk.qsrc

@@ -813,17 +813,16 @@ if $ARGS[0] = 'Sextalk':
 	end
 
 	if kattalkrand = 0:
-		if katjaQW['knows_BJ'] > 0:
-			'"<<$pcs_nickname>>, tell me, how are you at sucking dick?"'
-		else
-			'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
-		end
-
 		if stat['bj'] > 0:
 			gs 'KatjaHomeTalk', 'bj_talk1'
 		else
+			if katjaQW['knows_BJ'] > 0:
+				'"<<$pcs_nickname>>, tell me, how are you at sucking dick?"'
+			else
+				'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
+			end
 			act 'You''ve never given a blowjob':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -850,7 +849,7 @@ if $ARGS[0] = 'Sextalk':
 
 		if stat['vaginal'] > 0:
 			act 'Talk about sex':
-				cla
+				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
 				katjaQW['knows_sex'] = 1
@@ -872,7 +871,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		else
 			act 'No':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -905,7 +904,7 @@ if $ARGS[0] = 'Sextalk':
 
 		if stat['anal'] > 0:
 			act 'Talk about anal':
-				cla
+				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
 				katjaQW['knows_anal'] = 1
@@ -928,7 +927,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		else
 			act 'You''ve never had anal sex':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -961,7 +960,7 @@ if $ARGS[0] = 'Sextalk':
 
 		if stat['cuni_give'] > 0:
 			act 'Talk about licking pussy':
-				cla
+				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
 				katjaQW['knows_cuni'] = 1
@@ -973,7 +972,7 @@ if $ARGS[0] = 'Sextalk':
 					'Katja asks you to show her how you lick pussy.'
 
 					act 'Show her':
-						cla
+						*clr & cla
 						katjaQW['horny'] = 0
 						katjaQW['slut'] += 1
 						katjaQW['dom'] += 2
@@ -1019,7 +1018,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		else
 			act 'No':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -1097,7 +1096,7 @@ if $ARGS[0] = 'Sextalk':
 
 		if stat['mast'] > 0:
 			act 'Talk about masturbation':
-				cla
+				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
 				katjaQW['knows_masterbation'] = 1
@@ -1116,7 +1115,7 @@ if $ARGS[0] = 'Sextalk':
 					end
 				else
 					act 'Katja responds':
-						cla
+						*clr & cla
 						minut += 5
 						katjaQW['horny'] += 10
 						gs 'stat'
@@ -1137,7 +1136,7 @@ if $ARGS[0] = 'Sextalk':
 
 			if stat['self_fisting'] > 0:
 				act 'Tell her how you pushed your hand into your pussy':
-					cla
+					*clr & cla
 					minut += 3
 					katjaQW['horny'] += 10
 
@@ -1165,7 +1164,7 @@ if $ARGS[0] = 'Sextalk':
 
 			if stat['self_fisting_anal'] > 0:
 				act 'Tell her how you fisted your ass':
-					cla
+					*clr & cla
 					minut += 3
 					katjaQW['horny'] += 10
 
@@ -1188,7 +1187,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		else
 			act 'You''ve never masturbated':
-				cla
+				*clr & cla
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -1307,6 +1306,7 @@ if $ARGS[0] = 'bj_talk2':
 	
 	act'It''s fun':
 		cla & *nl
+		katjaQW['horny'] += 5
 		'"It''s fun!" you grin. "I''m not really sure what it is, but something about having a dick in your mouth is really entertaining. It''s like, totally alive! And you can feel it making all these tiny movements when it''s on your tongue. I really like giving head."'
 		'Katja hangs on your every word, nodding excitedly for you to keep describing your experiences with oral sex to her.'
 		act 'Continue':
@@ -1350,6 +1350,7 @@ if $ARGS[0] = 'bj_talk2':
 	
 	act'It turns me on':
 		cla & *nl
+		katjaQW['horny'] += 5
 		'"It turns me on so much," you admit, biting your lip in a lusty smile. "When someone''s in your mouth, you can make them feel <i>really</i> good. And they''ll respond to what you do. If you take their whole length, they''ll squirm. If you lick the head, it''ll twitch under your touch. Just knowing you can make someone else feel that way... Ugh, just <i>thinking</i> about it gets me wet!"'
 		'Katja hangs on your every word, nodding along with wide eyes as you describe what it is you love so much about giving head. A faint blush also comes to her cheeks and you notice her unconsciously rubbing her thighs together.'
 		act 'Continue':

locations/bedrPar.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		if prezik > 0 and rand(1,3) = 1:
 			gt 'mother', 'condom_find'
-		elseif dildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
+		elseif dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'dildo_find'
 		elseif analplug = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'plug_find'
@@ -91,7 +91,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if $home['current'] = 'parents_home':
 			'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 			*nl
-			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
+			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '.')+' Your sister''s bed is in the other corner.'
 		else
 			'This small bedroom you used to share with your sister, Anya. The furniture is old and basic.'
 		end

locations/gschool.qsrc

@@ -64,11 +64,14 @@ end
 if $ARGS[0] = 'weekly grade update':
 	if kanikuli = 0 and week = 1 and SchoolAtestat = 0:
 		if lernHome > 0 and petka['homework'] = 1: gs 'grades', 'homework', 'school', 'yes', lernHome, 2, 'A6'
-		pcs_traits['nerd_lernHome'] = 0
 		pcs_traits['nerd_points'] -= lernHome		
 		if lernHome = 0:
 			pcs_traits['nerd_points'] += pcs_traits['nerd_lernHome'] 
-			if pcs_traits['nerd_lernHome'] < 5: pcs_traits['nerd_lernHome'] += 1
+			if pcs_traits['nerd_lernHome'] < 5:
+				pcs_traits['nerd_lernHome'] += 1
+			else
+				pcs_traits['nerd_lernHome'] = 0
+			end
 		end
 		lernHome = 0
 		if class['first_grade_check'] > 0:

locations/katja_chat.qsrc

@@ -542,7 +542,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					gs 'npc_relationship', 'modify', 'A152', 'dislike'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 					'"What are you talking about, Feofan?" you ask.'
-					'"You know, Triss'+iif(hotcat > 5, ' and Yennefer ', ' ')+'from the Witcher." Feofan tries to explain.'
+					'"You know, Triss'+iif(hotcat > 4, ' and Yennefer ', ' ')+'from the Witcher." Feofan tries to explain.'
 					'"The what?" Katja asks, looking no wiser.' 
 					'"The Witcher, the video game series. Help me out, <<$pcs_nickname>>! You know it, don''t you?" he asks.'
 					'"No, I don''t," you answer.'
@@ -576,7 +576,7 @@ if $ARGS[0] = 'coffee_hole_event':
 						katjaQW['know_dandd'] = 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 						'"It''s ''Dungeons and Dragons is what the game''," you tell Katja, who looks at you a little surprised. "I''m part of their group, it''s a lot of fun," you says.'
-						'"I didn''t know that. How does it work, Julia told me you are taking on roles lije in a fantasy movie. Do you dress up? How is that even a game?" Katja asks, and you spend time trying to explain how the game works.' 
+						'"I didn''t know that. How does it work, Julia told me you are taking on roles like in a fantasy movie. Do you dress up? How is that even a game?" Katja asks, and you spend time trying to explain how the game works.' 
 						act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
 					end
 				end

locations/katja_procedural.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'cikl':
 		if katjaQW['masturbates'] = 0: katjaQW['masturbates'] = 1
 	end
 
-	!! Set some variables related to her sexual experience that is not taking care in all the acts.
+	!! Set some variables related to her sexual experience that is not taking care of in all the acts.
 	if (katjaQW['QWstage'] >= 6 or katjaQW['anal_quest'] >= 3) and katjaQW['simultanous_boys'] = 0: katjaQW['simultanous_boys'] = 1
 	if npc_sex['A14'] >= 1 and katjaQW['simultanous_girls'] = 0: katjaQW['simultanous_girls'] = 1
 
@@ -480,7 +480,7 @@ if $ARGS[0] = 'sex_set':
 				if rand(0,6) = 0: npc_throat['A14'] += 1
 			end
 			
-			!! It this case Katja will have sex with at most 3 of the girls present
+			!! In this case Katja will have sex with at most 3 of the girls present
 			katjaQW['simultanous_girls'] = rand(1,min(3,ARGS[1]))
 			katjaQW['slut'] += katjaQW['simultanous_girls']*4
 		elseif rand(0,1) <= katjaQW['slut']/50:

locations/sex_ev_favorite_part.qsrc

@@ -865,6 +865,7 @@ if $ARGS[0] = 'npc_argue_lashout':
 		'"You''re right," you say ruefully. "I''m sorry. I shouldn''t have said that."'
 		'He turns to look at you, chewing on his cheek for a few seconds.'
 		'"It''s whatever," he mumbles back.'
+		gs'sex_ev_pillow_talk', 'topic_route'
 	end
 end
 

locations/sex_ev_pillow_talk.qsrc

@@ -1755,10 +1755,10 @@ if $ARGS[0] = 'boy_talk':
 		:boy_talk_loop
 		if sex_ev['good_for_you'] = 0 and rand(1,sex_ev['boy_topics']) = 1:
 			cla
-			act'Continue':gs 'sex_ev_favorite_part', 'boy_good_for_you'
+			act'<<$npc_firstname[$boy]>> has something to say':gs 'sex_ev_favorite_part', 'boy_good_for_you'
 		elseif sex_ev['boy_pube_talk'] = 0 and rand(1,sex_ev['boy_topics']) = 1:
 			cla
-			act'Continue':gs'sex_ev_pillow_talk', 'boy_pube_talk'
+			act'<<$npc_firstname[$boy]>> has something to say':gs'sex_ev_pillow_talk', 'boy_pube_talk'
 !!		elseif sex_ev['broken_condom_talk'] = 0 and rand(1,2) = 1:
 		
 !!		elseif sex_ev['creampie_okay'] = 0:

locations/stat.qsrc

@@ -24,6 +24,8 @@ if insleep = 0: gs 'stat_sklattrib'
 
 if cheatHealth = 1: dynamic $cheatmenu['std_cure']
 
+if InfWillpwer = 1: pcs_willpwr = willpowermax
+
 if stat['vaginal'] = 0 and stat['vaginal_fist'] = 0 and stat['vaginal_dildo'] = 0 and stat['vaginal_strap'] = 0:
 	stat['think_virgin'] = 1
 else

locations/uni_lessons_electives2.qsrc

@@ -240,7 +240,7 @@ if $ARGS[0] = 'art_102_model':
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand <= 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and blank panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly.'
 		elseif temprand <= 7:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female2.jpg"></center>'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'art_102_model_igor':
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
 		elseif temprand <= 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and blank panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. Igor, meanwhile, seems very intent on trying to capture her femine form, paying special attention to her clothes and body position. The class goes by fairly quickly.'
 		elseif temprand <= 7:
@@ -335,7 +335,7 @@ if $ARGS[0] = 'art_102_model_feofan':
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand <= 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and blank panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly, but you do notice how Mr. Ilyushin seems to spend more time than normal with Feofan.'
 		elseif temprand <= 7:
@@ -385,7 +385,7 @@ if $ARGS[0] = 'art_102_model_natasha':
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. This is a theory lesson which Natasha is clearly comfortable with and she doesn''t require any assistance from the lecturer. The class goes by fairly quickly.'
 		elseif temprand <= 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and blank panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. When you glance over at Natasha, you see that she''s clearly a bit uncomfortable with Annushka''s state of undress and despite her best efforts, she can''t stop herself from blushing slightly. You shake your head slightly and smile before getting on with your own work. The class goes by fairly quickly.'
 		elseif temprand <= 7: