Merge remote-tracking branch 'Sicaa/master'

locations/Voltrenersex.qsrc

@@ -402,12 +402,15 @@ if $ARGS[0] = 'masaj':
 	'"<<$pcs_lastname>>, you look tired, do you want a massage?"'
 	act 'Agree':
 		cls
+		gs 'boyStat', 'A69'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj1.jpg"></center>'	
 		'Coach lubricates his hand with oil and said to you: "Undress", you are slightly embarrassed, but also hot with desire to get a massage and you began to pull your clothes off.'
 		act 'Undress':
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj2.jpg"></center>'	
 			'"Fully undressed", added coach, when he seen that you hesitated on panties. Sighing, you pull your panties off.'
+			gs 'arousal', 'foreplay', 5
+			gs 'stat'
 			act 'Lie down':
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj3.jpg"></center>'	
@@ -416,37 +419,44 @@ if $ARGS[0] = 'masaj':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj4.jpg"></center>'
 					'You lay on the sofa, as the coach began to lubricate your naked body with oil, gently rubbing your chest, foot, neck, rubbing the oil in and relaxing the muscles. You nipples harden from the feelings of pleasure and you blush. Seeing this, the coach just smiled.'	
+					gs 'arousal', 'massage', 5
+					gs 'stat'
 					act 'Further':
 						cls
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj5.jpg"></center>'
 						'Mikhail began to knead your feet, lifting and twisting them. And you could only moan with pleasure and mild pain. You lost all track of time as the coach massaged you.'
+						gs 'arousal', 'massage', 10
+						gs 'stat'
 						act 'Further':
 							pcs_sleep += 25
-							minut += 30
 							pcs_mood += 20
+							gs 'arousal', 'massage', 10
 							gs 'stat'
 							cls
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj6.jpg"></center>'
 							'You lie with your legs spread apart, you can feel how wet your pussy is. Perfectly visible to your coach, he gently glides his hands over your body. Then Mikhail Nikolayevich asked "Well that ''s all for today, or do you want to continue?".'
-							act 'Dress and leave': gt 'gdksport', 'start'
+							act 'Dress and leave': gs 'arousal', 'end' & gt 'gdksport', 'start'
 							if pcs_horny >= 100 and rand(0,1) = 1 and mesec <= 0: 
 								act 'Continue':
 									cls
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj7.jpg"></center>'
 									'He slide his hand between your legs, the touch was so light, intoxicating and gentle. You desire building in your body, all you want to do is just grab him and force his hand to caress you firmer. Mikhail continued stroking your hot swollen pussy, from which flowed your wetness. Closing your eyes, you try not to moan, suddenly you feel the touch of the lips and tongue on your pussy.'
+									gs 'arousal', 'foreplay', 5
+									gs 'stat'
 									act 'Further':
 										cls
-										orgasm += 1
-										stat['cuni'] += 1
-										pcs_horny = 0
 										npc_rel['A69'] += 1
-										gs 'stat'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj8.mp4"></video></center>'
-										'His mouth and tongue worked your pussy, bringing you to new highest of passion and pleasure. Before long your body is wracked with rolling orgasms.'
+										$orgasm_txt = 'His mouth and tongue worked your pussy, bringing you to new highest of passion and pleasure. Before long your body is wracked with rolling orgasms.'
+										$orgasm_or = 'yes'
+										gs 'arousal', 'cuni', 5
+										gs 'stat'
 										act 'Recover':
 											cls
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj9.jpg"></center>'
 											'With your eyes still closed you recover form your orgasm. Mikhail, moved up near you head, he starts to massage your breasts next.'
+											gs 'arousal', 'foreplay', 5
+											gs 'stat'
 											act 'Lick':
 												cls
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj10.jpg"></center>'
@@ -455,15 +465,14 @@ if $ARGS[0] = 'masaj':
 													cls
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj11.jpg"></center>'
 													'You happily open your mouth, he grabs you and pulls you towards him till your head is off the couch and your head tilts back, till holding your mouth open, he slides his dick in your mouth. You instantly start sucking his cock. At first he is slow and gentle as he thrust into your mouth, but as he gets more aroused he gets faster and harder. He starts driving his cock into your mouth and down your throat as he literally starts to fuck your mouth. Despite the discomfort of feeling his cock thrust down your throat you still moan in pleasure.'
+													gs 'arousal', 'bj', 10, 'deepthroat'
+													gs 'stat'
 													act 'Swallow':
 														cls
-														gs 'boyStat', 'A69'
-														sexpartkno = 1
+														gs 'arousal', 'bj', 5, 'deepthroat'
 														swallow += 1
-														spafinloc = 12
-														gs 'cum_manage'
-														stat['bj'] += 1
-														minut += 30
+														gs 'cum_call', 'mouth', $boy, 1
+														gs 'cum_call', 'face', $boy, 1
 														pcs_mood += 20
 														trenerSex += 1
 														gs 'stat'
@@ -504,7 +513,6 @@ if $ARGS[0] = 'discoSex':
 				act 'Pulling up your skirt':
 					cls
 					npc_rel['A69'] += 5
-					pcs_horny += 10
 					if $pantyworntype ! 'none':
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco2.mp4"></video></center>'
 						'You sit on one of the toilets, pulling your skirt up and spreading your legs, watching your little display for a moment. He pulls you up and then pulls you panties down, letting them pool around your ankles.'
@@ -512,40 +520,41 @@ if $ARGS[0] = 'discoSex':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco3.jpg"></center>'
 						'Stepping out of your panties around your ankles you pull up your skirt showing him your naked wet pussy. While the coach pulls out his hard dick and starts stroking it as he watched you.'
 					end
+					gs 'arousal', 'foreplay', 2
+					gs 'stat'
 					act 'Bending over to show him your ass':
 						cls
-						pcs_horny += 10
-						minut += 20
 						gs 'boyStat', 'A69'
+						gs 'arousal', 'foreplay', 3
 						gs 'stat'
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco4.mp4"></video></center>'
 						'As you bend over you pull up your skirt showing him your bare ass. Almost at once he grabs your hip with one hand, apparently no longer wanting to just watch. With his other hand he guides his dick, he rubs the head of it against your wet pussy. Then trails it up to your asshole, leaving a trail of your wetness from your pussy to your ass, then he slides it back down and rubs his head against your pussy again.'
 						'Getting the head of his dick even more soaked in your pussy juices, once more he slides it back up and starts rubbing it against your asshole. This time he doesn''t slide it back down, instead he pushes the head of his dick into your ass. You wince and cry out slightly in pain, as you feel the head of his dick force itself into your ass. He rubs your back with one hand, caressing you. "Take a breath and relax it will feel better."'
 						act 'Fuck your ass':
 							cls
-							stat['anal'] += 1
-							pcs_ass += 1
-							gs 'boyStat', 'A69'
-							gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
 							'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco5.mp4"></video></center>'
+							gs 'dinSex','boy_wants_anal','lubri'
 							'You do your best to do as he says, taking a deep breath and trying to relax, but it is hard to relax when you have a <<dick>>cm <<$dick_girth>> cock in your ass. He begins slowly and gently fucking your ass, with each stroke he does just a tiny bit deeper. Bitting your lower lip in pain as he slowly fucks your ass.'
 							'But he was right in time it hurts less and even starts to feel kinda good, a bit of a mixture of pleasure and pain. You feel yourself starting to moan. Taking this as a sign you are ready he starts to pump in and out of your ass faster, slowly but steadily picking up the pace, until he is pounding your balls deep in your ass.'
-							'You moan in a groan as he fucks your ass, you can''t decided which sensation is stronger, the pain or the pleasure.'							
+							'You moan in a groan as he fucks your ass, you can''t decided which sensation is stronger, the pain or the pleasure.'
+							gs 'arousal', 'anal', 10
+							gs 'stat'
 							act 'Cumming':
 								cls
-								sexpartkno = 1
-								spafinloc = 4
-								gs 'cum_manage'
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco6.mp4"></video></center>'
 								'He suddenly pulls out of your ass, at once you feel the streams of hot sperm landing on your ass, several spurts of cum cover your ass, with a sigh of satisfaction he puts his dick away as he waits, leaving your to clean the cum off your ass.'
+								gs 'arousal', 'anal', 5
+								gs 'arousal', 'end'
+								gs 'cum_call', 'butt', $boy, 1
+								gs 'stat'
 								act 'Go with coach':
+									cls
 									Discoclose = 1
 									!closing disco on this day not to forget  stat
-									minut += 20
+									minut += 10
 									music_loop = 0
 									close all
 									gs 'stat'
-									cls
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 									'Leaving you walk through town, as you get near your apartment, the coach stops and turns to you to say something.'
 									act 'Listen to him': gt 'Voltrener', 'trener_speak'

locations/soniadisco.qsrc

@@ -4,6 +4,7 @@
 !!Which arg it goes to depends on level of soniafall
 if $ARGS[0] = 'start':
 	if daystart => soniafallDay + 6:
+		soniafallDay = daystart
 		if soniafall = 0:
 			gt 'soniadisco', 'disco0'
 		elseif soniafall = 1:
@@ -24,7 +25,6 @@ if $ARGS[0] = 'start':
 	else
 		gt 'soniadisco', 'disco01'
 	end
-	soniafallDay = daystart
 end
 
 if $ARGS[0] = 'disco0':
@@ -76,7 +76,8 @@ if $ARGS[0] = 'disco0':
 				grupvalue[4] -= 2
 				grupvalue[1] += 2
 				npc_rel['A25'] += 5
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshot/big25.jpg"></center>'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big25.jpg"></center>'
 				'You stand in front of her and grab ahold of her arms so she stops moving around. "Sonia! Look around, you are totally wasted and grinding on these guys like you plan to fuck them all."'
 				'Sonia resist for a moment but then your words seem to sink in and she drunkenly blinks a couple of times then looks around. She blushes a bit and seems to sober up just a little, as she realizes just how wasted she was. She gives you a grateful nod and awkwardly tries to leave the dance floor, but the guys are trying to keep her from it. You have to intervene on her behalf and make the guys let go of her. The two of you finally make it off the dance floor near the door leaving the dance hall.'
 				*nl
@@ -242,7 +243,7 @@ if $ARGS[0] = 'disco1':
 			npc_rel['A11'] -= 1
 			npc_rel['A25'] += 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/gopnik/soniadrink.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadrink.jpg"></center>'
 			'You move over to sit next to Sonia turning down the drink, as you say to her. "Slow down Sonia, you don''t want to get wasted." She turns and gives you a sour look.'
 			'"We''ve already been through this <<$pcs_nickname>>! You aren''t my mother, how about you chill out and enjoy the drinks like the rest of us." with that she grabs the bottle and chugs down a quarter of the bottle. The gopniks all whoop and holler encouraging her to keep going.'
 			'Sonia does have more, a lot more and it doesn''t take to long until she is totally wasted. With a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
@@ -263,12 +264,12 @@ if $ARGS[0] = 'soniadrinkmore1':
 	minut += 10
 	grupvalue[4] += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/gopnik/soniadrink.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadrink.jpg"></center>'
 	'You smile and take hold of her hand holding the cup, while encouraging her to sit back down. "What''s the rush Sonia? We''re having a good time here right?" You ask her as you extend her arm and cup towards Vasily who happily refills it.'
 	'Sonia grins at you. "You''re right!" Then she downs about half the cup in one gulp coughing a bit. You all sit, talk and drink some more. Sonia finishes the cup finally and the boys start passing out more, which Sonia lets her cup be filled again.'
 	act 'Take another drink':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/gopnik/panties1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/panties1.jpg"></center>'
 		'You smile and hold up your cup and get a refill, everyone is laughing and having a good time. When it comes time for a third refill Vasily refuses to refile your cup and instead whispers to you. "Good girls shouldn''t get drunk around bad boys."'
 		'Sonia is really starting to get wasted now. As she does Dan speaks up. "Hey Sonia what color are your panties?"'
 		'She looks at him a little confused. "What?"'
@@ -333,7 +334,7 @@ if $ARGS[0] = 'dance':
 			grupvalue[1] -= 1
 			grupvalue[2] -= 1
 			grupvalue[3] -= 2
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sonia2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/2.jpg"></center>'
 			'You tell her: "You have a nice set of boobs, Sonia. I can see why you''d be so willing to show them off to the world."'
 			'She looks at you with a slightly puzzled look on her face but never stops dancing as she asks: "Wha- what are you talking about?"'
 			'With a grin, you put your hand on her other shoulder and slide that strap down too, fully exposing her breasts to everyone who happens to be looking her way. She barely notices, and doesn''t understand why you are staring at her so intently. Once you walk away, she dances with both her breasts bouncing freely for several minutes before some guys pawing at her exposed breasts finally makes her notice. She blushes but also laughs about it, pulling her top back in place.'