Merge remote-tracking branch 'Sicaa/master'

locations/IgorEv.qsrc

@@ -797,12 +797,12 @@ if $ARGS[0] = 'din_sisterkom_krossdress':
 													'<center><b><font color = maroon>Igor''s sister''s room</font></b></center>'
 													'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/crossdress/dzhulia.mp4"></video></center>'
 													'You push him onto the bed, and then plant yourself on his face. You reach down and pull his dick out of the panties and begin sucking it. Igor has a smaller than average dick, but his skill with his tongue is great.'
-													'You continue on sucking his small dick. It starts twitching, he''s close to erupt. You quickly deepthroat and swallow the cum that shoots into your mouth. Some of it sips out and flows from your mouth onto Igor. Finally the flow dies down and you release the now limp cock out of your mouth. Your <<$liptalk3>> is wet from semen. While you put all you might into handling Igor''s cum, Igor continues licking your now dripping pussy.'
+													'You continue on sucking his small dick. It starts twitching, he''s close to erupt. You quickly deepthroat and swallow the cum that shoots into your mouth. Some of it sips out and flows from your mouth onto Igor. Finally the flow dies down and you release the now limp cock out of your mouth. Your <<$liptalk3>> are wet from semen. While you put all you might into handling Igor''s cum, Igor continues licking your now dripping pussy.'
 													'You lick up the remaining sperm from Igor''s cock and swallow it. You turn your head around seeing Igor still going strong. You are impressed by Igor''s stamina.'
 													'Suddenly you feel a bolt jolting in your pussy and you start screaming. You''re on the edge ready to cum. You tell Igor not to stop, suddenly you start to tremble, embracing the orgasm.'
 													gs 'arousal', 'bj', 15
 													$orgasm_or = 'yes'
-													gs 'arousal', 'kuni', 15
+													gs 'arousal', 'cuni', 15
 													gs 'arousal', 'end'
 													minut -= 15
 													gs 'stat'

locations/KatjaHomeTalk.qsrc

@@ -656,7 +656,7 @@ if $ARGS[0] = 'Sextalk':
 					'At first you are a bit confused and then you notice she is pulling her panties off. Once she has them off she opens her legs wide. "Go on <<$pcs_nickname>> show me how you do it, please."'
 					'You pause a moment more in surprise then anything, but her glistening wet pussy is enough to convince you, you lean forward and places your face between her legs and begin to lick her pussy.'
 					'You suck on her clit and slip your tongue inside of her, working her pussy for all you are worth. She begins to moan loudly and buck her hips grinding your face into her crotch. As she gets close to orgasm she grabs your hair and holds your face against her pussy, rubbing herself against your face as much as you are licking her, leaving your face coated in the juices from her pussy.'
-					'Her orgasm hits her hard, leaving her unable to talk as her body spasms. Once Katja''s orgasm passes pass you lick her clean of all her pussy juices, making sure not to miss a single spot. When you raise up to look at Katja she has a smile but also a new look, you are not quite sure what it is, confidence maybe? "Well arn''t you just a good little girl." Then she kisses you deeply, breaking the kiss you start to lean back and spread your legs but she is already shaking her head no.'
+					'Her orgasm hits her hard, leaving her unable to talk as her body spasms. Once Katja''s orgasm passes pass you lick her clean of all her pussy juices, making sure not to miss a single spot. When you raise up to look at Katja she has a smile but also a new look, you are not quite sure what it is, confidence maybe? "Well aren''t you just a good little girl." Then she kisses you deeply, breaking the kiss you start to lean back and spread your legs but she is already shaking her head no.'
 					'"Sorry <<$pcs_nickname>> maybe next time, we need to finish our homework." She says sweetly, you pause a moment and then nod in understand and you see that new look intensify on her face as she smiles, while the two of you finish your homework.'
 
 					gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian'

locations/brother.qsrc

@@ -430,10 +430,9 @@ if $ARGS[0] = 'playfootball':
 
 					act 'Go watch porn':minut += 5 & gt 'seeporn'
 				end
-			elseif will_cost <= pcs_willpwr and kolkaseepornday ! daystart:
-				act 'Pursue the matter (<<will_cost>> Willpower)':
+			elseif kolkaseepornday ! daystart:
+				act 'Pursue the matter':
 					*clr & cla
-					gs 'willpower', 'pay', 'force'
 					'You can tell they''re lying, so you decide to tease them, "I know, you''re talking about which boys in school you want to kiss, aren''t you?"'
 					'They glare at you and shout, "No!"'
 					'"We wanted to—" Mishan starts before getting cut off when your brother elbows him in the side.'
@@ -443,13 +442,16 @@ if $ARGS[0] = 'playfootball':
 					'You see Kolka’s face flush red with embarrassment while Mishan laughs and Zhendos rolls his eyes.'
 					'"A girl like you would just get grossed out," Mishan says proudly. "All girls are like that."'
 					act 'Leave':gt $loc, $metka
-					act 'Prove them wrong':
-						*clr & cla
-						gs 'stat'
-						'You tell them if they''re going to watch porn, they''ll need a babysitter. The boys don''t look very pleased, but you don''t give them a choice.'
-						'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
-
-						act 'Go watch porn':minut += 5 & gt 'seeporn'
+					if will_cost <= pcs_willpwr:
+						act 'Prove them wrong (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							'You tell them if they''re going to watch porn, they''ll need a babysitter. The boys don''t look very pleased, but you don''t give them a choice.'
+							'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
+
+							act 'Go watch porn':minut += 5 & gt 'seeporn'
+						end
 					end
 				end
 			else
@@ -460,7 +462,7 @@ if $ARGS[0] = 'playfootball':
 
 	if seepornofut >= 1 and kolkaseepornday ! daystart:
 		'The guys gather together and ask you, "<<$pcs_nickname>>, want to watch some porn?"'
-		
+
 		act 'Leave':gt $loc, $metka
 		act 'Go watch porn':minut += 5 & gt 'seeporn'
 	end
@@ -1501,7 +1503,7 @@ if $ARGS[0] = 'pregreact':
 
 			act 'Continue' :gt 'sitrPar'
 			exit
-		
+
 		elseif brotherSex >= 7 and npc_pregtalk['A29'] = 0:
 			cla
 			'Surprised, your brother looks at your stomach, "Are you really pregnant? It... it''s not mine, is it?"'

locations/dinSex.qsrc

@@ -172,7 +172,7 @@ if $ARGS[0] = 'vaginal_sex':
 			'Gradually getting into rhythm, you grind your ass against <<$boydesc>>''s crotch and moan as <<$xe>> fucks your cunt<<$temp_mens>>.'
 		elseif vaginal_tightness >= -3: 
 			'<<$boydesc>> thrusts into you<<$temp_mens>>, <<$xyr>> <<$penis_desc>> rubbing against your inner walls, hitting just the right spot.' 
-			'Your moans are mixed with lewd, wet slapping sounds from <<$xe>> fucking your pussy.'
+			'Your moans are mixed with lewd, wet slapping sounds from <<$xem>> fucking your pussy.'
 		elseif vaginal_tightness < -3: 
 			'You feel <<$boydesc>>''s <<$penis_desc>> sliding through your wet folds<<$temp_mens>>. You savor the intense pleasure from the <<$penis_desc>> inside you, your cunt aching to be filled even more.'
 		end

locations/fit.qsrc

@@ -197,6 +197,20 @@ if $ARGS[0] = 'dressing room':
 			end
 		end
 	end
+	
+	if deodorant > 0 and deodorant_on = 0:
+		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+		act 'Apply deodorant (0:01)':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			deodorant -= 1
+			gs 'sweat', 'deo'
+			iif(pregchem => 2191, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
+			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
+			act 'Continue': menu_off = 0 & gt $loc, $metka
+		end
+	end
 end
 
 if $ARGS[0] = 'fitgirl':

locations/gdksex.qsrc

@@ -429,13 +429,14 @@ if $ARGS[0] = 'kissing':
 								gt 'gdkin'
 							end
 						else
+							act 'Remove his hands and walk away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+						act 'Let him continue':
 							cla
 							pcs_horny = 0
 							orgasm += 1
 							gs 'stat'
 							'Oh no! His touch is too much, I''m going to cum if he keeps doing that, you think to yourself, but are too late to stop him from bringing you to an intense orgasm. You bite your lip hard, trying your best not to cry out in ecstasy.'
-
-							act 'Remove his hands and walk away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							act 'Moan and catch your breath':
 								*clr & cla
 								pcs_horny += 5

locations/gdksport.qsrc

@@ -118,6 +118,20 @@ if $ARGS[0] = 'start':
 		*nl
 		'You are too tired to do any exercise. You need to rest and replenish your stamina.'
 	end
+	
+	if deodorant > 0 and deodorant_on = 0:
+		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+		act 'Apply deodorant (0:01)':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			deodorant -= 1
+			gs 'sweat', 'deo'
+			iif(pregchem => 2191, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
+			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
+			act 'Continue': menu_off = 0 & gt $loc, $metka
+		end
+	end
 end
 
 if $ARGS[0] = 'racing1':
@@ -732,7 +746,7 @@ if $ARGS[0] = 'vball4':
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/game'+rand(1,2)+'.jpg"></center>'
-				'It seems the coach noticed you wasn''t wearing any panties, his eyes lit up and he said turning away: "<<$pcs_lastname>>. Come see me after training. I need to show you UH ... a few things" '
+				'It seems the coach noticed you weren''t wearing any panties, his eyes lit up and he said turning away: "<<$pcs_lastname>>. Come see me after training. I need to show you UH ... a few things" '
 				act 'Leave':gs'stat'& gt 'gdksport', 'start'
 				act 'Go to the coach''s office':gt 'Voltrenersex', 'start'
 			end

locations/gschool_lessons2.qsrc

@@ -1589,7 +1589,6 @@ if $ARGS[0] = 'post_dress':
 			minut += 1
 			deodorant -= 1
 			gs 'sweat', 'deo'
-			! Using second trimester as switch point. Change if you want
 			iif(pregchem => 2191, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
 			act 'Continue': menu_off = 0 & gt $loc, $metka

locations/gschool_lessonsev2.qsrc

@@ -285,7 +285,7 @@ if $ARGS[0] = 'geography':
 		elseif scooltiperand = 14:
 			'For today''s lesson Mrs. Sokoloff is talking about the continent Africa. She''s going through the rich flora and fauna that can be found on the continent.'
 			'She tells you to open the book at page 150 and on one of the pictures you see a photo of a tribe. They''re wearing minuscule amount of clothes. "Look at them, they''re nude." outbursts a laughing Lazar. "They all look like Marcus!" he continues on.'
-			'"Shut up!" yells Andrey back. Are you so butt hurt over they all have bigger cocks then you?" he asks Lazar.'
+			'"Shut up!" yells Andrey back. "Are you so butt hurt over they all have bigger cocks then you?" he asks Lazar.'
 			'The whole class bursts out in laughter, "How the hell do you know that? Have you been looking at Marcus cock? What a faggot!"'
 			'"Fuck you, it wasn''t that I meant. It''s well known that black people got bigger cocks." Andrey quickly replies.'
 			'"Well, everyone has a bigger cock than you, but why not ask the class expert on cocks. What do you say <<$pcs_nickname>>, is there some truth to that?" Lazar asks and the whole class turns toward you.'

locations/mey_vika_events.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'play_game_wish0':
 			'The touching stops and is replaced by someone''s luscious lips, skillfully kissing your pussy lips through the panties. You gasp in excitement, eagerly responding to the kisses. The person''s hands are now moving up your body under your clothes. As the lips move on to your breasts you gasp as you''re yearning for more.'
 			'You are so turned on now. You can feel your pussy dripping, pulsating with eagerness.'
 			$orgasm_or = 'no'
-			gs 'arousal', 'kuni', 5, 'lesbian'
+			gs 'arousal', 'cuni', 5, 'lesbian'
 			gs 'stat'
 
 			act 'Further':
@@ -176,7 +176,7 @@ if $ARGS[0] = 'play_game_wish0':
 				'<center><video autoplay loop src="'+'images/characters/pavlovsk/school/girl/vicky/event/vika_game2.mp4'+'"></video></center>'
 				'Opening your eyes, you are astonished to see that it''s Vicky who''s been teasing you! She smiles at you while removing your panties. She eagerly begins licking you, sending shivers all over your body. You start panting, edging, ready to cum. Vicky noticing you nearing the edge intensifies her tongue movements. All of a sudden you feel her tongue moving more erratically, somewhat disturbing the pleasant feeling. You look up and see Vanya, moving in from behind, pushing his cock into Vicky. Vicky can''t keep on licking you and instead she starts moaning loudly, clearly enjoying Vanya''s cock. Not wanting to lose your orgasm you grab her by the head and drag her face towards your pulsating pussy. She comes to her senses again and starts licking you. Vicky''s tongue is so skillful you cum like a fountain all over her face.'
 				$orgasm_or = 'yes'
-				gs 'arousal', 'kuni', 5, 'lesbian'
+				gs 'arousal', 'cuni', 5, 'lesbian'
 				gs 'stat'
 
 				act 'Further':
@@ -190,7 +190,7 @@ if $ARGS[0] = 'play_game_wish0':
 					gs 'arousal', 'bj', 5
 					gs 'arousal', 'vaginal', 5
 					gs 'cum_call', '', $boy
-					gs 'arousal', 'kuni', 5, 'lesbian'
+					gs 'arousal', 'cuni', 5, 'lesbian'
 					cumspclnt = 0
 					gs 'cum_cleanup'
 					gs 'arousal', 'kiss', 5, 'lesbian'