ソースを参照

Merge remote-tracking branch 'Blatte/master'

KevinSmarts 5 年 前
コミット
66a0f84fab
47 ファイル変更165 行追加44 行削除
  1. 1 0
      locations/LariskaGo.qsrc
  2. 3 1
      locations/LariskaHome.qsrc
  3. 1 0
      locations/LariskaStart.qsrc
  4. 1 0
      locations/RimmaSexQW.qsrc
  5. 3 3
      locations/RynokHoz.qsrc
  6. 3 0
      locations/Serge_kuh.qsrc
  7. 1 0
      locations/SoniaHome.qsrc
  8. 4 3
      locations/lab.qsrc
  9. 3 0
      locations/laketoilet.qsrc
  10. 3 0
      locations/lesbidomhouse.qsrc
  11. 5 1
      locations/lesbisubhouse.qsrc
  12. 5 2
      locations/liam.qsrc
  13. 3 0
      locations/liames.qsrc
  14. 2 2
      locations/love.qsrc
  15. 3 0
      locations/lug.qsrc
  16. 2 2
      locations/qjob.qsrc
  17. 1 0
      locations/qwBarBilliard.qsrc
  18. 1 0
      locations/qwBarBilliard2.qsrc
  19. 1 1
      locations/qwBarEncounters.qsrc
  20. 3 0
      locations/qwBarPoletToilet.qsrc
  21. 1 0
      locations/qwIzoldaApp.qsrc
  22. 1 0
      locations/qwloc.qsrc
  23. 1 0
      locations/qwlocdog.qsrc
  24. 3 0
      locations/qwmeet.qsrc
  25. 1 0
      locations/restoranM.qsrc
  26. 3 0
      locations/rinok.qsrc
  27. 4 1
      locations/rinwork.qsrc
  28. 32 19
      locations/road.qsrc
  29. 14 0
      locations/rolanapt.qsrc
  30. 3 0
      locations/rolanbath.qsrc
  31. 4 2
      locations/salon.qsrc
  32. 9 0
      locations/sauna.qsrc
  33. 3 0
      locations/sbReksHome.qsrc
  34. 1 0
      locations/sentence.qsrc
  35. 3 0
      locations/serpent.qsrc
  36. 7 5
      locations/sexshop.qsrc
  37. 3 0
      locations/shop.qsrc
  38. 1 0
      locations/shopdacha.qsrc
  39. 1 0
      locations/shoplifting.qsrc
  40. 3 0
      locations/sitr.qsrc
  41. 3 0
      locations/sitr2x.qsrc
  42. 1 0
      locations/sny.qsrc
  43. 1 0
      locations/soniaDisco.qsrc
  44. 1 0
      locations/sportShop.qsrc
  45. 3 0
      locations/stripclub.qsrc
  46. 3 0
      locations/stwork.qsrc
  47. 6 2
      locations/svidboy.qsrc

+ 1 - 0
locations/LariskaGo.qsrc

@@ -1,4 +1,5 @@
 # LariskaGo
+menu_off = 1
 gs'stat'
 
 '<center><b><font color="maroon"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></font></b></center>'

+ 3 - 1
locations/LariskaHome.qsrc

@@ -5,7 +5,9 @@ March 25,2016
 Cleaned up the dialog
 added a few lines to the BDSM room to improve immersion
 }
-
+$menu_loc = 'LariskaHome'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'indoors'
 CLOSE ALL
 gs'stat'

+ 1 - 0
locations/LariskaStart.qsrc

@@ -6,6 +6,7 @@ if $ARGS[0] = 'start':
 	numnpc = 13
 	minut += 5
 	$static_num = 'A13'
+	menu_off = 1
 	gs'stat'
 
 	'<center><b><font color = maroon><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'

+ 1 - 0
locations/RimmaSexQW.qsrc

@@ -2,6 +2,7 @@
 cls
 minut += 15
 rimmaday = daystart
+menu_off = 1
 gs 'stat'
 'You go over to Rima who smiles affably as she greets you.'
 '"Hi <<$pcs_nickname>>. My shift is almost over. Do you want to do something?"'

+ 3 - 3
locations/RynokHoz.qsrc

@@ -16,7 +16,7 @@
 
 if $ARGS[0] = 'the_beginning':
 	minut += 15
-
+	menu_off = 1
 	if arturplan > 4000:arturplan -= 1000
 
 	gs 'stat'
@@ -212,7 +212,7 @@ end
 
 !!Artur and friends.
 if $ARGS[0] = 'group':
-
+	menu_off = 1
 	money += 5000
 
 	if repa < 6:repa = 6
@@ -277,7 +277,7 @@ end
 
 !!Just Artur
 if $ARGS[0] = 'sex':
-
+	menu_off = 1
     gs 'boyStat', 'A73'
 	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj15.jpg"></center>'
 	'The Artur takes you into the warehouse, and with you on your knees in front of him pulls out his <<dick>>cm <<$dick_girth>> dick. He smacks you in the face with it and then rubs the tip against your lips, when you open your mouth he shoves his dick in your mouth and roughly fucks your mouth.'

+ 3 - 0
locations/Serge_kuh.qsrc

@@ -16,6 +16,9 @@ if $ARGS[0] = '':
 	*clr & cla
 	gs 'boyStat', 'A112'
 	minut += 1
+	$menu_loc = 'Serge_kuh'
+	$menu_arg = ''
+	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge2.jpg"></center>'
 	'Sergey Borisovich Shulgin, born in 1967. His hair is grey by now, and he has a small beer belly, but in your opinion he still looks good for his age. His then-wife divorced him a long time ago and he has been single ever since, raising Vasily all by himself.'

+ 1 - 0
locations/SoniaHome.qsrc

@@ -16,6 +16,7 @@ if $ARGS[0] = 'Aftermath':
 	NikoAftermath = 1
 	$location_type = 'private'
 	$locclass = 'bedr'
+	menu_off = 1
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/soniawake.jpg"></center>'

+ 4 - 3
locations/lab.qsrc

@@ -1,8 +1,9 @@
 # lab
 if $ARGS[0] = 'start':
-	cla
-	clr
-	*clr
+	cla & *clr
+	$menu_loc = 'lab'
+	$menu_arg = 'start'
+	menu_off = 0
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/street.mp3',30
 	minut += 5

+ 3 - 0
locations/laketoilet.qsrc

@@ -8,6 +8,9 @@ if $ARGS[0] = 'main':
 	$location_type = 'bathroom'
 	$locM = 'laketoilet'
 	$metkaM = 'main'
+	$menu_loc = 'laketoilet'
+	$menu_arg = 'main'
+	menu_off = 0
 
 	cla
 	*clr

+ 3 - 0
locations/lesbidomhouse.qsrc

@@ -4,6 +4,9 @@
 if $ARGS[0] = 'start':
 	cls
 	minut += 5
+	$menu_loc = 'lesbidomhouse'
+	$menu_arg = 'start'
+	menu_off = 0
 	gs'stat'
 	temp = RAND(0,2)
 

+ 5 - 1
locations/lesbisubhouse.qsrc

@@ -5,7 +5,11 @@ if $ARGS[0] = 'start':
 
 	$metka = 'start'
 	$loc = 'lesbisubhouse'
-	gs'stat'
+	$menu_loc = 'lesbisubhouse'
+	$menu_arg = 'start'
+	menu_off = 0
+	gs 'stat'
+	
 	if mistbondage = 0:
 		cls
 		lesbiday = day

+ 5 - 2
locations/liam.qsrc

@@ -1,8 +1,11 @@
 # liam
 
-$metka = $ARGS[0]
-$loc = $CURLOC
+$metka = ''
+$loc = 'liam'
 $location_type = 'public_outdoors'
+$menu_loc = 'liam'
+$menu_arg = ''
+menu_off = 0
 CLOSE ALL
 if sound = 0:PLAY 'sound/street.mp3',30
 cls

+ 3 - 0
locations/liames.qsrc

@@ -3,6 +3,9 @@
 $metka = ''
 $loc = 'liames'
 $location_type = 'public_outdoors'
+$menu_loc = 'liames'
+$menu_arg = ''
+menu_off = 0
 CLOSE ALL
 clr
 gs'stat'

+ 2 - 2
locations/love.qsrc

@@ -1,7 +1,7 @@
 # love
 if $ARGS[0] = 'start':
-	cla
-	*clr
+	cla & *clr
+	menu_off = 1
 
 	if haraklover[lover_number] = 0:gt 'love', '0'
 	if haraklover[lover_number] = 1:gt 'love', '1'

+ 3 - 0
locations/lug.qsrc

@@ -4,6 +4,9 @@ if $ARGS[0] = 'start':
 	$metka = 'start'
 	$loc = 'lug'
 	$location_type = 'public_outdoors'
+	$menu_loc = 'lug'
+	$menu_arg = 'start'
+	menu_off = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/park/lug.jpg" ></center>'
 	'It''s a small but well maintained meadow with evergreen grass, perfect for laying down to rest, have a picnic or just sunbathe. Mothers with small children regularly visit this place.'

+ 2 - 2
locations/qjob.qsrc

@@ -1,8 +1,8 @@
 # qjob
 
 if $ARGS[0] = 'var1':
-	cla
-	*clr
+	cla & *clr
+	menu_off = 1
 	var = rand(0, 3)
 
 	if var ! 0:

+ 1 - 0
locations/qwBarBilliard.qsrc

@@ -2,6 +2,7 @@
 
 $location_type = 'event'
 gs 'themes', 'indoors'
+menu_off = 1
 
 if $ARGS[0] = 'billiard_engine':
 	cla

+ 1 - 0
locations/qwBarBilliard2.qsrc

@@ -2,6 +2,7 @@
 
 $location_type = 'event'
 gs 'themes', 'indoors'
+menu_off = 1
 
 if $ARGS[0] = 'VicArt_Ev1_Cash':
 	*clr & cla

+ 1 - 1
locations/qwBarEncounters.qsrc

@@ -2,7 +2,7 @@
 
 gs 'stat'
 $location_type = 'event'
-
+menu_off = 1
 gs 'themes', 'indoors'
 
 

+ 3 - 0
locations/qwBarPoletToilet.qsrc

@@ -6,6 +6,9 @@ $loc = 'qwBarPoletToilet'
 $metka = ''
 $locM = 'qwBarPoletToilet'
 $metkaM = ''
+$menu_loc = 'qwBarPoletToilet'
+$menu_arg = ''
+menu_off = 0
 
 if MartinTalkDaystart ! daystart:
 	MartinTalkDaystart = daystart

+ 1 - 0
locations/qwIzoldaApp.qsrc

@@ -2,6 +2,7 @@
 if $ARGS[0] = '':
 	$location_type = 'private'
 	minut += 15
+	menu_off = 1
 	gs 'stat'
 	gs 'boyStat', 'A111'
 	if hour >= 16 and izoldaday ! daystart:

+ 1 - 0
locations/qwloc.qsrc

@@ -2,6 +2,7 @@
 $location_type = 'event_outdoors'
 if $ARGS[0] = '':
 	minut += 5
+	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Man</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/vladimir/001.jpg"></center>'

+ 1 - 0
locations/qwlocdog.qsrc

@@ -1,6 +1,7 @@
 # qwlocdog
 cls
 minut += 3
+menu_off = 1
 gs 'stat'
 'You pick up the phone and a female voice answers, "Hello <<$pcs_nickname>>, this is Margaret. Let''s meet up in the cafe."'
 

+ 3 - 0
locations/qwmeet.qsrc

@@ -4,6 +4,7 @@ if $ARGS[0] = '':
 	minut += 5
 	vladimirQW = 25
 	vladimirday = daystart
+	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Vladimir</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/vladimir/001.jpg"></center>'
@@ -116,6 +117,7 @@ end &! --- qwmeetdy ---
 !! start of the second date
 if $ARGS[0] = '2':
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/glory/001.jpg"></center>'
 	'Glory smiled and gestured for you to get in the car on the front passenger seat.'
@@ -477,6 +479,7 @@ end &! --- qwpbereg2 ---
 !! start of the third date
 if $ARGS[0] = '3':
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/glory/001.jpg"></center>'
 	'Glory smiled and gestured for you to get in the car on the front passenger seat.'

+ 1 - 0
locations/restoranM.qsrc

@@ -1,6 +1,7 @@
 # restoranM
 
 $location_type = 'public_indoors'
+menu_off = 1
 
 if $ARGS[0] = 'start':
 	minut += 30

+ 3 - 0
locations/rinok.qsrc

@@ -19,6 +19,9 @@ if $ARGS[0] = 'start' or $metka = 'start':
 	mag = 1
 	$metka = 'start'
 	$loc = 'rinok'
+	$menu_loc = 'rinok'
+	$menu_arg = 'start'
+	
 	'<center><b><font color="maroon">Marketplace</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/market/rinok.jpg"></center>'
 	''

+ 4 - 1
locations/rinwork.qsrc

@@ -27,7 +27,10 @@ $location_type = 'event_outdoors'
 if $ARGS[0] = 'start':
 	$metka = 'start'
 	$loc = 'rinwork'
-	cls
+	cla & *clr
+	$menu_loc = 'rinwork'
+	$menu_arg = 'start'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Marketplace</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/market/rinok.jpg"></center>'

+ 32 - 19
locations/road.qsrc

@@ -4,9 +4,12 @@ $location_type = 'public_outdoors'
 if $ARGS[0] = '':
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/highway.mp3',50
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	cls
+	$metka = ''
+	$loc = 'road'
+	cla & *clr
+	$menu_loc = 'road'
+	$menu_arg = ''
+	menu_off = 0
 	gs 'stat'
 	'<center><h2>Main road between St. Petersburg and Pavlovsk</h2></center>'
 	if month >= 11 or month <= 3:
@@ -129,15 +132,12 @@ end
 
 if $ARGS[0] = 'drive_sex1':
 	$location_type = 'event_outdoors'
-	cls
+	cla & *clr
+	menu_off = 1
 	gs 'npcgeneratec', 0, 'truck driver', rand(14,22)
 	gs 'boyStat', $npclastgenerated
-	gs'stat'
+	gs 'stat'
 	autostop_price = 0
-	pcs_horny += RAND(20,30)
-	guy += 1
-	stat['bj'] += 1
-	hja += 1
 	swallow += 1
 	spafinloc = 12
 	gs 'cum_manage'
@@ -164,19 +164,24 @@ if $ARGS[0] = 'drive_sex1':
 	'You eagerly bob your head up and down while he drives, totally forgetting about your earlier doubts and do your best to get him off.'
 	'With success: in no time at all, the man groans and his cock erupts inside your mouth, shooting gobs of his hot sperm onto your tongue while you keep your lips closed around his cock to not make a mess.'
 	'Realizing you can''t spit it out anywhere, you have no option but to swallow his load while he keeps driving.'
+	
+	gs 'arousal', 'hj', 15, 'prostitution'
+	gs 'arousal', 'bj', 15, 'prostitution'
+	minut -= 15
+	gs 'arousal', 'end'
+	gs 'stat'
+	
 	act'To go further': gt 'road', 'autospot_drive'
 end
 
 if $ARGS[0] = 'drive_sex2':
 	$location_type = 'event_outdoors'
-	cls
+	cla & *clr
+	menu_off = 1
 	gs 'npcgeneratec', 0, 'truck driver', rand(14,22)
 	gs 'boyStat', $npclastgenerated
-	gs'stat'
+	gs 'stat'
 	autostop_price = 0
-	pcs_horny += RAND(20,30)
-	guy += 1
-	hja += 1
 	spafinloc = 7
 	gs 'cum_manage'
 	if $road_textrand0 = 'Gadukino':
@@ -198,13 +203,19 @@ if $ARGS[0] = 'drive_sex2':
 	if dick >= 20: $raod_text_sex = 'huge'
 	'You gentle massage his cock between your fingers while the man gets comfortable. It''s <<$raod_text_sex>>, roughly <<dick>> centimetres long and quite girthy. You manage to massage him to a full erection in no time at all, and begin to jerk him off while he drives, rubbing your fingertips over his glans.'
 	'Even though you feel a bit awkward for having to service this man to get where you need to be, you''re serious about what you promised him and jerk him off diligently. In no time at all, your soft touch brings him to an orgasm. Unfortunately his cock was pointing straight at you when it happened, and most of his sperm ends up on your clothes.'
+	
+	gs 'arousal', 'hj', 15, 'prostitution'
+	gs 'arousal', 'end'
+	gs 'stat'
+	
 	act'Continue': gt 'road', 'autospot_drive'
 end
 
 if $ARGS[0] = 'autospot_drive':
 	$location_type = 'event_outdoors'
-	cls
-	gs'stat'
+	cla & *clr
+	menu_off = 1
+	gs 'stat'
 	money -= autostop_price * 100
 	if $road_textrand0 = 'Gadukino':
 		minut += 15
@@ -238,8 +249,9 @@ end
 
 if $ARGS[0] = 'autostpo_money':
 	$location_type = 'event_outdoors'
-	cls
-	gs'stat'
+	cla & *clr
+	menu_off = 1
+	gs 'stat'
 	autostop_price = RAND(3,6)
 	textrand = RAND(1,3)
 	if textrand = 1:$road_textrand4 = 'I''ll take you there for <<autostop_price*100>> <b>₽</b>.'
@@ -350,7 +362,8 @@ if $ARGS[0] = 'autostpo_money':
 end
 
 if $ARGS[0] = 'autostop_d':
-	cls
+	cla & *clr
+	menu_off = 1
 	gs'stat'
 	truck_drive = 0
 	bandit_drive = 0

+ 14 - 0
locations/rolanapt.qsrc

@@ -9,6 +9,9 @@ if $ARGS[0] = 'home':
 	$metka = 'home'
 	$loc = 'rolanapt'
 	$location_type = 'private'
+	$menu_loc = 'rolanapt'
+	$menu_arg = 'start'
+	menu_off = 0
 	clr
 	popolaini = 0
 	saunaYouRoom = 0
@@ -48,6 +51,7 @@ if $ARGS[0] = 'hallway':
 	*clr
 	minut += 1
 	$location_type = 'private'
+	menu_off = 1
 	killvar '$locclass'
 	gs 'stat'
 	!gs 'rolanapt' , 'rolanroute'
@@ -120,6 +124,7 @@ if $ARGS[0] = 'room':
 	minut += 1
 	$location_type = 'private'
 	$locclass = 'bedr'
+	menu_off = 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Rolan''s bedroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bedroom.jpg"></center>'
@@ -141,6 +146,7 @@ if $ARGS[0] = 'guestroom':
 	minut += 1
 	$location_type = 'private'
 	$locclass = 'bedr'
+	menu_off = 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Guest Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/guestroom.jpg"></center>'
@@ -155,6 +161,7 @@ if $ARGS[0] = 'livingroom':
 	*clr
 	minut += 1
 	$locclass = 'livingr'
+	menu_off = 1
 	gs 'stat'
 	'<center><b><font color = maroon>Living Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/livingroom.jpg"></center>'
@@ -187,6 +194,7 @@ if $ARGS[0] = 'kitchen':
 	*clr
 	minut += 1
 	$locclass = 'kitr'
+	menu_off = 1
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitchen.jpg"></center>'
@@ -473,6 +481,7 @@ if $ARGS[0] = 'grandmaroom':
 	*clr & cla
 	minut += 1
 	temp = rand(0,1)
+	menu_off = 1
 	gs 'stat'
 	'<center><b><font color = maroon>Grandma''s room</font></b></center>'
 	if rolanworker = 4 and rolanknow = 1:
@@ -557,6 +566,7 @@ end
 if $ARGS[0] = 'kuh_buh':
 	*clr & cla
 	minut += 1
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/rolanapple0.jpg"></center>'
 	'"Hello Miss <<$pcs_lastname>>! Great day, isn''t it?" he shouts cheerfully.'
@@ -574,6 +584,7 @@ end
 if $ARGS[0] = 'bend':
 	*clr & cla
 	minut += 1
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/rolanapple1.jpg"></center>'
 	'"Miss <<$pcs_lastname>>, would you be so kind as to help an old man"?'
@@ -616,6 +627,7 @@ end
 
 if $ARGS[0] = 'kuhbaz':
 	minut += 2
+	menu_off = 1
 	gs 'stat'
 	if rolan_kuhbaz_count = 0:
 		*clr & cla
@@ -657,6 +669,7 @@ if $ARGS[0] = 'drawer':
 	CLOSE ALL
 	cla
 	*clr
+	menu_off = 1
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/drawer/private'+rand(0,1)+'.jpg"></center>'
@@ -735,6 +748,7 @@ if $ARGS[0] = 'mypanty':
 		*clr
 		minut += 1
 		npc_rel['A133']-= 30
+		menu_off = 1
 		gs 'stat'
 		'<center><b><font color = maroon>Guilty</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/headrol.jpg"></center>'

+ 3 - 0
locations/rolanbath.qsrc

@@ -7,6 +7,9 @@ if $ARGS[0] = 'start':
 	$metkaM = 'start'
 	$locM = 'rolanbath'
 	$location_type = 'bathroom'
+	$menu_loc = 'rolanbath'
+	$menu_arg = 'start'
+	menu_off = 0
 	cla & *clr
 	gs 'stat'
 	if RolanLoc[hour] = 7:

+ 4 - 2
locations/salon.qsrc

@@ -6,8 +6,10 @@ if $ARGS[0] = 'start':
 	if week = 1 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
 	if week = 3 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
 	if week = 5 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
-	cla
-	*clr
+	cla & *clr
+	$menu_loc = 'salon'
+	$menu_arg = 'start'
+	menu_off = 0
 	salonrand = rand(0, 9)
 	gs 'stat'
 	gs 'themes', 'indoors'

+ 9 - 0
locations/sauna.qsrc

@@ -7,6 +7,9 @@ if $ARGS[0] = '':
 	*clr & cla
 	$loc = 'sauna'
 	$metka = ''
+	$menu_loc = 'sauna'
+	$menu_arg = ''
+	menu_off = 0
 	sauna += 1
 	gs 'stat'
 	'<center><b>Sauna</b></center>'
@@ -39,6 +42,9 @@ if $ARGS[0] = 'sauna2':
 	*clr & cla
 	$loc = 'sauna'
 	$metka = 'sauna2'
+	$menu_loc = 'sauna'
+	$menu_arg = 'sauna2'
+	menu_off = 0
 	$location_type = 'indoors'
 	minut += 5
 	gs 'stat'
@@ -75,6 +81,9 @@ if $ARGS[0] = 'saunaroom':
 	$metkaBroom = 'saunaroom'
 	$locM = 'sauna'
 	$metkaM = 'saunaroom'
+	$menu_loc = 'sauna'
+	$menu_arg = 'saunaroom'
+	menu_off = 0
 	$location_type = 'private'
 	saunaYouRoom = 1
 	gs 'stat'

+ 3 - 0
locations/sbReksHome.qsrc

@@ -23,6 +23,9 @@ if $ARGS[0] = 'party':
 	gs 'themes', 'indoors'
 	$metka = 'party'
 	$loc = 'sbReksHome'
+	$menu_loc = 'sbReksHome'
+	$menu_arg = 'party'
+	menu_off = 0
 	cls
 	minut += 15
 	sisboyparty = 1

+ 1 - 0
locations/sentence.qsrc

@@ -4,6 +4,7 @@
 !!shows up when courtletter_date = daystart
 if $ARGS[0] = 'letter':
 	*clr & cla
+	menu_off = 1
 	courtletter_date = 0
 	courthearing_date = daystart + 7
 	if week = 6: courthearing_date += 2

+ 3 - 0
locations/serpent.qsrc

@@ -1,6 +1,9 @@
 # Serpent
 $metka = ''
 $loc = 'Serpent'
+$menu_loc = 'Serpent'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'secluded'
 
 if findneck = 1:

+ 7 - 5
locations/sexshop.qsrc

@@ -3,12 +3,14 @@ $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	$loc = $CURLOC
-	$metka = $ARGS[0]
-	$sexloc = $CURLOC
+	$loc = 'sexshop'
+	$metka = 'start'
+	$sexloc = 'sexshop'
+	$menu_loc = 'sexshop'
+	$menu_arg = 'start'
+	menu_off = 0
     $location_type = 'public_indoors'
-	cla
-	*clr
+	cla & *clr
 
 	if kendra > 0 and rand(1, 10) = 10:gt 'sexshop', 'kendra'
 	if $pantyworntype = 'none' and rand(1, 10) = 10:gt 'sexshop', 'shprod'

+ 3 - 0
locations/shop.qsrc

@@ -3,6 +3,9 @@
 
 !! Main entrance
 if $ARGS[0] = 'start':
+	$menu_loc = 'shop'
+	$menu_arg = 'start'
+	menu_off = 0
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/shop.mp3',30
 	$shoplocation = 'main'

+ 1 - 0
locations/shopdacha.qsrc

@@ -1,5 +1,6 @@
 # shopdacha
 clr
+menu_off = 1
 gs 'stat'
 gs 'themes', 'indoors'
 '<center><b><font color="maroon">Ilyich and Biryukov construction</font></b></center>'

+ 1 - 0
locations/shoplifting.qsrc

@@ -11,6 +11,7 @@ if $ARGS[0] = 'city':
 
 	act 'Attempt to steal':
 		*clr & cla
+		menu_off = 1
 		picrand = rand(0,7)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/steal<<picrand>>.jpg"></center>'

+ 3 - 0
locations/sitr.qsrc

@@ -3,6 +3,9 @@
 CLOSE ALL
 $metka = ''
 $loc = 'sitr'
+$menu_loc = 'sitr'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'private'
 $locclass = 'livingr'
 act 'Go to the corridor':gt 'korr'

+ 3 - 0
locations/sitr2x.qsrc

@@ -9,6 +9,9 @@ end
 
 $metka = ''
 $loc = 'sitr2x'
+$menu_loc = 'sitr2x'
+$menu_arg = ''
+menu_off = 0
 
 
 clr

+ 1 - 0
locations/sny.qsrc

@@ -2,6 +2,7 @@
 
 if $ARGS[0] = '3':
 	cls
+	menu_off = 1
 	gs 'stat'
 	if music_on = 1:
 		$track_loop = 'sound/newyear.mp3'

+ 1 - 0
locations/soniaDisco.qsrc

@@ -2,6 +2,7 @@
 
 
 if $ARGS[0] = '':
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/0.jpg"></center>'
 	'Vitek and some of his friends are on their way out of the disco, together with Sonia. In the paper bag Vasily has in his hand, you see the neck of a bottle.'

+ 1 - 0
locations/sportShop.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'start':
     $location_type = 'public_indoors'
 	cls
+	menu_off = 1
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Danilovich sporting goods</font></b></center>'

+ 3 - 0
locations/stripclub.qsrc

@@ -3,6 +3,9 @@ if $ARGS[0] = 'start':
 	cla
 	*clr
 	minut += 5
+	$menu_loc = 'stripclub'
+	$menu_arg = 'start'
+	menu_off = 0
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Strip Club</font></b></center>'

+ 3 - 0
locations/stwork.qsrc

@@ -5,6 +5,9 @@ if $ARGS[0] = 'start':
 	$locM = 'stwork'
 	$metkaM = 'start'
 	$sexloc = 'stwork'
+	$menu_loc = 'stwork'
+	$menu_arg = 'start'
+	menu_off = 0
 	$location_type = 'private'
 	clr
 	minut += 5

+ 6 - 2
locations/svidboy.qsrc

@@ -8,11 +8,11 @@ if $ARGS[0] = 'kinosvid':
 	else
 		$svidboy_home = 'torgcentr'
 	end
-	cla
-	*clr
+	cla & *clr
 	minut += 60
 	pcs_mood += 10
 	loverrelation[lover_number] += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><b>Cinema</b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kino0.jpg"></center>'
@@ -62,6 +62,7 @@ if $ARGS[0] = 'parksvid':
 	minut += 60
 	pcs_mood += 10
 	loverrelation[lover_number] += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><b>Park</b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park0.jpg"></center>'
@@ -209,6 +210,7 @@ if $ARGS[0] = 'parksvid21':
 	end
 	cla
 	*clr
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park7.jpg"></center>'
 	'Once <<$loverdesc[lover_number]>> finished, he asks you, "Well this little Papuan still here?"'
 	'"Yes, actively Fingering." you reply, glancing toward African.'
@@ -289,6 +291,7 @@ if $ARGS[0] = 'billsvid':
 	minut += 60
 	pcs_mood += 10
 	loverrelation[lover_number] += 3
+	menu_off = 1
 	gs 'stat'
 	picrand = rand(51, 52)
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/bil<<picrand>>.jpg"></center>'
@@ -350,6 +353,7 @@ if $ARGS[0] = 'kafesvid':
 	minut += 60
 	pcs_mood += 10
 	loverrelation[lover_number] += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kafe0.jpg"></center>'
 	'And you <<$loverdesc[lover_number]>> went into a small cafe in the center, it seems that it does not enjoy popularity, site visitors almost there, you sat at a table in one of the private booths.'