Merge remote-tracking branch 'Thavus/master'

locations/arousal.qsrc

@@ -329,6 +329,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if temp_unaware = 0 or count['vaginal'] > 0:
 			if pcs_vag < dick:pcs_vag += 1
 			if pcs_vag*2 < dick:pcs_vag += 1
+		else
+			if pcs_vag < dick:pcs_hidden_vag += 1
+			if pcs_vag*2 < dick:pcs_hidden_vag += 1
 		end 
 		!! length and girth abilities of vagina are not separated , but I suppose that they are related
 		!! we can estimate difference in girth and length vaginal_girth_difference and vaginal_lenght_difference - names are shortened
@@ -365,7 +368,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 70
 		if pcs_vag + vaginal_slip < 30:
 			!! same as for 'vaginal'
-			if temp_unaware = 0 or count['vaginal'] > 0:pcs_vag += 3
+			if temp_unaware = 0 or count['vaginal'] > 0:
+				pcs_vag += 3
+			else
+				pcs_hidden_vag += 3
+			end
 			gs 'pain', 3 - vgape, 'vaginal', 'stretch'
 			if vgape < 3:vgape = 3
 		end

locations/body.qsrc

@@ -535,15 +535,23 @@ if $ARGS[0] = '':
 		end
 		if pcs_butt <= 4:
 			buttpic = 1
+			$pcs_butt_adj1 = 'flat ass'
+			$pcs_butt_adj2 = 'flat butt'
 			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank. It can be considered very masculine looking and isn''t very impressive.'
 		elseif pcs_butt <= 8: 
 			buttpic = 2
+			$pcs_butt_adj1 = 'ass'
+			$pcs_butt_adj2 = 'butt'
 			$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>. While it''s not flat, it''s nothing special either.'
 		elseif pcs_butt <= 12: 
 			buttpic = 3
+			$pcs_butt_adj1 = 'tight ass'
+			$pcs_butt_adj2 = 'nice ass'
 			$pcs_butt = 'Your tight <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is a little bigger, rounder and firmer than average. You often draw the stares of guys around you.'
 		elseif pcs_butt <= 16: 
 			buttpic = 4
+			$pcs_butt_adj1 = 'fat ass'
+			$pcs_butt_adj2 = 'bubble butt'
 			$pcs_butt = 'You have a large and natural bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk. Guys hungrily fixate on you with their tongues hanging out and other girls are often envious of your booty.'
         end
 		if silicone_butt > 0:

locations/npcstatic5.qsrc

@@ -750,6 +750,74 @@ npc_dick['A<<npctemp>>'] = 15
 npc_sexskill['A<<npctemp>>'] = 2
 npc_intel['A<<npctemp>>'] = 47
 
+npctemp = 249
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Filipp'
+$npc_nickname['A<<npctemp>>'] = 'Sir'
+$npc_lastname['A<<npctemp>>'] = 'Morozov'
+$npc_usedname['A<<npctemp>>'] = 'Mr. Morozov'
+$npc_notes['A<<npctemp>>'] = 'A man that <<pcs_firstname>> met at the gas station. You know nothing about him except that he is dressed like a business man.'
+npc_dob['A<<npctemp>>'] = 19820714
+npc_intel['A<<npctemp>>'] = 75
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'well proportioned'
+npc_dick['A<<npctemp>>'] = 19
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = 11000
+npc_haircol['A<<npctemp>>'] = 0
+
+npctemp = 250
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Gora'
+$npc_nickname['A<<npctemp>>'] = 'Sir'
+$npc_lastname['A<<npctemp>>'] = 'Zhukov'
+$npc_usedname['A<<npctemp>>'] = 'Mr. Zhukov'
+$npc_notes['A<<npctemp>>'] = 'A man that <<pcs_firstname>> met at the gas station. A fat and ugly man. His car is always a mess.'
+npc_dob['A<<npctemp>>'] = 19760323
+npc_intel['A<<npctemp>>'] = 35
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'thick'
+npc_dick['A<<npctemp>>'] = 14
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = 11000
+npc_haircol['A<<npctemp>>'] = 1
+
+npctemp = 251
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Pasha'
+$npc_nickname['A<<npctemp>>'] = 'Sir'
+$npc_lastname['A<<npctemp>>'] = 'Vorobev'
+$npc_usedname['A<<npctemp>>'] = 'Mr. Vorobev'
+$npc_notes['A<<npctemp>>'] = 'A man that <<pcs_firstname>> met at the gas station. A homeless man who can often be found dumpster diving by the gas station. It''s likely that he hasn''t washed in months or even years.'
+npc_dob['A<<npctemp>>'] = 19790603
+npc_intel['A<<npctemp>>'] = 25
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'massive'
+npc_dick['A<<npctemp>>'] = 20
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = 11000
+npc_haircol['A<<npctemp>>'] = 1
+
+npctemp = 252
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Osip'
+$npc_nickname['A<<npctemp>>'] = 'Sir'
+$npc_lastname['A<<npctemp>>'] = 'Kuznetsov'
+$npc_usedname['A<<npctemp>>'] = 'Mr. Kuznetsov'
+$npc_notes['A<<npctemp>>'] = 'A man that <<pcs_firstname>> met at the gas station. An older man. The first time they met, he was arguing with his wife.'
+npc_dob['A<<npctemp>>'] = 19520603
+npc_intel['A<<npctemp>>'] = 25
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'massive'
+npc_dick['A<<npctemp>>'] = 20
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = 11000
+npc_haircol['A<<npctemp>>'] = 1
+
 
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp

locations/therapist.qsrc

@@ -2129,10 +2129,11 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
+				gs 'boyStat', 'A250'
 				if hypnoProstGuyFlag[1] = 0:
 					hypnoProstDates[1] = daystart
 					hypnoProstRubles[1] = 1300
-					'As you are waiting an ugly, fat man comes walking out of the gas station. He''s holding a bag which appears to be full with an assortment of sweets and unhealthy foods.'
+					'As you are waiting, an ugly fat man comes walking out of the gas station. He''s holding a bag which appears to be full with an assortment of sweets and unhealthy foods.'
 					'He throws the bag in the car then notices you. He walks over to you. "Hey, you''ve been standing here since I got here. Do you need a ride or something?"'
 					'"No sir, would you like to fuck me?" You reply almost immediatly.'
 					'"W-what?" He has an incredulous look on his face.'
@@ -2221,12 +2222,84 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
-					'As you are waiting... you come across a business man.'
+				gs 'boyStat', 'A249'
+				if hypnoProstGuyFlag[2] = 0:
+					hypnoProstDates[2] = daystart
+					'As you are waiting... you see a business man pumping gas at the station.'
+					'You approach him and ask him plainly, "Would you like to fuck me?"'
+					'He looks at you incredulously.'
+					act 'Wait for his answer':
+						:hypnoProstGuy2Start1
+						if vidage < 18:
+							'How old are you?'
+							'"I''m <<age>> years old."'
+							if age < 18:
+								'"<<age>>? Why is an <<age>> year old asking a stranger for sex at a gas station? Shouldn''t you be in school?"'
+								'"How much would you pay?"'
+								'"Oh, I see. Then, how is 2000 rubles?"'
+								hypnoProstRubles[2] = 2000
+							else
+								'"Hmm, so then what do you get out of this?"'
+								'"How much would you pay?"'
+								'"Oh, I see. Then, how is 1500 rubles?"'
+								hypnoProstRubles[2] = 1500
+							end
+							'"Okay."'
+							'"Okay then..." He opens the door to his car and offers for you to step in.'
+							act 'Get in':
+								'He drives you to a secluded place, then parks the car. Once he''s parked, he reaches over and puts a hand on your thigh. He moves his hand towards your crotch, reaching underneath your skirt.'
+								'You sit still as his fingers explore your vagina. He does this for some time before telling you to strip.'
+								act 'Strip':
+									i = rand(1,3)
+									if i = 3:
+										'You pull your clothes off. He tells you to lay back on the seat so he can fuck you.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									elseif i = 2:
+										'You pull your clothes off. He tells you to sit on his cock and ride him.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									else
+										'You pull your clothes off. He tells you to get on your hands and knees on the seat so he can fuck you.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									end
+									act 'Crawl onto the seat':
+										'<<$img1>>'
+										'You get into position and offer him your pussy.'
+										'He quickly presses the head of his cock against your hole and it slides in easily.'
+										act 'Get Fucked':
+											'<<$img2>>'
+											butt = 'pcs_butt_adj<<rand(1,2)>>'
+											''
+											'He fucks your pussy hard and fast. The car fills with the sound of his hips slapping against your <<dynamic butt>> and the squelching of your wet pussy.'
+											'He uses your pussy for his own pleasure for some time until you start to feel his cock bulge inside of you and he lets out a moan.'
+											act 'Take his cum':
+												'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie<<rand(1,3)>>.mp4"></video></center>'
+												'He unloads inside of your vagina.'
+												act 'Continue':
+													'You dress and step out of the car. The business man then hands you the money and leaves.'
+
+													act 'Continue waiting':
+														gt 'therapist', 'hypnoProstitute'
+													end
+												end
+											end
+										end
+									end
+								end
+							end
+						end
+					end
+					act 'Ask again':
+						'"Would you like to fuck me?"'
+						'I heard you the first time. Do you know what you are asking me?'
+						act 'Yes':
+							jump 'hypnoProstGuy2Start1'
+						end
+					end
 				else
-
+					'As you are waiting, you see the business man from before pumping gas again.'
 				end
 			end
 		elseif hypnoProstRand = 3:
@@ -2237,10 +2310,12 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
-					'As you are waiting... you come across a homeless man.'
+				gs 'boyStat', 'A251'
+				if hypnoProstGuyFlag[3] = 0:
+					hypnoProstDates[3] = daystart
+					hypnoProstRubles[3] = 1300
+					'As you are waiting... you see a homeless man picking through garbage in the dumpster by the gas station.'
+					
 				else
 
 				end
@@ -2253,9 +2328,9 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
+				if hypnoProstGuyFlag[4] = 0:
+					hypnoProstDates[4] = daystart
+					hypnoProstRubles[4] = 1300
 					'As you are waiting... a van rolls up to you and before you know it, you''re being dragged into the van.'
 				else
 
@@ -2427,9 +2502,9 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
+				if hypnoProstGuyFlag[6] = 0:
+					hypnoProstDates[6] = daystart
+					hypnoProstRubles[6] = 1300
 					'As you are waiting... you come across a middle aged man.'
 				else
 
@@ -2444,9 +2519,9 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
+				if hypnoProstGuyFlag[7] = 0:
+					hypnoProstDates[7] = daystart
+					hypnoProstRubles[7] = 1300
 					'As you are waiting... you come across a randomized trucker. This one should not be blocked from happening again.'
 				else
 
@@ -2460,9 +2535,9 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
+				if hypnoProstGuyFlag[8] = 0:
+					hypnoProstDates[8] = daystart
+					hypnoProstRubles[8] = 1300
 					'As you are waiting... you come across a randomized male. This one should not be blocked from happening again.'
 				else