Merge remote-tracking branch 'upstream/master'

locations/Zvereva_sub_1.qsrc

@@ -727,7 +727,7 @@ if $ARGS[0] = '12':
 		'After a while, Christina nods. "Alright, that''s enough. You''re turning into a great little locker room whore, <<$pcs_nickname>>. Maybe I should take you to the guys'' locker room next time."'
 
 		$orgasm_or = 'no'
-		gs 'arousal', 'masturbate', 10, 'sub', 'humiliation'
+		gs 'arousal', 'vaginal_finger', 10, 'sub', 'humiliation', 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gt 'gschool_lessons4', 'postphys2'

locations/anush_bedroom.qsrc

@@ -530,7 +530,7 @@ if $ARGS[0] = 'computer':
 						else
 							'You lean back in the chair and spread your legs wider apart as you feel your climax approaching. You turn and bury your mouth into your shoulder to keep from screaming as your orgasm rocks your body. It takes you a few moments to recover once it''s over. You straighten everything up and wonder what you can do next to kill some time.'
 							$orgasm_or = 'yes'
-							gs 'arousal', 'clit_finger', 'masturbate', 10
+							gs 'arousal', 'clit_finger', 10, 'masturbate'
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Find something else to do':gt 'anush_bedroom','anushroom'

locations/arousal.qsrc

@@ -68,6 +68,7 @@ $orgasm_or = 'custom' to force orgasm and use custom text set as $orgasm_txt - *
 $orgasm_or = 'yes' and 'custom' require that the first arousal call is a call that can trigger an orgasm, the following arousal calls can trigger it: clit_finger, clit_vibe, cuni, rimming, trib, anal, anal_finger, anal_fist, anal_dildo, anal_strap, anal_vibe, vaginal, vaginal_finger, vaginal_fist, vaginal_dildo, vaginal_strap, vaginal_vibe, self_fisting and self_fisting_anal.
 $orgasm_or = 'no' to prevent orgasm, it will remain in place until manually changed, or if end is called.
 $orgasm_txt is used to add custom text that will be called if Sveta orgasms in the next arousal call. It will remain until cleared or orgasm so you must clear it if not forcing orgasm and don''t want it to be used on next orgasm.
+You can also add 'no_orgasm_msg' to the list of themes to prevent any orgasm message from being shown
 }
  
 !!------------------------------------Virginity checks----------------------------------
@@ -704,7 +705,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 				stim['kink'] += rape['exp']
 				stim['pref'] += rape['pref']
 				stim['kinkno'] += 1
-				rape['day'] = daystart
+				!! used to track if Sveta has been raped for reactions with mum and Luda
+				rape[1] = daystart
 				if temp_unaware = 1:
 					stim['hidden_rape'] = 1
 				else

locations/brother.qsrc

@@ -1370,7 +1370,6 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		gs 'cum_call', 'stomach', 'A34', 1, 0, 0, rand(20,30)
 		gs 'cum_call', 'breasts', 'A34', 1, 0, 0, rand(10,20)
 		gs 'cum_call', 'labia', 'A34', 1, 0, 0, rand(10,20)
-		$orgasm_or = 'yes'
 		gs 'stat'
 		if brotherSex < 4:brotherSex = 4
 		if sound = 0:PLAY 'sound/moaning<<ivrand>>.mp3',30
@@ -1380,7 +1379,8 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		if stat['think_virgin'] = 0:'You slip your fingers into your burning pussy, the sensation causing you to moan.'
 		'You watch as Kolka pulls down his pants and his fully erect <<npc_dick[''A34'']>> cm cock pops free. He kneels between your spread knees and starts to jerk himself off while he watches you play with yourself. Your heart begins to beat faster and faster, you start panting as you feel a primitive heat bubbling up deep from within. Moments later, you hear Kolka groan and watch as ropes of hot cum fly out of his cock, splashing over your crotch, stomach and even your breasts. It''s too much for you and soon you join your brother in ecstasy when your own release finally peaks. It takes everything inside of you to keep from screaming in bliss as your hips buck up and down, your fingers rubbing faster as you ride wave after wave of your orgasm.'
 
-		gs 'arousal','masturbate', 10, 'incest'
+		$orgasm_or = 'yes'
+		gs 'arousal', 'vaginal_finger', 10, 'masturbate', 'incest', 'no_orgasm_msg'
 		gs 'arousal','foreplay', 10, 'incest'
 		minut -= 10
 		gs 'stat'

locations/city_lake.qsrc

@@ -1168,7 +1168,7 @@ if $ARGS[0] = 'vlake1cum':
 
 	act 'Masturbate':
 		*clr & cla
-		gs 'arousal', 'masturbate', 5
+		gs 'arousal', 'clit_finger', 5, 'masturbate'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake6.jpg"></center>'
 		'Left unsatisfied, you take matters into your own hands and vigorously caress your pussy until you scream out in orgasm.'
 		$orgasm_or = 'yes'

locations/foto.qsrc

@@ -1044,34 +1044,32 @@ if $ARGS[0] = 'showers':
 								$orgasm_or = 'no'
 								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 								$orgasm_or = 'yes'
+								$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
 								gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
-								gs 'stat'
 								pcs_mood += 15
-								$orgasm_or = 'yes'
-								$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
 								gs 'arousal', 'end'
+								gs 'stat'
 								act 'Dry off':gt 'foto', 'showers'
 							else
-								gs 'arousal', 'masturbate', 'exhibitionism', 5
-								gs 'stat'
 								pcs_mood += 15
 								$orgasm_or = 'no'
 								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 								$orgasm_or = 'no'
 								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 								$orgasm_or = 'yes'
-								gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
 								$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
+								gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
 								gs 'arousal', 'end'
 								act 'Dry off':gt 'foto', 'showers'
 							end
 						else
-							gs 'arousal', 'masturbate', 'exhibitionism', 5
-							gs 'stat'
 							pcs_horny += 5
 							pcs_mood += 10
-							'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
+							$orgasm_or = 'no'
+							gs 'arousal', 'masturbate', 'exhibitionism', 5
 							gs 'arousal', 'end'
+							gs 'stat'
+							'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
 							act 'Dry off':gt 'foto', 'showers'
 						end
 					end

locations/gschool_boys_bathroom.qsrc

@@ -1038,9 +1038,11 @@ if $ARGS[0] = 'companyb2':
 		end
 		*nl
 		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fucking the guy is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
+		$orgasm_or = 'no'
+		gs 'arousal', 'vaginal_finger', 10, 'masturbate'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
 		$orgasm_or = 'custom'
-		gs 'arousal', 'masturbate', 20
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
@@ -1085,7 +1087,7 @@ if $ARGS[0] = 'companyb3':
 		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fucking Arkadi is giving Anushka. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
 		$orgasm_or = 'custom'
-		gs 'arousal', 'masturbate', 20
+		gs 'arousal', 'vaginal_finger', 20, 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
@@ -1155,7 +1157,7 @@ if $ARGS[0] = 'Join them':
 			'You rub your sensitive little nub carefully to ease yourself into the pleasure. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fucking Arkadi is giving Anushka. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they fuck faster and faster.'
 			$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse.'
 			$orgasm_or = 'custom'
-			gs 'arousal', 'masturbate', 10
+			gs 'arousal', 'vaginal_finger', 10, 'masturbate'
 			gs 'arousal', 'end'
 			gs 'stat'
 			*nl

locations/hunter_interactions.qsrc

@@ -1217,7 +1217,7 @@ if $ARGS[0] = 'andrei_quick_fuck':
 				'After a few minutes he grabs you by the shoulders and unceremoniously shoves you on the ground on your back.'
 				'You watch him furiously jerk standing over you. You realize you have been playing with yourself for some time when he starts shooting his load all over your tits and belly'
 
-				gs 'arousal', 'masturbate', 15
+				gs 'arousal', 'vaginal_finger', 10, 'masturbate'
 				gs 'arousal', 'end'
 				gs 'cum_call', 'breasts', 'A172', 1
 				gs 'cum_call', 'stomach', 'A172', 1

locations/intro_initialization.qsrc

@@ -94,6 +94,7 @@ gs 'body', 'initial'
 !!	**********
 
 gs 'daystart'
+gs 'yearstart'
 gs 'din_pav'
 gs 'din_npc'
 gs 'dinSex2'

locations/intro_initialization_city.qsrc

@@ -103,6 +103,7 @@ gs 'body', 'initial'
 !!	**********
 
 gs 'daystart'
+gs 'yearstart'
 gs 'din_pav'
 gs 'din_npc'
 gs 'dinSex2'

locations/kendra.qsrc

@@ -461,7 +461,7 @@ if $ARGS[0] = 'kendra_couch_strap':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/lezdom/couch/strapon/couch_strap5.jpg"></center>'
 					'You masturbate for a few minutes until Kendra emerges from behind the screen wearing a strapon harness with a fairly large black dildo attached to it. The dildo looks nearly as long as your forearm, and almost as thick. She walks up to you with the dildo pointed right at your mouth.'
-					gs 'arousal', 'masturbate', 3, 'lesbian', 'sub'
+					gs 'arousal', 'clit_finger', 10, 'lesbian', 'sub'
 					gs 'stat'
 					act 'Suck strapon':
 						*clr & cla

locations/mother.qsrc

@@ -1156,7 +1156,7 @@ if $ARGS[0] = 'pregreact1':
 					act 'Continue':gt 'mother'
 				end
 			end
-			if rape['day'] > daystart - 30:
+			if rape[2] > daystart - 30:
 				act'I was raped':
 					cla & *nl
 					'"I... I don''t actually know. I was...," you stammer as you struggle to get the next word out. "I was raped."'

locations/pav_pharmacy.qsrc

@@ -725,7 +725,7 @@ if $ARGS[0] = 'buy_preg_test':
 			'"I know, Aunt," you say, deeply embarrassed. "I just... made a mistake..."'
 			'"I guess we all make those," she sighs, taking a small box off the shelf. "Goodness knows, your sister''s living proof of that. Literally."'
 			'She hands you the box and you gratefully tuck it into your purse.'
-	!!		if rape['day'] > (daystart - 3):
+	!!		if rape[2] > (daystart - 3):
 	!!			act'I was raped':gt 'pav_pharmacy', 'buy_morning_after_raped'
 	!!		end
 		end
@@ -856,7 +856,7 @@ if $ARGS[0] = 'buy_morning_after':
 		if birth_control['condom_stealth'] >= daystart - 3:
 			act'I got stealthed':gs 'pav_pharmacy', 'morning_after_stealth_meek'
 		end
-!!		if rape['day'] > (daystart - 3):
+!!		if rape[2] > (daystart - 3):
 !!			act'I was raped':gt 'pav_pharmacy', 'buy_morning_after_raped'
 !!		end
 	end

locations/qwBarEncounters.qsrc

@@ -380,7 +380,7 @@ if $ARGS[0] = '':
 							'Seeing as he got down on you right then and there, it seems only fair for you to do the same for him, so you get down on your knees, squatted down in front of him with your back against the counter, hidden from most views.'
 							'The strangers pulls out his cock and shoves it in your open mouth - you already knew what to expect and at this point, you are eager to suck his cock. He leans in close and starts fucking your mouth, and you are reveling in it, masturbating as he shoves his <<dick>>cm <<$dick_girth>> cock down your throat again and again. You don''t know if anybody''s watching and you are too drunk to feel anything but excitement at the prospect.'
 							gs 'arousal', 'bj', 5, 'sub', 'exhibitionism', 'deepthroat', 'rough'
-							gs 'arousal', 'masturbate', 5, 'sub', 'exhibitionism'
+							gs 'arousal', 'vaginal_finger', 5, 'sub', 'exhibitionism', 'masturbate'
 							minut -= 5
 							gs 'stat'
 							$orgasm_txt = 'Your fingers on your needy cunt and the sensation of blowing a stranger in the middle of a bar prove too much to you, and you cum, shaking all over, your moans muffled by his <<$dick_girth>> cock.'

locations/selfplay.qsrc

@@ -715,7 +715,7 @@ if $ARGS[0] = 'fingering':
 			'You let your fingers dart over your soft and wet pussy lips, before gradually attempting to slide your finger into your pussy. You feel your hymen stretch a little as you slide first one and then a second finger inside.'
 
 			*nl
-			gs 'arousal', 'masturbate', 2
+			gs 'arousal', 'vaginal_finger', 2, 'masturbate'
 			gs 'stat'
 			gs 'selfplay', 'fingering2'
 		elseif pcs_vag > 0: