Merge remote-tracking branch 'Derryth_Love/master'

locations/pav_park_sex.qsrc

@@ -1,5 +1,4 @@
 # pav_park_sex
-
 if $ARGS[0] = 'watch_sonia':
 	CLOSE ALL
 	*clr & cla
@@ -57,7 +56,6 @@ if $ARGS[0] = 'watch_sonia':
 end
 
 if $ARGS[0] = 'oldman_house':
-	CLOSE ALL
 	*clr & cla
 	menu_off = 1
 	minut += 10
@@ -145,11 +143,7 @@ if $ARGS[0] = 'oldman_house':
 end
 
 if $ARGS[0] = 'oldman_cowgirl':
-	CLOSE ALL
 	*clr & cla
-	menu_off = 1
-	$location_type = 'private_indoors'
-	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/sex/old_man_camera4.jpg"></center>'
 	'You stop sucking his dick and look up at him. "I want to ride you instead."'
 	'He chuckles. "That''s fine by me, girly." He lays down on the bed next to you on his back. You crawl over him, straddling him. You slowly lower yourself down, guiding his dick into your pussy. You feel his cock slide into your slit, letting go of his dick with your hand. You lower yourself further and then start riding him cowgirl style.'
@@ -173,11 +167,7 @@ if $ARGS[0] = 'oldman_cowgirl':
 end
 
 if $ARGS[0] = 'oldman_doggy':
-	CLOSE ALL
 	*clr & cla
-	menu_off = 1
-	$location_type = 'private_indoors'
-	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/sex/old_man_camera7.jpg"></center>'
 	'You stop sucking his dick and look up at him. "Okay." You climb on the bed on all fours with your ass pointed towards him.'
 	'He chuckles. "That''s a good girly." He kneels down behind you, and then you feel the tip of his dick sliding up and down your slit making you and it wet with your pussy juices. A moment later, he slides his dick into your pussy, and he slowly starts to fuck you. "Oh god... your pussy is so tight."'
@@ -202,17 +192,15 @@ if $ARGS[0] = 'oldman_doggy':
 end
 
 if $ARGS[0] = 'oldman_finish':
-	CLOSE ALL
 	*clr & cla
-	menu_off = 1
-	$location_type = 'private_indoors'
-	killvar
+	
+	gs 'npcgeneratec', 0, 'Old Man', 52
+	gs 'boyStat', $npclastgenerated
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/sex/old_man_camera7.jpg"></center>'
 	'You slide off the bed onto your knees in front of him. You take his wet dick in your hand and start jerking him off while holding your face close to the tip of his dick. It doesn''t take long until you feel a blast of cum hit your lips and chin, and a couple more follow. Then he pulls away from you. "Stay right there, just like that. Don''t move."'
 	gs 'arousal', 'hj', 1, 'inhibition'
-	gs 'cum_call', 'face', 0
-!!not sure I did this right with no A# for a unlisted NPC
+	gs 'cum_call', 'face', 'Old Man', 0
 	gs 'stat'
 	act 'Don''t move':
 		*clr & cla

locations/pav_parkev.qsrc

@@ -505,7 +505,6 @@ if $ARGS[0] = 'walk2':
 					gs 'arousal', 'erotic_nudity', -1
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Finish your walk': gt 'pav_park', 'deeper_park'
 				end
 			end
 		elseif temprand = 13:
@@ -549,8 +548,8 @@ if $ARGS[0] = 'walk2':
 		!!	end
 		elseif temprand = 21 and $coatworntype ! 'none':
 			gt 'pav_parkev', 'old_man'
-!!note add code to check for jacket
-!!this gt will go to the old man even if this comes up yes?
+		!!note add code to check for jacket
+		!!this gt will go to the old man even if this comes up yes?
 		!!elseif temprand = 22:
 		!!	kol_man = rand(2, 6)
 		!!	mass_ver_zn = 1
@@ -624,8 +623,8 @@ if $ARGS[0] = 'walk2':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_night.jpg"></center>'
 			'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
 		end
-		act 'Finish your walk': gt 'pav_park', 'deeper_park'
 	end
+	act 'Finish your walk': gt 'pav_park', 'deeper_park'
 end
 
 if $ARGS[0] = 'old_man':

locations/vasily_home_sex.qsrc

@@ -854,7 +854,7 @@ if $ARGS[0] = 'drunken_sex':
 			'Dan continues: "For your first official duty you will lick me clean"'
 			'With some hesitation and maybe a little excitement you bend down and lick Dan''s cock clean, occasionally moving to gently suckle on the tip'
 
-			act 'The room starts spinning': gt 'vasily_home_sex', 'drunken_sleep'
+			act 'The room starts spinning': gt 'vasilyhome', 'drunken_sleep'
 		end
 	end
 end

locations/vasilyhome.qsrc

@@ -386,7 +386,7 @@ if $ARGS[0] = 'drunken_sleep':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel'+rand(1,4)+'.jpg"></center>'
 	'You passed out for about three hours.'
 	'You wake up with a splitting headache and only vague memories of your night with the guys. Remembering that somebody deserved a kick in the balls you look around the room. Vasily is the only one left, and he is passed out in a heap on the sofa. "It was probably Dan that deserved a kick", you mutter to yourself as you try to get your bearings.'
-	act 'Clear your head': gt 'vasilyhome', 'start'
+	act 'Clear your head': gt 'vasilyhome', 'livingroom'
 end
 
 if $ARGS[0] = 'vasily_sex_sonya':