Merge remote-tracking branch 'Thavus/master'

# Conflicts:
#	locations/therapist.qsrc
#	locations/therapist_reminder.qsrc

locations/therapist.qsrc

@@ -39,6 +39,8 @@ if $ARGS[0] = 'hypnoGreet':
 				'"I''m sorry Dr. Pavlov... I don''t know what I was thinking. I-"'
 				'He interupts you and commands you to strip off your panties and hand them to him.'
 				act 'Give Dr. Pavlov your panties':
+					cla
+					*clr
 					'<center><img src="images/locations/pavlovsk/clinic/therapist/removePanties.jpg"></center>'
 					gs 'panties', 'dispose'
 
@@ -75,7 +77,7 @@ if $ARGS[0] = 'hypnoGreet':
 			act 'Lift your skirt for Dr. Pavlov':
 				cla
 				*clr
-				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/showPanties.mp4"></video></center>'
+				'<center><img src="images/locations/pavlovsk/clinic/therapist/showPanties.jpg"></center>'
 				'"Miss <<$pcs_lastname>>, what is this?"'
 				'"I''m sorry Dr. Pavlov... I don''t know what I was thinking. I-"'
 				'He interupts you and commands you to strip off your panties and hand them to him.'
@@ -912,7 +914,7 @@ if $ARGS[0] = 'thirdHypnoStage':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
-					'"Great. <font color=brown>Any time you see my cock, you will become horny and your pussy will become wet like a bitch in heat. In addition, my cum will taste and smell pleasant. Both the tast and smell will make you horny. These will happen even when you are awake, but you won''t think anything is wrong with these feelings.</font> Understand, <i>Cunt</i>?"'
+					'"Great. <font color=brown>Any time you see my cock, you will become horny and your pussy will become wet like a bitch in heat. In addition, my cum will taste and smell pleasant. Both the taste and smell will make you horny. These will happen even when you are awake, but you won''t think anything is wrong with these feelings.</font> Understand, <i>Cunt</i>?"'
 					act '"Yes, <i>Master</i>."':
 						cla
 						*clr
@@ -1078,7 +1080,7 @@ if $ARGS[0] = 'hypnoResist':
 	if sound = 0:PLAY 'sound/rainstorm.mp3',20 & PLAY 'sound/clock.mp3',40
 	'<font color=brown>'
 	if hypnoTimesResistedStage = 0:
-		'Your body tenses, and you shake your head as you reject Dr. Pavlov''s suggestion to <<$ARGS[1]>>. Seeing that you might awaken, he quickly tells you to forget the idea of undressing. As the suggestion fades from your memory, you once again relax.'
+		'Your body tenses, and you shake your head as you reject Dr. Pavlov''s suggestion to <<$ARGS[1]>>. Seeing that you might awaken, he quickly tells you to forget the command he gave you. As the suggestion fades from your memory, you once again relax.'
 		'"Hmmm," Dr. Pavlov muses, "Your will is quite strong, it may take some time to break you - but you will break."'
 	elseif hypnoTimesResistedStage = 1:
 		'Your body tenses, and you frown as you resist Dr. Pavlov''s suggestion to <<$ARGS[1]>>. The doctor frowns but orders you to forget the idea, for now. You relax as you comply with his order to forget.'
@@ -1270,7 +1272,7 @@ if $ARGS[0] = 'fuck':
 	$hypnofuck = 'He forces his dick into your body.'
 	if $position = 'back':
 	!on your back, couch
-		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack<<rand(1,2)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack<<rand(1,3)>>.mp4"></video></center>'
 		$hypnofuck2 = 'He pounds you deep into the couch, his balls rhythmically slapping your ass as he labors above you. You feel his sweat dripping down on your tits as you spread your legs as wide as possible to give him as much access as possible.'
 	elseif $position = 'kneel':
 	!kneel, couch
@@ -1357,12 +1359,12 @@ if $ARGS[0] = 'hypnoFuck':
 	if PCloStyle2 = 4:
 		if randpos = 0:
 		!on your back
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack<<rand(1,2)>>.mp4"></video></center>'
+			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack<<rand(1,3)>>.mp4"></video></center>'
 			$hypnofuck = 'You walk to him, and he takes your hand and pushes you onto your back.<br>"You look beautiful. I will fuck your tight hole raw," he says. "You will enjoy it even if it''s painfull. Unfortunately, my wife lost all of her appeal, so I have to satisfy myself with your wet cunt."<br>He grabs your legs and gently pushes them apart then, kneeling between them, he forces his dick into your folds.'
 			$hypnofuck2 = 'He pounds deep into your body, and the hard surface does not make it comfortable for you. You wince a few times while his balls rhythmically slap your ass as he is laboring above you. You feel his sweat dripping down on your tits as you spread your legs as wide as possible to give him as much access as possible.'
 		elseif randpos = 1:
 		!on your back, couch
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack<<rand(1,2)>>.mp4"></video></center>'
+			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack<<rand(1,3)>>.mp4"></video></center>'
 			$hypnofuck = 'You walk to him, but he changes his mind.<br>"No, lie back on the couch, I will fuck you there."<br>Doing as he says, you watch him as he walks up to you and looks down on your naked body, examining you possessively.<br>"You have a beautiful body. Unfortunately, my wife lost all of her appeal, so I have to satisfy myself with girls like you."<br>He grabs your legs and gently pushes them apart then, kneeling between them, he forces his dick into your body.'
 			$hypnofuck2 = 'He pounds you deep into the couch, his balls rhythmically slapping your ass as he labors above you. You feel his sweat dripping down on your tits as you spread your legs as wide as possible to give him as much access as possible.'
 		elseif randpos = 2:
@@ -1763,7 +1765,7 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
 		''
-		'Now that I''ve sufficiently broken your resistence, it''s time we set you up on a more regular schedule. <font color=brown>"From now on, you will feel that you <b>need</b> my hypnotism treatment. You believe that you have scheduled therapy sessions every day at 18:00.</font>. Understand, <i>Cunt</i>?"'
+		'Now that I''ve sufficiently broken your resistence, it''s time we set you up on a more regular schedule. <font color=brown>"From now on, you will feel that you <b>need</b> my hypnotism treatment. You believe that you have scheduled therapy sessions every day at 18:00. You can come before that time, but you have to be here by at least 18:00 or you will feel terrible.</font>. Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		''
 		hypnoSchedule = 1
@@ -2245,11 +2247,13 @@ if $ARGS[0] = 'hypnoProstitute':
 								hypnoProstRubles[2] = 1500
 							end
 							'"Okay."'
-							'"Okay then..." He opens the door to his car and offers for you to step in.'
+							hypnoMoney += hypnoProstRubles[2]
+							'"Okay then..."He reaches into his wallet and pulls out the cash and hands it to you. 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':
+									:hypnoProstSex2
 									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.'
@@ -2271,15 +2275,15 @@ if $ARGS[0] = 'hypnoProstitute':
 										act 'Get Fucked':
 											'<<$img2>>'
 											$butt = dyneval('$result = <<''$pcs_butt_adj''+rand(1,2)>> ')
-											*nl
+											''
 											'He fucks your pussy hard and fast. The car fills with the sound of his hips slapping against your <<$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.'
-
+													'You dress and step out of the car. The man drives away, leaving you alone at the gas station.'
+													
 													act 'Continue waiting':
 														gt 'therapist', 'hypnoProstitute'
 													end
@@ -2294,12 +2298,27 @@ if $ARGS[0] = 'hypnoProstitute':
 					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':
+						act '"Yes."':
+							jump 'hypnoProstGuy2Start1'
+						end
+						act '"Yes, sir."':
+							jump 'hypnoProstGuy2Start1'
+						end
+						act 'Nod':
 							jump 'hypnoProstGuy2Start1'
 						end
 					end
 				else
-					'As you are waiting, you see the business man from before pumping gas again.'
+					if hypnoProstRubles[2] > 100: hypnoProstRubles[2] -= rand(1,9) * 10
+					if hypnoProstRubles[2] < 100: hypnoProstRubles[2] = 100
+					hypnoMoney += hypnoProstRubles[2]
+					'As you are waiting, you see the business man from before pumping gas again. He notices you and walks over. He presses a wad of bills into your hands. "Come on now, I''d like to fuck you again."'
+					act 'Go with him':
+						'He leads you to his car and opens the door for you. Then gets into the front and starts to drive you somewhere secluded. Before you''ve even come to a stop, he''s exploring your vagina with his fingers. He does this for some time before telling you to strip.'
+						act 'Strip':
+							jump 'hypnoProstSex2'
+						end
+					end
 				end
 			end
 		elseif hypnoProstRand = 3:
@@ -2314,10 +2333,42 @@ if $ARGS[0] = 'hypnoProstitute':
 				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
+					'As you are waiting... you see a homeless man picking through garbage in the dumpster by the gas station. He notices you standing by yourself and walks over to you.'
+					'"Excuse me, you got a few rubles to spare?"'
+					'Looking at him, you see that he looks like he hasn''t bathed in weeks and then you smell it. The stench coming from him is horrendous. He gives you a toothy grin and you see that many of his teeth are rotten.'
+					act 'Ask him if he''d like to fuck you':
+						'"Would you like to fuck me?" You ask.'
+						'"Fuck you?" he repeats. "Yea I wanna fuck you!" He grabs you by the arm and pulls you over by the dumpster, practically dragging you.'
+						act 'Continue':
+							jump 'hypnoProstGuy3Start1'
+						end
+					end
+					act 'Show him your bare pussy and ask if he''d like to fuck it':
+						'You pull your skirt up and show him your bare pussy. "Would you like to fuck this?"'
+						'He looks at your bare pussy dumbly, then back up at your face, then back down to your bare pussy again.'
+						'Then his eyes go wide and he grabs you by the arm and pulls you over by the dumpster, practically dragging you. "Yea I wanna fuck you! Little slut! Get over here!"'
+						act 'Continue':
+							:hypnoProstGuy3Start1
 
+						end
+					end
+				else
+					if hypnoProstRubles[2] > 100: hypnoProstRubles[2] -= rand(1,9) * 10
+					if hypnoProstRubles[2] < 100: hypnoProstRubles[2] = 100
+					hypnoMoney += hypnoProstRubles[2]
+					'As you are waiting, the homeless man from before comes walking up to you. He grabs you by the arm and starts pulling you over towards the garbage bins to the side of the gas station. Mostly out of sight.'
+					act 'Go with him':
+						'Shoving you aggressivly against the garbage bin, the homeless man pulls his cock out and says he''s going to fuck you.'
+						act '"Yes sir. How would you like to fuck me?"':
+							jump 'hypnoProstSex2'
+						end
+						act 'Place your hands against the dumpster and spread your legs.':
+							jump 'hypnoProstSex2'
+						end
+						act 'Lay on your back and spread your legs.':
+							jump 'hypnoProstSex2'
+						end
+					end
 				end
 			end
 		elseif hypnoProstRand = 4:

locations/therapist_reminder.qsrc

@@ -7,13 +7,34 @@ if $ARGS[0] = '':
     '<center><img <<$set_imgh>> src="images/pc/reactions/forget.jpg"></center>'
     ''
     'You remember that you have an appointment with your therapist today at 18:00. It''s already <<hour>>:<<minut>>. You should go now.'
-    if reminderFreebee < 4:
-        gs 'willpower', 'misc', 'resist', 'easy'
-        will_cost += (hypnoTime * 2)
-        if will_cost <= pcs_willpwr:
-            act 'Return to what you were doing (<<will_cost>> Willpower)':
+    if $region = 'pav_commercial' or $region = 'pav_lake' or $region = 'pav_park' or $region = 'pav_residential':
+        if reminderFreebee < 4:
+            gs 'willpower', 'misc', 'resist', 'easy'
+            will_cost += (hypnoTime * 2)
+            if will_cost <= pcs_willpwr:
+                act 'Return to what you were doing (<<will_cost>> Willpower)':
+                    cla
+                    pcs_mood -= rand(10,20)
+                    gs 'stat'
+                    '<center><img <<$set_imgh>> src="images/pc/reactions/sad.jpg"></center>'
+                    ''
+                    'You feel bad about missing your appointment, but you have other things to do now. You tell yourself that you''ll see him again as soon as possible.'
+                    act 'Continue':
+                        gt '<<$menu_loc>>', '<<$menu_arg>>'
+                    end
+                end
+            else
+                act 'Return to what you were doing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+            end
+        else
+            act 'Return to what you were doing':
                 cla
-                pcs_mood -= rand(10,20)
+                *clr
+                reminderMult = reminderCount
+                if reminderCount > 10: reminderMult = 10
+                reminderMoodCostLow = func('shortgs','sqrt', 30*reminderMult)
+                reminderMoodCostHigh = func('shortgs','sqrt', 90*reminderMult)
+                pcs_mood -= rand(reminderMoodCostLow, reminderMoodCostHigh)
                 gs 'stat'
                 '<center><img <<$set_imgh>> src="images/pc/reactions/sad.jpg"></center>'
                 ''
@@ -22,11 +43,32 @@ if $ARGS[0] = '':
                     gt '<<$menu_loc>>', '<<$menu_arg>>'
                 end
             end
-        else
-            act 'Return to what you were doing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+        end
+        act 'Go see your therapist':
+            cla
+            *clr
+            if $region = 'pav_commercial':
+                minut += 5
+            elseif $region = 'pav_lake':
+                minut += 15
+            elseif $region = 'pav_park':
+                minut += 10
+            elseif $region = 'pav_residential':
+                minut += 10
+            else
+                minut += 5
+            end
+            '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/schoolWalk.mp4"></video></center>'
+            'You walk to your therapist''s office.'
+    
+            act 'Continue':
+                gt 'therapist'
+            end
         end
     else
-        act 'Return to what you were doing (<<will_cost>> Willpower)':
+        ''
+        '... But you realize you are much to far away, there''s no way you can make it on time.'
+        act 'Return to what you were doing':
             cla
             *clr
             reminderMult = reminderCount
@@ -37,54 +79,12 @@ if $ARGS[0] = '':
             gs 'stat'
             '<center><img <<$set_imgh>> src="images/pc/reactions/sad.jpg"></center>'
             ''
-            'You feel bad about missing your appointment, but you have other things to do now. You tell yourself that you''ll see him again as soon as possible.'
+            'You feel terrible about missing your appointment. You tell yourself that you''ll see him again as soon as possible.'
             act 'Continue':
                 gt '<<$menu_loc>>', '<<$menu_arg>>'
             end
         end
     end
-    act 'Go see your therapist':
-        cla
-        *clr
-        if $region = 'city_center':
-            minut += 30
-        elseif $region = 'city_industrial':
-            minut += 45
-        elseif $region = 'city_island':
-            minut += 45
-        elseif $region = 'city_lake':
-            minut += 45
-        elseif $region = 'city_park':
-            minut += 45
-        elseif $region = 'city_redlight':
-            minut += 45
-        elseif $region = 'city_residential':
-            minut += 45
-        elseif $region = 'gad_forest':
-            minut += 45
-        elseif $region = 'gad_village':
-            minut += 30
-        elseif $region = 'puskin':
-            minut += 35
-        elseif $region = 'pav_commercial':
-            minut += 5
-        elseif $region = 'pav_lake':
-            minut += 15
-        elseif $region = 'pav_park':
-            minut += 10
-        elseif $region = 'pav_residential':
-            minut += 10
-        else
-            minut += 5
-        end
-        '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/schoolWalk.mp4"></video></center>'
-        'You walk to your therapist''s office.'
-
-        act 'Continue':
-			$loc = 'pav_clinic'
-            gt 'therapist'
-        end
-    end
 end
 
 --- therapist_reminder ---------------------------------