1
0
Переглянути джерело

[fixed] More dynamic stuff that Steuchs broke

anjuna krokus 3 місяців тому
батько
коміт
b18d8df28e
4 змінених файлів з 383 додано та 376 видалено
  1. 7 1
      locations/Cheatmenu_din.qsrc
  2. 40 39
      locations/din_bad.qsrc
  3. 320 320
      locations/din_pav.qsrc
  4. 16 16
      locations/din_van.qsrc

+ 7 - 1
locations/Cheatmenu_din.qsrc

@@ -2112,7 +2112,13 @@ end
 
 
 ! BROKEN
-$cheatmenu['theme_customize_input'] = "iif($ARGS[1] = '', dynamic 'gs ''Cheatmenu_din'', ''theme_customize_input'', $ARGS[0], ARGS[1], dynamic 'gs ''Cheatmenu_din'', ''theme_customize_input'', $ARGS[0], $ARGS[1], ARGS[2])"
+$cheatmenu['theme_customize_input'] = "
+	if $ARGS[1] = '' and ARGS[1] ! 0:
+		gs 'Cheatmenu_din', 'theme_customize_input', $ARGS[0], ARGS[1]
+	else
+		gs 'Cheatmenu_din', 'theme_customize_input', $ARGS[0], $ARGS[1], ARGS[2]
+	end
+	"
 if $ARGS[0] = 'theme_customize_input':
 	if $ARGS[1] = 'fname':
 		$temp_input = $trim($input('Enter Font name:'))

+ 40 - 39
locations/din_bad.qsrc

@@ -58,28 +58,29 @@ if $ARGS[0] = 'mobile_check':
 		!! iterating all lovers
 		lover_number = 0
 		:loverloop
-		if pcs_lovers[lover_number] = 1 and loverday[lover_number] ! daystart and hour > 5 and hour < 20 and ringA = 0 and rand(1,7) > 5:
-			if pcs_apprnc < vneshlover[lover_number]:
-				loverrelation[lover_number] -= 1
-				if loverrelation[lover_number] = 0:
-					'<b><font color="red">Your lover hasn''t been calling you lately, they''ve probably grown tired of you.</font></b>'
+			$temp_npcid = $lover[lover_number]
+			if pcs_lovers[lover_number] = 1 and loverday[lover_number] ! daystart and hour > 5 and hour < 20 and ringA = 0 and rand(1,7) > 5:
+				if pcs_apprnc < vneshlover[lover_number]:
+					loverrelation[lover_number] -= 1
+					if loverrelation[lover_number] = 0:
+						'<b><font color="red">Your lover hasn''t been calling you lately, they''ve probably grown tired of you.</font></b>'
+					else
+						'Your lover <<$loverdesc[lover_number]>> has not called you.'
+					end
 				else
-					'Your lover <<$loverdesc[lover_number]>> has not called you.'
+					ring = 1
+					ringA = 1
+					'<b><font color="red">Your phone is ringing</font></b>'
+					PLAY 'sound/old_phone.mp3',30
+					$caller = '<<$loverdesc[lover_number]>>'
+					$callerid = $npc_pic[$temp_npcid]
+					gs 'telefon','phone_ring'
+					pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 				end
-			else
-				ring = 1
-				ringA = 1
-				'<b><font color="red">Your phone is ringing</font></b>'
-				PLAY 'sound/old_phone.mp3',30
-				$caller = '<<$loverdesc[lover_number]>>'
-				$callerid = 'images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg'
-				gs 'telefon','phone_ring'
-				pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 			end
-		end
-		lover_number += 1
+			lover_number += 1
 		if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
-
+		killvar '$temp_npc_id'
 		killvar 'lover_number'
 	end
 end
@@ -366,32 +367,32 @@ end
 !! preziktype: 0 - Use condoms / 1 - don''t use condoms / 2 - use damaged condoms
 !! to check if sveta wants to use a condom use if mc_inventory['equipped_condoms'] > 0:
 
-$din_Do_Condom_Counts = "gs 'din_bad', 'din_Do_Condom_Counts'"
+$din_Do_Condom_Counts = "gs 'din_bad', 'din_Do_Condom_Counts', ARGS[0]"
 if $ARGS[0] = 'din_Do_Condom_Counts':
 	*clr & cla
 	'<center><h1>Condoms</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
-	if ARGS[0] = 1:
+	if ARGS[1] = 1:
 		'Use a condom the next time you have sex.'
 		if preziktype = 2: mc_inventory['sabotaged_condoms'] = mc_inventory['equipped_condoms']
 		mc_inventory['equipped_condoms'] = mc_inventory['normal_condoms']
 		mc_inventory['normal_condoms'] = 0
 		preziktype = 0
-	elseif ARGS[0] = 2:
+	elseif ARGS[1] = 2:
 		'You will not use a condom the next time you have sex.'
 		if preziktype = 0: mc_inventory['normal_condoms'] = mc_inventory['equipped_condoms']
 		if preziktype = 2: mc_inventory['sabotaged_condoms'] = mc_inventory['equipped_condoms']
 		mc_inventory['equipped_condoms'] = 0
 		preziktype = 1
-	elseif ARGS[0] = 3:
+	elseif ARGS[1] = 3:
 		'Use your sabotaged condom the next time you have sex.'
 		if preziktype = 0: mc_inventory['normal_condoms'] = mc_inventory['equipped_condoms']
 		mc_inventory['equipped_condoms'] = mc_inventory['sabotaged_condoms']
 		mc_inventory['sabotaged_condoms'] = 0
 		preziktype = 2
-	elseif ARGS[0] = 4:
+	elseif ARGS[1] = 4:
 		if preziktype ! 0 and mc_inventory['normal_condoms'] > 0:
 			mc_inventory['sabotaged_condoms'] +=1
 			mc_inventory['normal_condoms'] -= 1
@@ -520,9 +521,9 @@ if $ARGS[0] = 'd_tabletkiedt':
 	act 'Return':gt 'stol', 'bc'
 end
 
-$d_tabletkieda = "gs 'din_bad', 'd_tabletkieda'"
+$d_tabletkieda = "gs 'din_bad', 'd_tabletkieda', ARGS[0]"
 if $ARGS[0] = 'd_tabletkieda':
-	if ARGS[0] = 1:
+	if ARGS[1] = 1:
 		tabletkipd += tabletkipt
 		if tabletkiday ! daystart:
 			gs 'din_bad','takepill'
@@ -537,16 +538,16 @@ if $ARGS[0] = 'd_tabletkieda':
 		dynamic $d_tabletkied
 		'You take your birth control pill.'
 		gs 'stat'
-	elseif ARGS[0] = 2:
+	elseif ARGS[1] = 2:
 		birth_control['remind_hour'] = 0
 		gs 'din_bad', 'set_auto_bc'
 		'You will do your best to remember to take your birth control pills every day.'
 		gs 'stat'
-	elseif ARGS[0] = 3:
+	elseif ARGS[1] = 3:
 		'You will take your birth control pills as you desire.'
 		tabletkicheck = 0
 		gs 'stat'
-	elseif ARGS[0] = 4:
+	elseif ARGS[1] = 4:
 		if pcs_intel + pilldays <= rand(30,95) or therapistFuckedPussyStage > 1:
 			'These pills appear to be normal birth control pills.'
 			tabletkioddk = 0
@@ -569,7 +570,7 @@ if $ARGS[0] = 'd_tabletkieda':
 				act 'Return':gt 'stol', 'bc'
 			end
 		end
-	elseif ARGS[0] = 5:
+	elseif ARGS[1] = 5:
 		'You get rid of the strange pills.'
 		tabletkioddk = 0
 		pillsleft[ptype] = 0
@@ -681,10 +682,10 @@ if $ARGS[0] = 'd_cycreport_choice':
 	'</td></tr></table></center>'
 end
 
-$d_cycreport_actor = "gs 'din_bad', 'd_cycreport_actor'"
+$d_cycreport_actor = "gs 'din_bad', 'd_cycreport_actor', ARGS[0]"
 if $ARGS[0] = 'd_cycreport_actor':
 	!! Svetlana has decided she is not pregnant
-	if ARGS[0] = 1:
+	if ARGS[1] = 1:
 		$cycreport_txt = 'It has been <<temp>> days since you last remember having a period.'
 		if knowpreg = 1:
 			denypreg = 1
@@ -697,14 +698,14 @@ if $ARGS[0] = 'd_cycreport_actor':
 		gs 'stat'
 		dynamic $d_cycreport_choice
 	!! Svetlana has decided she is pregnant.
-	elseif ARGS[0] = 2:
+	elseif ARGS[1] = 2:
 		thinkpreg = 1
 		denypreg = 0
 		dynamic $d_cycreport_update
 		gs 'stat'
 		dynamic $d_cycreport_choice
 	!! Svetlana is Menstrating.
-	elseif ARGS[0] = 3:
+	elseif ARGS[1] = 3:
 		thinkpreg = 0
 		denypreg = 0
 		daylastperiod = daystart
@@ -712,7 +713,7 @@ if $ARGS[0] = 'd_cycreport_actor':
 		gs 'stat'
 		dynamic $d_cycreport_choice
 	!! Svetlana is remembering her last period.
-	elseif ARGS[0] = 4:
+	elseif ARGS[1] = 4:
 		thinkpreg = 0
 		denypreg = 0
 		*clr & cla
@@ -726,7 +727,7 @@ if $ARGS[0] = 'd_cycreport_actor':
 		act 'Exit':gs 'stat' & gt $loc, $loc_arg
 		'</td></tr></table></center>'
 	!! Svetlana thinks she doesn''t have periods anymore. Good birth control has this effect (as does pregnancy.)
-	elseif ARGS[0] = 5:
+	elseif ARGS[1] = 5:
 		if knowpreg = 1:
 			denypreg = 1
 		else
@@ -737,7 +738,7 @@ if $ARGS[0] = 'd_cycreport_actor':
 		gs 'stat'
 		dynamic $d_cycreport_choice
 	!! Svetlana is trying to figure out her due date.
-	elseif ARGS[0] = 6:
+	elseif ARGS[1] = 6:
 		*clr & cla
 		'<center><h1>Fertility Cycle</h1></center>'
 		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -749,7 +750,7 @@ if $ARGS[0] = 'd_cycreport_actor':
 		act 'Exit':gs 'stat' & gt $loc, $loc_arg
 		'</td></tr></table></center>'
 	!! Svetlana is trying to guess who is the babydaddy.
-	elseif ARGS[0] = 7:
+	elseif ARGS[1] = 7:
 		*clr & cla
 		'<center><h1>Fertility Cycle</h1></center>'
 		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -811,14 +812,14 @@ if $ARGS[0] = 'd_cycreport_actor':
 		killvar 'tempcurr'
 		}
 	!! Just recently lost a baby to abortion, miscarriage, or think you did because your period finally arrived.
-	elseif ARGS[0] = 8:
+	elseif ARGS[1] = 8:
 		thinkpreg = 0
 		$cycreport_txt = 'Your body is recovering from the trauma of pregnancy after your miscarrage.'
 		dynamic $d_cycreport_update
 		gs 'stat'
 		dynamic $d_cycreport_choice
 	!! Just recently gave birth.
-	elseif ARGS[0] = 10:
+	elseif ARGS[1] = 10:
 		temp = arrsize('Babyptype')
 		temp -= 1
 		$cycreport_txt = 'You are currently recovering from childbirth. You gave birth on <<monthkid[temp]>> / <<daykid[temp]>> / <<yearkid[temp]>>.'

+ 320 - 320
locations/din_pav.qsrc

@@ -23,60 +23,60 @@ if $ARGS[0] = 'koncepodos':
 	set koncepo = 0
 	pcs_mood -= 10
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
-    act '"I''m inquiring about the apartment," You mumble. "On the advert outside"':
-        cls
-        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
-        '"Sorry darling, but the apartment is not for rent" Says the old man, reluctantly.'
-        act 'Sorry, but why is there an ad on the door?':
-            cls
-            gs'stat'
-            set koncepo = 1
-            '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
-            '"Kids, on the wall too, writing stuff everywhere" The old man says gesticulating.'
-            act'Leave': gt 'dvor'
-        end
-    end
+	act '"I''m inquiring about the apartment," You mumble. "On the advert outside"':
+		cls
+		'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
+		'"Sorry darling, but the apartment is not for rent" Says the old man, reluctantly.'
+		act 'Sorry, but why is there an ad on the door?':
+			cls
+			gs'stat'
+			set koncepo = 1
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
+			'"Kids, on the wall too, writing stuff everywhere" The old man says gesticulating.'
+			act'Leave': gt 'dvor'
+		end
+	end
 end
 
 $koncepodos1 = "gs 'din_pav', 'koncepodos1'"
 if $ARGS[0] = 'koncepodos1':
 	*clr & cla
 	menu_off = 1
-    minut += 5
-    set psiha = 0
+	minut += 5
+	set psiha = 0
 	pcs_mood -= 10
-    pcs_horny = 0
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
-    'You walk into a large, dimly lit lobby. In the corner sits the concierge, an old man who looks at you with indifference.'
-    '"I''m inquiring about the apartment," You mumble. "On the advert outside"'
-    '"There''s an advert?" Asks the old man, seeming upset. "That''s odd, no one said anything to me about it being up for rent."'
-    '"So can I have a look at it?" You say, wondering why you''re having to work so hard in this conversation.'
-    '"You want to rent it"?'
-    '"I want to look at it first. If it''s too much hassle to do your job, I can leave."'
-    '"OK then you can go look at the apartment. It''s upstairs, room 17. I will not go with you, my legs ache."'
-    'What an unpleasant man. He has you sign a registrar and then says, "Follow me <<$pcs_firstname>>."'
-    'You follow him through the dimly lit lobby and down a corridor. You can hear barely discernible sounds from various apartments, merging into ghostly mutterings that set the hair on the back of your neck on end. You hear one that almost sounds like it''s whispering, "Run."'
-    'Stopping by an old dresser, the old man rummages through a drawer, "Looks like you are in luck my dear..."'
-    'The old man puts a key in your hand, "Here."'
-    'You instinctively jerk your hand away at the touch of his dry, cold, almost deathly fingers. The concierge grabs your arm and breaks into a mad smile, revealing dark, rotten teeth.'
-    '"So young and pretty...."'
-    'You break his grip and run toward the stairs, hearing his laughter behind you. Echoing up the stairwell, it sounds like a thousand doors creaking.'
-
-    act 'Get out of here fast':pavserhom = 3 & psiha = 1 & gt'dvor'
-    act 'View apartment':gt 'koncepod1', 'krr2x1'
+	pcs_horny = 0
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
+	'You walk into a large, dimly lit lobby. In the corner sits the concierge, an old man who looks at you with indifference.'
+	'"I''m inquiring about the apartment," You mumble. "On the advert outside"'
+	'"There''s an advert?" Asks the old man, seeming upset. "That''s odd, no one said anything to me about it being up for rent."'
+	'"So can I have a look at it?" You say, wondering why you''re having to work so hard in this conversation.'
+	'"You want to rent it"?'
+	'"I want to look at it first. If it''s too much hassle to do your job, I can leave."'
+	'"OK then you can go look at the apartment. It''s upstairs, room 17. I will not go with you, my legs ache."'
+	'What an unpleasant man. He has you sign a registrar and then says, "Follow me <<$pcs_firstname>>."'
+	'You follow him through the dimly lit lobby and down a corridor. You can hear barely discernible sounds from various apartments, merging into ghostly mutterings that set the hair on the back of your neck on end. You hear one that almost sounds like it''s whispering, "Run."'
+	'Stopping by an old dresser, the old man rummages through a drawer, "Looks like you are in luck my dear..."'
+	'The old man puts a key in your hand, "Here."'
+	'You instinctively jerk your hand away at the touch of his dry, cold, almost deathly fingers. The concierge grabs your arm and breaks into a mad smile, revealing dark, rotten teeth.'
+	'"So young and pretty...."'
+	'You break his grip and run toward the stairs, hearing his laughter behind you. Echoing up the stairwell, it sounds like a thousand doors creaking.'
+
+	act 'Get out of here fast':pavserhom = 3 & psiha = 1 & gt'dvor'
+	act 'View apartment':gt 'koncepod1', 'krr2x1'
 end
 
 $pavser = "gs 'din_pav', 'pavser'"
 if $ARGS[0] = 'pavser':
 	menu_off = 1
-    if pcs_hairbsh = 1:pcs_hairbsh = 0
+	if pcs_hairbsh = 1:pcs_hairbsh = 0
 	pcs_mood -= 10
-    gs'stat'
-    'For some reason when you enter the room, you decide to bow before graduating  and bow, after graduating from a deep curtsy.'
-    'Shaking head, swept... hair... colors, came to the middle of the room and do a pirouette - slowly-slowly raised your hands in exaltation.'
-    'You blinded sunny <<$pcs_nickname>> rained out of the window and the shade seemed to get closer.'
-    'And then you notice him: a man sitting behind the couch against the wall, his face buried in his knees. You cry out and involuntarily raise your hand to your mouth, bit, fingers.'
+	gs'stat'
+	'For some reason when you enter the room, you decide to bow before graduating  and bow, after graduating from a deep curtsy.'
+	'Shaking head, swept... hair... colors, came to the middle of the room and do a pirouette - slowly-slowly raised your hands in exaltation.'
+	'You blinded sunny <<$pcs_nickname>> rained out of the window and the shade seemed to get closer.'
+	'And then you notice him: a man sitting behind the couch against the wall, his face buried in his knees. You cry out and involuntarily raise your hand to your mouth, bit, fingers.'
 	act 'Look closer':dynamic $pavser1
 	act 'Run away':pavserhom = 3 & psiha = 1 & gt'dvor'
 end
@@ -84,153 +84,153 @@ end
 $pavser2 = "gs 'din_pav', 'pavser2'"
 if $ARGS[0] = 'pavser2':
 	menu_off = 1
-    psi1day = 0
-    'Closing the gray door, you''re prepared to see, well, anything. You find yourself in a terribly narrow and gloomy hallway.'
-    'The first thing you notice is the wallpaper. It''s covered in a rather strange pattern and clearly very old.'
-    'Then you notice the silence. The dead silence.'
-    '"No place is this quiet," you think to yourself. "It''s like I''m in a coffin."'
-    'You feel a chill run down your spine. A dark and empty place that even sound has left, dust lying everywhere. People clearly have not lived here in a long time.'
-    '"Maybe not just that," you think. "Maybe someone died here."'
-    '"No," you reassure yourself, "that''s just my imagination running wild."'
-    'Still with all these thoughts still spinning in your head, you hesitate, unsure whether you want to further look around.'
-    act 'Leave':pavserhom = 3 & psiha = 1 & gt'dvor'
+	psi1day = 0
+	'Closing the gray door, you''re prepared to see, well, anything. You find yourself in a terribly narrow and gloomy hallway.'
+	'The first thing you notice is the wallpaper. It''s covered in a rather strange pattern and clearly very old.'
+	'Then you notice the silence. The dead silence.'
+	'"No place is this quiet," you think to yourself. "It''s like I''m in a coffin."'
+	'You feel a chill run down your spine. A dark and empty place that even sound has left, dust lying everywhere. People clearly have not lived here in a long time.'
+	'"Maybe not just that," you think. "Maybe someone died here."'
+	'"No," you reassure yourself, "that''s just my imagination running wild."'
+	'Still with all these thoughts still spinning in your head, you hesitate, unsure whether you want to further look around.'
+	act 'Leave':pavserhom = 3 & psiha = 1 & gt'dvor'
 end
 
 $pavser1 = "gs 'din_pav', 'pavser1'"
 if $ARGS[0] = 'pavser1':
 	*clr & cla
 	menu_off = 1
-    psiho = 1
-    pcs_mana -= 30
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-    'Before you, appeared no longer a young man. From him it emanated a savage force and evidence were the dimensions of his body, barely distinguishable from-a beige raincoat and crumpled.'
-    act 'Who are you?':
-        *clr & cla
-        pcs_mana -= 30
-        gs'stat'
+	psiho = 1
+	pcs_mana -= 30
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+	'Before you, appeared no longer a young man. From him it emanated a savage force and evidence were the dimensions of his body, barely distinguishable from-a beige raincoat and crumpled.'
+	act 'Who are you?':
+		*clr & cla
+		pcs_mana -= 30
+		gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-        'You exhale, slowly retreating to the door and trying to pull yourself together. "You scared me," you continue, trying to stop your voice from shaking. At this point, you have learned it:man in the park on the lawn - How did you get here? '
-        '"Through the door" he replies, his voice was deep and sonorous. You stopped at the door. Paul did not move; you have only to leave, but why-then hesitated.'
-        act 'I''m a fool Fool...':
-            *clr & cla
-            gs'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+		'You exhale, slowly retreating to the door and trying to pull yourself together. "You scared me," you continue, trying to stop your voice from shaking. At this point, you have learned it:man in the park on the lawn - How did you get here? '
+		'"Through the door" he replies, his voice was deep and sonorous. You stopped at the door. Paul did not move; you have only to leave, but why-then hesitated.'
+		act 'I''m a fool Fool...':
+			*clr & cla
+			gs'stat'
 			'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-            '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-            '- Leave the door open. But I did not hear, you entered.'
-            '"I went before." His voice screeched a little.'
-            'As you arouse the curiosity - Like this? A key, and then you took it...'
-            '- He told me he gave it to me, - he corrected, continuing to look at you quizzically.'
-            'Her surprised, that it is so easy to communicate with him, and not gone directly from this Strange.'
-            act '- I draw old houses.':
-                *clr & cla
-                arnksg = 1
-                gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+			'- Leave the door open. But I did not hear, you entered.'
+			'"I went before." His voice screeched a little.'
+			'As you arouse the curiosity - Like this? A key, and then you took it...'
+			'- He told me he gave it to me, - he corrected, continuing to look at you quizzically.'
+			'Her surprised, that it is so easy to communicate with him, and not gone directly from this Strange.'
+			act '- I draw old houses.':
+				*clr & cla
+				arnksg = 1
+				gs'stat'
 				'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-                '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-                '- Rent an apartment in a house not too expensive, - He said,.'
-                '- Do you intend to rent an apartment? - You ask.'
-                '- And you? - Now his voice sounded hoarse.'
-                act '- I have not decided yet.':
-                    *clr & cla
-                    pcs_hairbsh = 1
-                    set psihb = 0
-
-                    gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+				'- Rent an apartment in a house not too expensive, - He said,.'
+				'- Do you intend to rent an apartment? - You ask.'
+				'- And you? - Now his voice sounded hoarse.'
+				act '- I have not decided yet.':
+					*clr & cla
+					pcs_hairbsh = 1
+					set psihb = 0
+
+					gs'stat'
 					'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-                    '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-                    'You purely mechanically straightened hair, Using the glass door instead of a mirror.'
-                    'And in my head I stirred instant thought - I''m a fool Fool... and here-It is instantly ulutuchilas.'
-                    '- Interesting, who lived here? - Did you notice.'
-                    'Paul calmly turned without answering and began farming inspection apartments.'
-                    'You both went to the bedroom, pretending, the apartment takes you more, than meeting.'
-                    act 'In the bedroom':gt 'koncepod1', 'bdr2x'
-
-                end
-            end
-        end
-    end
+					'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+					'You purely mechanically straightened hair, Using the glass door instead of a mirror.'
+					'And in my head I stirred instant thought - I''m a fool Fool... and here-It is instantly ulutuchilas.'
+					'- Interesting, who lived here? - Did you notice.'
+					'Paul calmly turned without answering and began farming inspection apartments.'
+					'You both went to the bedroom, pretending, the apartment takes you more, than meeting.'
+					act 'In the bedroom':gt 'koncepod1', 'bdr2x'
+
+				end
+			end
+		end
+	end
 end
 
 $pavser3 = "gs 'din_pav', 'pavser3'"
 if $ARGS[0] = 'pavser3':
 	menu_off = 1
-    'Condition Bedrooms more you plunged into a stupor. Quite ragged room with awkward standing in the midst of her perfectly preserved ancient, plush ottoman.'
-    act '- The chair would look good in a hall, - You dropped it withheld.':
-        *clr & cla
-        pcs_mana -= 50
-        pcs_horny += 20
-        gs'stat'
+	'Condition Bedrooms more you plunged into a stupor. Quite ragged room with awkward standing in the midst of her perfectly preserved ancient, plush ottoman.'
+	act '- The chair would look good in a hall, - You dropped it withheld.':
+		*clr & cla
+		pcs_mana -= 50
+		pcs_horny += 20
+		gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-        '– No, - He replied, - Ottoman will stand there, where there is a.'
-        'It sounded like an order. Rudely, firmly and clearly.'
-        'His answer made you stay away from him.'
-        'Xot you wanted to look at it more closely, review, he dressed, Why look-the eye, What is hidden in the shadow under the brow arrogant dome. You do not can not understand, Why all this gives you pleasure.'
-        'Examine your living room, you are in adjacent rooms, both pretended, that the apartment itself takes you to a greater extent, What is this improbable meeting, fraught with promise - or threat - of some interchanges.'
-        act 'Go to the kitchen':
-            psiho = 2
-            psihb = 0
-            psihc = 0
-            gt 'koncepod1','khr2x'
-        end
-
-        act 'Go into the corridor':
-            psiho = 2
-            psihb = 0
-            psihc = 0
-            gt 'koncepod1', 'krr2x'
-        end
-    end
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+		'- No, - He replied, - Ottoman will stand there, where there is a.'
+		'It sounded like an order. Rudely, firmly and clearly.'
+		'His answer made you stay away from him.'
+		'Xot you wanted to look at it more closely, review, he dressed, Why look-the eye, What is hidden in the shadow under the brow arrogant dome. You do not can not understand, Why all this gives you pleasure.'
+		'Examine your living room, you are in adjacent rooms, both pretended, that the apartment itself takes you to a greater extent, What is this improbable meeting, fraught with promise - or threat - of some interchanges.'
+		act 'Go to the kitchen':
+			psiho = 2
+			psihb = 0
+			psihc = 0
+			gt 'koncepod1','khr2x'
+		end
+
+		act 'Go into the corridor':
+			psiho = 2
+			psihb = 0
+			psihc = 0
+			gt 'koncepod1', 'krr2x'
+		end
+	end
 end
 
 $pavser4 = "gs 'din_pav', 'pavser4'"
 if $ARGS[0] = 'pavser4':
-    *clr & cla
+	*clr & cla
 	menu_off = 1
-    pcs_mana = pcs_mana + 60
-    piss = piss + 1
+	pcs_mana = pcs_mana + 60
+	piss = piss + 1
 
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/shared/bathroom/sittingtoilet.jpg" ></center>'
-    'You went into the corridor and headed to the bathroom, waiting, he will move after, but by the sound of steps realized, that he stayed in the kitchen. Scattered look you ran about the bathroom, listening to, he wanders in the other end of the apartment. The room was bathed in light, which fell through the glass window with glass.'
-    'Finishing the old shell in harmony with frame oval mirror. You stayed in front of him to check his hair, Do not gone cosmetics.'
-    'Then, instantly deciding, she lifted her skirt, he pulled down her panties and sat on the toilet. Do you understand, resultinge herself slo, not only locked, but not even closing the bathroom door, and that he may at any time enter, but this-then you and excited. You become terribly, that it can catch in this position, you, However, I, to make it happen.'
-    'You were terribly, that it can catch in this position, you, However, I, to make it happen.'
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/sittingtoilet.jpg" ></center>'
+	'You went into the corridor and headed to the bathroom, waiting, he will move after, but by the sound of steps realized, that he stayed in the kitchen. Scattered look you ran about the bathroom, listening to, he wanders in the other end of the apartment. The room was bathed in light, which fell through the glass window with glass.'
+	'Finishing the old shell in harmony with frame oval mirror. You stayed in front of him to check his hair, Do not gone cosmetics.'
+	'Then, instantly deciding, she lifted her skirt, he pulled down her panties and sat on the toilet. Do you understand, resultinge herself slo, not only locked, but not even closing the bathroom door, and that he may at any time enter, but this-then you and excited. You become terribly, that it can catch in this position, you, However, I, to make it happen.'
+	'You were terribly, that it can catch in this position, you, However, I, to make it happen.'
 
 	gs 'arousal', 'foreplay', 5, 'exhibitionism'
 	gs 'stat'
 
-    if pcs_horny >= 95:
-        act 'Touch yourself':
-            *clr & cla
-            psi1day = 1
-            psiha = 1
-            gs'stat'
-            '<center><video autoplay loop src="images/locations/pushkin/vacanthouse/11684312.mp4"></video></center>'
-            'You koknulis his wet with excitement and urine pisichki.'
-            'From that sensation, that you''re caught for such indecent occupation, you further podstёguet. And you barely contained, not to publish and sound.'
+	if pcs_horny >= 95:
+		act 'Touch yourself':
+			*clr & cla
+			psi1day = 1
+			psiha = 1
+			gs'stat'
+			'<center><video autoplay loop src="images/locations/pushkin/vacanthouse/11684312.mp4"></video></center>'
+			'You koknulis his wet with excitement and urine pisichki.'
+			'From that sensation, that you''re caught for such indecent occupation, you further podstёguet. And you barely contained, not to publish and sound.'
 
 			gs 'arousal', 'clit_finger', 5, 'masturbate'
 			gs 'stat'
 
-            act 'Continue':
-                *clr & cla
+			act 'Continue':
+				*clr & cla
 				pcs_mood = 100
-                '<center><video autoplay loop src="images/locations/pushkin/vacanthouse/11684312.mp4"></video></center>'
+				'<center><video autoplay loop src="images/locations/pushkin/vacanthouse/11684312.mp4"></video></center>'
 				$orgasm_or = 'custom'
-                $orgasm_txt = 'Suddenly you if electric shock and abdomen began pleasant spasms, you squirm biting her lip, that would not scream with pleasure.'
+				$orgasm_txt = 'Suddenly you if electric shock and abdomen began pleasant spasms, you squirm biting her lip, that would not scream with pleasure.'
 				gs 'arousal', 'clit_finger', 5, 'masturbate'
 				gs 'arousal', 'end'
 				gs 'stat'
 
-                act 'Freshen up':gt 'koncepod1', 'vnr2x'
-            end
-        end
-    end
+				act 'Freshen up':gt 'koncepod1', 'vnr2x'
+			end
+		end
+	end
 
-    act 'Further':psihc = 1 & gt 'koncepod1', 'vnr2x'
+	act 'Further':psihc = 1 & gt 'koncepod1', 'vnr2x'
 
 
 end
@@ -238,62 +238,62 @@ end
 $pavser5 = "gs 'din_pav', 'pavser5'"
 if $ARGS[0] = 'pavser5':
 	menu_off = 1
-    'Putishestvuya the apartment you shocked assorted odtelki and its absence in the premises nekotoryz, And then there''s the kitchen. Well, at least clean.'
-    act 'Further':
+	'Putishestvuya the apartment you shocked assorted odtelki and its absence in the premises nekotoryz, And then there''s the kitchen. Well, at least clean.'
+	act 'Further':
 		*clr & cla
-        gs'stat'
-        '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-        'You enter the kitchen; it, in accordance with the requirements of politeness, you missed a little ahead and behind. Against the wall were piled bundles of yellowed newspapers.'
-        'You have a thought in my head slipped, that he always waits, How will you. You are immersed in their own emotional throwing,'
-        'you are attracted to him and at the same time you are afraid of it, and he decided, that will not help you or customized : He decides to let itself. And what will happen next - he does not care whether or not?'
-        'For he and you were two beings in ridiculous situation, devoid of purpose or meaning in life.'
-        act 'Further':
-            cla
-            *clr
-            psihb = 1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+		'You enter the kitchen; it, in accordance with the requirements of politeness, you missed a little ahead and behind. Against the wall were piled bundles of yellowed newspapers.'
+		'You have a thought in my head slipped, that he always waits, How will you. You are immersed in their own emotional throwing,'
+		'you are attracted to him and at the same time you are afraid of it, and he decided, that will not help you or customized : He decides to let itself. And what will happen next - he does not care whether or not?'
+		'For he and you were two beings in ridiculous situation, devoid of purpose or meaning in life.'
+		act 'Further':
+			cla
+			*clr
+			psihb = 1
 			pcs_mood = 100
-            gs'stat'
-            '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-            'Coming out of his reverie, Did you catch yourself at his greedy, scrutiny. Looking hunter looking at the prey. Closer, cheeky suggestive feeling, that you just-that stripped and fucked.'
-            'You felt his eyes every cell of the body and chuvstvvuya awkward and at the same time as the-excitedly, if enjoy, that he have a little-just demeaning.'
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+			'Coming out of his reverie, Did you catch yourself at his greedy, scrutiny. Looking hunter looking at the prey. Closer, cheeky suggestive feeling, that you just-that stripped and fucked.'
+			'You felt his eyes every cell of the body and chuvstvvuya awkward and at the same time as the-excitedly, if enjoy, that he have a little-just demeaning.'
 
 			gs 'arousal', 'vaginal', 10, 'sub'
 			gs 'stat'
 
-            act 'In the corridor':gt 'koncepod1', 'krr2x'
-        end
-    end
+			act 'In the corridor':gt 'koncepod1', 'krr2x'
+		end
+	end
 end
 
 
 $pavser6 = "gs 'din_pav', 'pavser6'"
 if $ARGS[0] = 'pavser6':
 	menu_off = 1
-    psihb = 1
-    psiho = 3
-
-    'You are returned to the kitchen and missed, looking away from each other''s eyes, broke up into different rooms.'
-    'Both understanding - tightening the inspection of the apartment, you increase the likelihood, between you that-something will happen.'
-    'None of you especially do not wish to, and does not aspire to this, nevertheless he or, or you do not want to deviate from the chosen line of conduct.'
-    'As if someone-it painted for you all the movements and you feel like breaking the spirit of the play or destroy the atmosphere of predestination, arose in the walls of the house.'
-    *nl
+	psihb = 1
+	psiho = 3
+
+	'You are returned to the kitchen and missed, looking away from each other''s eyes, broke up into different rooms.'
+	'Both understanding - tightening the inspection of the apartment, you increase the likelihood, between you that-something will happen.'
+	'None of you especially do not wish to, and does not aspire to this, nevertheless he or, or you do not want to deviate from the chosen line of conduct.'
+	'As if someone-it painted for you all the movements and you feel like breaking the spirit of the play or destroy the atmosphere of predestination, arose in the walls of the house.'
+	*nl
 end
 
 $pavser7 = "gs 'din_pav', 'pavser7'"
 if $ARGS[0] = 'pavser7':
 	menu_off = 1
-    'Then the phone rang inappropriate.'
-    act 'Answer':
-        *clr & cla
-        pcs_horny += 10
-        gs'stat'
-        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/phone.jpg" ></center>'
-        'You raised the phone in the bedroom, he along with you - in the corridor. An unfamiliar voice came to nothing, the connection was lost, but you both continued to press the receiver to his ear, listening to each other''s breath.'
-        'You want, that he spoke with you, I went to some-a trifling concession - showed what-weakness, - And then you can just get up and leave. You were not able to lower the tube, although you desperately tempted to slap her blunder on the lever of the old machine.'
-        'This keeps you from his inflexible arrogance. Maybe, he knew about it, and proud of their power over you.'
-        *nl
-        act 'Listen tube':dynamic $pavser8
-    end
+	'Then the phone rang inappropriate.'
+	act 'Answer':
+		*clr & cla
+		pcs_horny += 10
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/phone.jpg" ></center>'
+		'You raised the phone in the bedroom, he along with you - in the corridor. An unfamiliar voice came to nothing, the connection was lost, but you both continued to press the receiver to his ear, listening to each other''s breath.'
+		'You want, that he spoke with you, I went to some-a trifling concession - showed what-weakness, - And then you can just get up and leave. You were not able to lower the tube, although you desperately tempted to slap her blunder on the lever of the old machine.'
+		'This keeps you from his inflexible arrogance. Maybe, he knew about it, and proud of their power over you.'
+		*nl
+		act 'Listen tube':dynamic $pavser8
+	end
 end
 
 $pavser8 = "gs 'din_pav', 'pavser8'"
@@ -301,201 +301,201 @@ if $ARGS[0] = 'pavser8':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-    pcs_horny +=10
-    pcs_mana = pcs_mana - 50
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-    'And then he appeared, you involuntarily held his tongue over the lip.'
-    '– Well, we choose? - I asked you to inadvertently break into the voice irritation. - Removes this apartment?'
-    '– Yes. It was decided from the outset.'
-    '- But now I hesitate, - He continued. - Do you like her?'
-    'He helped you get up and again asked, - Do you like her?'
-    '- I should think, - You said. You become anxious...'
-    '- So do not pull the cat by the balls, - He said, and this jargon turnover in his mouth sounded like a threat.'
-    'He left and slammed the door.'
-    'You stand rozmyshlyaya about what happened: and he can do with you now, he wants and you will not resisting. But why?'
-    'As well? But you do not know, Suddenly he began maniac and you now cut, and you are under hypnosis smotrelib him as a benefactor.'
-    act 'The Hall':
+	pcs_horny +=10
+	pcs_mana = pcs_mana - 50
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+	'And then he appeared, you involuntarily held his tongue over the lip.'
+	'- Well, we choose? - I asked you to inadvertently break into the voice irritation. - Removes this apartment?'
+	'- Yes. It was decided from the outset.'
+	'- But now I hesitate, - He continued. - Do you like her?'
+	'He helped you get up and again asked, - Do you like her?'
+	'- I should think, - You said. You become anxious...'
+	'- So do not pull the cat by the balls, - He said, and this jargon turnover in his mouth sounded like a threat.'
+	'He left and slammed the door.'
+	'You stand rozmyshlyaya about what happened: and he can do with you now, he wants and you will not resisting. But why?'
+	'As well? But you do not know, Suddenly he began maniac and you now cut, and you are under hypnosis smotrelib him as a benefactor.'
+	act 'The Hall':
 		*clr & cla
-        pcs_mana = manamax
-        pcs_horny += 20
-        gs'stat'
+		pcs_mana = manamax
+		pcs_horny += 20
+		gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-        '- I thought, You''ve gone.'
-        '- I locked the door.'
-        'He slowly walked to you, never taking his eyes from the light you wide-open-blue, moisture veiled eyes, in which there was more humility, than fear.'
-        '- I did not? - sprosilon.'
-        '– No, no, - You have answered, trying to catch his breath, - I just decided, that you left.- Your words came as an invitation to.'
-        'At the moment, he turned and darted near you.'
-        'You oyknula, but the words never sounded, they drowned in your own mind.'
-        act 'Oh':dynamic $pavser9
-    end
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+		'- I thought, You''ve gone.'
+		'- I locked the door.'
+		'He slowly walked to you, never taking his eyes from the light you wide-open-blue, moisture veiled eyes, in which there was more humility, than fear.'
+		'- I did not? - sprosilon.'
+		'- No, no, - You have answered, trying to catch his breath, - I just decided, that you left.- Your words came as an invitation to.'
+		'At the moment, he turned and darted near you.'
+		'You oyknula, but the words never sounded, they drowned in your own mind.'
+		act 'Oh':dynamic $pavser9
+	end
 end
 
 $pavser9 = "gs 'din_pav', 'pavser9'"
 if $ARGS[0] = 'pavser9':
-    *clr & cla
+	*clr & cla
 	menu_off = 1
-    pcs_mood -= 40
-    gs'stat'
+	pcs_mood -= 40
+	gs'stat'
 
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/kiss.jpg" ></center>'
-    'He took in the palm of your face and stared with a kiss on the lips. '
-    'In the living room all round stopped, Only in the sunlight dancing motes; dead silence broken only by their convulsive breathing.'
-    'Suddenly he picked you up and carried her across the living room to the partition window, I suffered with such ease, if you were a small child. You hugged his neck, feels the same mighty and strong, like a tree trunk, and began stroking the muscles, which sparkled on his back under the cloak of a-the smooth material.'
-    'From it was easy sour smell - sweat and then-else, that you could not recognize, - The smell of a man, male, none of your guys do not know the groin, and that smell strongly excites you.'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/kiss.jpg" ></center>'
+	'He took in the palm of your face and stared with a kiss on the lips. '
+	'In the living room all round stopped, Only in the sunlight dancing motes; dead silence broken only by their convulsive breathing.'
+	'Suddenly he picked you up and carried her across the living room to the partition window, I suffered with such ease, if you were a small child. You hugged his neck, feels the same mighty and strong, like a tree trunk, and began stroking the muscles, which sparkled on his back under the cloak of a-the smooth material.'
+	'From it was easy sour smell - sweat and then-else, that you could not recognize, - The smell of a man, male, none of your guys do not know the groin, and that smell strongly excites you.'
 
 	gs 'arousal', 'kiss', 5, 'sub'
 	gs 'stat'
 
 	act 'Further':
-        *clr & cla
-        gs'stat'
-        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/01.jpg" ></center>'
-        'He put you in the chair, but do not let go of the hands of the mighty, he ran your hand under her blouse and began to stroke your breasts.'
-        ''
-        ''
+		*clr & cla
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/01.jpg" ></center>'
+		'He put you in the chair, but do not let go of the hands of the mighty, he ran your hand under her blouse and began to stroke your breasts.'
+		''
+		''
 		gs 'arousal', 'foreplay', 5, 'sub'
 		gs 'stat'
 
-        act 'Further':
-            *clr & cla
-            gs'stat'
-            '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/02.jpg" ></center>'
-            'Picked up the chest, palms and thumbs had nipples. The rough skin on the balls of his fingers made her rush of desire, you clung to him.'
-            'At the end-all he bared your breasts and hot lips touched your nipples and wild heat sladotnogo madness began to rise from the bottom to the top of your body.'
+		act 'Further':
+			*clr & cla
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/02.jpg" ></center>'
+			'Picked up the chest, palms and thumbs had nipples. The rough skin on the balls of his fingers made her rush of desire, you clung to him.'
+			'At the end-all he bared your breasts and hot lips touched your nipples and wild heat sladotnogo madness began to rise from the bottom to the top of your body.'
 
 			gs 'arousal', 'foreplay', 5, 'sub'
 			gs 'stat'
 
-            act 'Further':
-                *clr & cla
-                gs'stat'
-                '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/03.jpg" ></center>'
-                'You neprozvolno cozero his pants and felt beneath the solid barrel member and frantically began to take off his pants while his cock did not seem near your face.'
-                'You smelled in the face of a mixture of smells: sour sweat and urine zpah...'
+			act 'Further':
+				*clr & cla
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/03.jpg" ></center>'
+				'You neprozvolno cozero his pants and felt beneath the solid barrel member and frantically began to take off his pants while his cock did not seem near your face.'
+				'You smelled in the face of a mixture of smells: sour sweat and urine zpah...'
 
 				gs 'arousal', 'foreplay', 5, 'sub'
 				gs 'stat'
 
-                act 'Further':
-                    *clr & cla
-			        pcs_mana = manamax
-                    gs'stat'
-                    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/05.jpg" ></center>'
-                    'And while your brain is trying to digest what is happening, and you understand in general how do you take...'
-                    'You stand in front of him on his knees, I began to caress the tongue of its elastic trunk.'
-                    ''
+				act 'Further':
+					*clr & cla
+					pcs_mana = manamax
+					gs'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/05.jpg" ></center>'
+					'And while your brain is trying to digest what is happening, and you understand in general how do you take...'
+					'You stand in front of him on his knees, I began to caress the tongue of its elastic trunk.'
+					''
 
 					gs 'arousal', 'hj', 5, 'sub'
 					gs 'stat'
 
-                    act 'Further':
-                        *clr & cla
-                        gs'stat'
-                        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/04.jpg" ></center>'
-                        'You were amazed to, what''s happening. You stand in front of a completely unfamiliar man half-naked, on his knees and his mouth furiously pleasuring, caressing his head tongue.'
-                        ''
+					act 'Further':
+						*clr & cla
+						gs'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/04.jpg" ></center>'
+						'You were amazed to, what''s happening. You stand in front of a completely unfamiliar man half-naked, on his knees and his mouth furiously pleasuring, caressing his head tongue.'
+						''
 
 						gs 'arousal', 'bj', 5, 'sub'
 						gs 'stat'
 
-                        act 'Continue':
-                            *clr & cla
-			                pcs_mana = manamax
-			                gs 'underwear', 'remove'
-                            gs'stat'
-                            '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/06.jpg" ></center>'
-                            'And the passion rolls, like the waves on the shore peschanny, raising you all to a new level of bliss and you have not thought about the true test of what is happening, its causes, you become important to the investigation.'
-                            'And the result proved the presence of his grave, Hard, strong and rough fingers in their clitoris...'
+						act 'Continue':
+							*clr & cla
+							pcs_mana = manamax
+							gs 'underwear', 'remove'
+							gs'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/06.jpg" ></center>'
+							'And the passion rolls, like the waves on the shore peschanny, raising you all to a new level of bliss and you have not thought about the true test of what is happening, its causes, you become important to the investigation.'
+							'And the result proved the presence of his grave, Hard, strong and rough fingers in their clitoris...'
 
 							$orgasm_or = 'no'
 							gs 'arousal', 'vaginal_finger', 5, 'sub'
 							gs 'stat'
 
-                            act 'Continue':
-                                *clr & cla
-                                gs'stat'
+							act 'Continue':
+								*clr & cla
+								gs'stat'
 								gs 'npcgeneratec', 0, 'Stranger', rand(19,45)
 								gs 'boyStat', $npclastgenerated
 								cumprecheck = 1
 								gs 'cum_manage'
-                                '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/07.jpg" ></center>'
-                                'Your consciousness fades in and out in the wild passionate dance...'
-                                'He thrusts in you wildly, roughly, furiously. You feel like you are being skewered by the force and depth of his cock...'
+								'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/07.jpg" ></center>'
+								'Your consciousness fades in and out in the wild passionate dance...'
+								'He thrusts in you wildly, roughly, furiously. You feel like you are being skewered by the force and depth of his cock...'
 
 								gs 'arousal', 'vaginal', 10, 'sub'
 								gs 'stat'
 
-                                act 'Continue':
-                                    *clr & cla
-			                        pcs_mana = manamax
-                                    gs'stat'
-                                    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/08.jpg" ></center>'
-                                    '...'
+								act 'Continue':
+									*clr & cla
+									pcs_mana = manamax
+									gs'stat'
+									'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/08.jpg" ></center>'
+									'...'
 
 									$orgasm_or = 'yes'
 									gs 'stat'
 
-                                    act 'Continue':
-                                        *clr & cla
-                                        gs'stat'
-                                        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/09.jpg" ></center>'
-                                        'Another enlightened it, when he put you back on the chair and raise your legs voshol in you and you feel a sharp pain in the uterus of a member of the strike...'
-                                        'Oh my pain...'
-                                        'But the sharp pain was replaced, as sharp blast of bliss and a new wave washed over you...'
+									act 'Continue':
+										*clr & cla
+										gs'stat'
+										'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/09.jpg" ></center>'
+										'Another enlightened it, when he put you back on the chair and raise your legs voshol in you and you feel a sharp pain in the uterus of a member of the strike...'
+										'Oh my pain...'
+										'But the sharp pain was replaced, as sharp blast of bliss and a new wave washed over you...'
 
 										gs 'arousal', 'anal', 10, 'sub'
 										gs 'stat'
 
-                                        act 'Continue':
-                                            *clr & cla
-                                            orgasm += 1
-				                            pcs_horny = 0
+										act 'Continue':
+											*clr & cla
+											orgasm += 1
+											pcs_horny = 0
 											pcs_mood = 100
-                                            gs'stat'
-                                            '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/10.jpg" ></center>'
+											gs'stat'
+											'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/10.jpg" ></center>'
 
 											$orgasm_or = 'yes'
 											gs 'stat'
 
-                                            act 'Continue':
-                                                *clr & cla
-                                                gs'stat'
-                                                '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/11.jpg" ></center>'
-                                                'Woke. The next wave rolled back and you feel at home on his stomach warm, with a strange smell, though vaguely familiar, sperm.'
-                                                'You fell exhausted on the floor and you have some piece while lying close to each other. You''re lying and embracing in the eerie silence only hear your breathing.'
-                                                'He was silent and you are grateful to him for that'
-
-                                                act 'Rollback':dynamic $pavser10
-                                            end
-                                        end
-                                    end
-                                end
-                            end
-                        end
-                    end
-                end
-            end
-        end
-    end
+											act 'Continue':
+												*clr & cla
+												gs'stat'
+												'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/11.jpg" ></center>'
+												'Woke. The next wave rolled back and you feel at home on his stomach warm, with a strange smell, though vaguely familiar, sperm.'
+												'You fell exhausted on the floor and you have some piece while lying close to each other. You''re lying and embracing in the eerie silence only hear your breathing.'
+												'He was silent and you are grateful to him for that'
+
+												act 'Rollback':dynamic $pavser10
+											end
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
 end
 
 $pavser10 = "gs 'din_pav', 'pavser10'"
 if $ARGS[0] = 'pavser10':
 	*clr & cla
 	menu_off = 1
-    psi1day = 1
-    gs 'sweat', 'add', 20
-    spafinloc = 14
+	psi1day = 1
+	gs 'sweat', 'add', 20
+	spafinloc = 14
 	gs 'cum_manage'
-    guy += 1
-    vgape = 1
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/13.jpg" ></center>'
-    'You rolled away and lay kakoeto time watching how he dressed and left in silence.'
-    act 'Get up and get dressed':
+	guy += 1
+	vgape = 1
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/13.jpg" ></center>'
+	'You rolled away and lay kakoeto time watching how he dressed and left in silence.'
+	act 'Get up and get dressed':
 		if $clothingworntype = 'nude':gs 'clothing', 'wear_last_worn'
 		gs 'underwear', 'wear'
 		gt 'koncepod1', 'str2x'

+ 16 - 16
locations/din_van.qsrc

@@ -18,22 +18,6 @@ razors_to_use['pussy'] = min(2, max(1, (max(0, pcs_pubes-shave_length))/20))
 razors_to_use['legs']  = min(3, max(1, (pcs_leghair*4)/20))
 
 $showerdin = "gs 'din_van', 'showerdin'"
-$bteeth = "gs 'din_van', 'bteeth'"
-$dryOff = "gs 'din_van', 'dryOff'"
-$shower = "gs 'din_van', 'shower'"
-$bath = "gs 'din_van', 'bath'"
-$SkinCare = "gs 'din_van', 'SkinCare'"
-$brit = "gs 'din_van', 'brit'"
-$tampon = "gs 'din_van', 'tampon'"
-$quickwash = "gs 'din_van', 'quickwash'"
-$wearpan = "gs 'din_van', 'wearpan'"
-$removepan = "gs 'din_van', 'removepan'"
-$publicpan = "gs 'din_van', 'publicpan'"
-$basin = "gs 'din_van', 'basin'"
-$pirManage = "gs 'din_van', 'pirManage'"
-$enema = "gs 'din_van', 'enema'"
-$toymanage = "gs 'din_van', 'toymanage'"
-$palelady = "gs 'din_van', 'palelady'"
 if $ARGS[0] = 'showerdin':
 	menu_off = 1
 	if hypnoAddict = 0:
@@ -69,6 +53,7 @@ if $ARGS[0] = 'showerdin':
 end
 
 
+$bteeth = "gs 'din_van', 'bteeth'"
 if $ARGS[0] = 'bteeth':
 	if pcs_breath ! 1 or cumloc[12] = 1:
 		act 'Brush your teeth (0:03)':
@@ -93,11 +78,13 @@ if $ARGS[0] = 'bteeth':
 end
 
 
+$dryOff = "gs 'din_van', 'dryOff'"
 if $ARGS[0] = 'dryOff':
 	act 'Get out and dry off': mirror_steam = hour & gt $loc, $loc_arg
 end
 
 
+$shower = "gs 'din_van', 'shower'"
 if $ARGS[0] = 'shower':
 	act 'Take a shower (0:15)':
 		menu_off = 1
@@ -235,6 +222,7 @@ if $ARGS[0] = 'shower':
 end
 
 
+$bath = "gs 'din_van', 'bath'"
 if $ARGS[0] = 'bath':
 	act 'Soak in the bath (0:30)':
 		menu_off = 1
@@ -325,6 +313,7 @@ if $ARGS[0] = 'bath':
 end
 
 
+$SkinCare = "gs 'din_van', 'SkinCare'"
 if $ARGS[0] = 'SkinCare':
 	if mc_inventory['moisturiser']  > 0 and moisturiser_time <= totminut:
 		act 'Apply Moisturizer (0:05)':
@@ -346,6 +335,7 @@ if $ARGS[0] = 'SkinCare':
 end
 
 
+$brit = "gs 'din_van', 'brit'"
 if $ARGS[0] = 'brit':
 	if lashair ! 1 and pcs_shave['free_razor'] + mc_inventory['razor'] > 0:
 		!! if shave_menu = 1: legs and pussy
@@ -560,6 +550,7 @@ if $ARGS[0] = 'brit':
 end
 
 
+$tampon = "gs 'din_van', 'tampon'"
 if $ARGS[0] = 'tampon':
 	if mc_inventory['sanitary_pads'] > 0 and (mesec > 0 or (placebopart > 0 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0 and $pantyworntype ! 'none':
 		act 'Use a sanitary pad (0:02)':
@@ -592,6 +583,7 @@ if $ARGS[0] = 'tampon':
 end
 
 
+$quickwash = "gs 'din_van', 'quickwash'"
 if $ARGS[0] = 'quickwash':
 	if cumsumbod-cumsumvag-cumsumass > 0:
 		act 'Quick wash (0:15)':
@@ -633,6 +625,7 @@ if $ARGS[0] = 'quickwash':
 end
 
 
+$wearpan = "gs 'din_van', 'wearpan'"
 if $ARGS[0] = 'wearpan':
 	if $pantyworntype = 'none':
 		act 'Wear panties (0:02)':
@@ -652,6 +645,7 @@ if $ARGS[0] = 'wearpan':
 end
 
 
+$removepan = "gs 'din_van', 'removepan'"
 if $ARGS[0] = 'removepan':
 	if $pantyworntype ! 'none' and $braworntype ! 'none':
 		act 'Remove underwear (0:02)':
@@ -684,6 +678,7 @@ end
 !! Meant for non-home bathrooms. If you have a bag stashes the underwear in there and enables putting it back on later.
 !! purse_____ variables get wiped in ''wardrobe'', ''clothing'', ''panties'' and ''bra'' so there isn''t a chance of duplication
 
+$publicpan = "gs 'din_van', 'publicpan', $ARGS[0]"
 if $ARGS[0] = 'publicpan':
 	if $pantyworntype ! 'none' and $braworntype ! 'none':
 		act 'Remove underwear'+iif(bag = 1, ' and put it in your purse ',' ') + '(0:02)':
@@ -764,6 +759,7 @@ if $ARGS[0] = 'publicpan':
 end
 
 
+$basin = "gs 'din_van', 'basin'"
 if $ARGS[0] = 'basin':
 	if cumloc[12] = 1:
 		act 'Rinse your mouth (0:05)':
@@ -966,11 +962,13 @@ if $ARGS[0] = 'basin':
 end
 
 
+$pirManage = "gs 'din_van', 'pirManage'"
 if $ARGS[0] = 'pirManage':
 	gt 'piercing_management', 'main'
 end
 
 
+$enema = "gs 'din_van', 'enema'"
 if $ARGS[0] = 'enema':
 	if mc_inventory['enema_kit'] = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) > 0):
 		act 'Give yourself an enema (0:05)':
@@ -1009,6 +1007,7 @@ if $ARGS[0] = 'enema':
 end
 
 
+$toymanage = "gs 'din_van', 'toymanage'"
 if $ARGS[0] = 'toymanage':
 	if mc_inventory['buttplug'] = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
@@ -1083,6 +1082,7 @@ if $ARGS[0] = 'toymanage':
 end
 
 
+$palelady = "gs 'din_van', 'palelady'"
 if $ARGS[0] = 'palelady':
 	if mc_inventory['cocaine'] > 0:'You have enough cocaine for <<mc_inventory[''cocaine'']>> ' + iif(mc_inventory['cocaine'] = 1, ' line.', ' lines.')