[changed] the alarm clock format and menu order for bedr and bedr2x, plus general tidy up.

[changed] pale lady to a dynamic in bedrPar, din_van (should start adding to bathrooms).
[fixed] space to tab and trim trailing spaces in bedrPar2

locations/bedr.qsrc

@@ -1,18 +1,17 @@
 # bedr
-CLOSE ALL
 
-if home_owned[1] = 0:gt'street'
-$metkaM = ''
-$locM = 'bedr'
-$metka = ''
+CLOSE ALL
+*clr & cla
 $loc = 'bedr'
-$location_type = 'private'
+$metka = ''
+$locM = 'bedr'
+$metkaM = ''
+$menu_loc = 'bedr'
+$menu_arg = ''
+menu_off = 0
 $locclass = 'bedr'
-act 'The corridor':
-	gt 'korr'
-end
+$location_type = 'private'
 
-clr
 minut += 1
 housrA = 1
 housrMir = 1
@@ -26,19 +25,31 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 
 if rembedr = 0:
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr.jpg"></center>'
-	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
+	*nl
+	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a>.'
+	*nl
+	if budilnikOn = 0:
+		'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+	else
+		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+	end
+	*nl
+	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
 else
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
+	*nl
 	'A bright and beautiful room, with a large, kingsized <a href="exec:gt ''bed'', ''start''">double bed</a>.'
+	*nl
+	if budilnikOn = 0:
+		'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+	else
+		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+	end
+	*nl
 	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end
-
-if $clothingworntype = 'nude':
-	$nude = 'Go into the corridor'
-else
-	$nude = 'Get dressed'
-end
+*nl
+act 'The corridor':gt 'korr'
 
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your drunken husband sleeps on the bed, with a butt plug up his ass.'
@@ -203,26 +214,7 @@ if sick >= 1:
 	end
 end
 
-if dur > 0:'You have hidden <<dur>> doses pale lady'
-
-if dur > 0 and narkday ! daystart:
-	act 'Take some coke (0:05)':
-		cla
-		*clr
-		minut += 5
-		narkday = daystart
-		pcs_health = pcs_vital * 10 + pcs_stren * 5
-		pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-		pcs_mood = 100
-		pcs_horny = 100
-		nark += 10
-		dur -= 1
-		'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
-		'You take a small dose of coke and not long after you just start to feel great.'
-
-		act 'Leave':gt $curloc
-	end
-end
+dynamic $palelady
 
 if pcs_horny >= 50:
 	act 'Masturbate':gt 'selfplay', 'start'

locations/bedr2x.qsrc

@@ -1,28 +1,35 @@
 # bedr2x
+
 CLOSE ALL
-act 'In the corridor':
-	gt'korr2x'
-end
-$metkaM = ''
-$locM = 'bedr2x'
-$metka = ''
+*clr & cla
 $loc = 'bedr2x'
-$location_type = 'private'
+$metka = ''
+$locM = 'bedr2x'
+$metkaM = ''
+$menu_loc = 'bedr2x'
+$menu_arg = ''
+menu_off = 0
 $locclass = 'bedr'
-clr
-minut = minut + 1
+$location_type = 'private'
+
+minut + 1
 housrA = 1
 housrMir = 1
-elektro = elektro + 1
-gs'stat'
+elektro + 1
+gs 'stat'
 gs 'themes', 'indoors'
+
 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 *nl
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'A bright and beautiful bedroom, with modern and stylish furniture.'
 *nl
 'The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a>'
-'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table.'
+if budilnikOn = 0:
+	'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+else
+	'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+end
 *nl
 'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl
@@ -35,6 +42,7 @@ if husbandrinkday = daystart:
 	if husbanstrapon = 2:'Your husband is still passed out drunk, after you stuck a dildo in his ass.'
 	if husbanstrapon = 3:'Your husband is still passed out drunk, after you fucked him in the ass with a strap-on.'
 end
+act 'In the corridor':gt'korr2x'
 
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if hour > 22 or hour < 7:
@@ -179,7 +187,7 @@ if sick >= 1:
 	act 'Go to bed rest (disease)':
 		cla
 		*clr
-		minut = minut + 240
+		minut += 240
 		sick = sick - 1
 		if sick < 0:sick = 0
 		gs'stat'
@@ -192,28 +200,8 @@ if sick >= 1:
 	end
 end
 
-if dur > 0:
-	'You have hidden <<dur>> doses of pale lady.'
-end
-if dur > 0 and narkday ! daystart:
-	act 'Take pale lady':
-		cla
-		*clr
-		minut = minut + 5
-		narkday = daystart
-		pcs_health = pcs_vital*10 + pcs_stren*5
-		pcs_willpwr = pcs_intel*5 + pcs_sprt*5
-		pcs_mood = 100
-		pcs_horny = 100
-		nark = nark + 10
-		dur = dur - 1
-
-		'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
-		'You snort a line of the powder and then you feel just fine.'
-
-		act 'Logout':gt $curloc
-	end
-end
+dynamic $palelady
+
 if pcs_horny >= 50:
 	act 'Masturbate':
 		gt'selfplay', 'start'

locations/bedrPar.qsrc

@@ -1,6 +1,7 @@
 # bedrPar
 
 CLOSE ALL
+*clr & cla
 $loc = 'bedrPar'
 $metka = ''
 $location_type = 'private'
@@ -8,7 +9,6 @@ $locclass = 'bedr'
 $menu_loc = 'bedrPar'
 $menu_arg = ''
 menu_off = 0
-*clr & cla
 minut += 1
 gs 'stat'
 gs 'themes', 'indoors'
@@ -173,26 +173,7 @@ else
 		act 'View your new porn cards':card_deck = 1 & gt 'card'
 	end
 
-	if dur > 0:'You have hidden <<dur>> doses of Pale Lady.'
-
-	if dur > 0 and narkday ! daystart:
-		act 'Use some Pale Lady (0:05)':
-			cla
-			*clr
-			minut += 5
-			narkday = daystart
-			pcs_health = pcs_vital * 10 + pcs_stren * 5
-			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-			pcs_mood = 100
-			pcs_horny = 100
-			nark += 10
-			dur -= 1
-			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
-			'You snort some Pale Lady, feeling dizzy for just a moment. After that you feel fantastic, and incredibly horny.'
-
-			act 'Continue':gt $curloc
-		end
-	end
+	dynamic $palelady
 end
 
 gs 'exercise', 'start'

locations/bedrPar2.qsrc

@@ -3,12 +3,12 @@
 if $ARGS[0] = '':
 	CLOSE ALL
 	*clr & cla
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-    $location_type = 'private'
+	$loc = 'bedrPar2'
+	$metka = ''
 	$locclass = 'bedr'
-	$menu_loc = $CURLOC
-	$menu_arg = $ARGS[0]
+	$location_type = 'private'
+	$menu_loc = 'bedrPar2'
+	$menu_arg = ''
 	menu_off = 0
 	minut += 1
 	gs 'stat'
@@ -20,31 +20,25 @@ if $ARGS[0] = '':
 	gs 'family'
 
 	act 'Return to the hallway':gt 'korrPar'
-	
+
 	if indorf = 1 or (indorf = 0 and hour > 6 and hour < 21):
-        if kamasutra_day ! daystart:
-            'You notice a <a href="exec: gt ''bedrPar2'',''kamasutra''">book laying on the bed</a>.'
-        end
-        if prezikday ! daystart:
-            if prezikProver >= 3:
-                prezikday = daystart - 4
-                act 'Steal condoms from your parents'' stash':
-                    *clr & cla
+		if kamasutra_day ! daystart:
+			'You notice a <a href="exec: gt ''bedrPar2'',''kamasutra''">book laying on the bed</a>.'
+		end
+		if prezikday ! daystart:
+			if prezikProver >= 3:
+				prezikday = daystart - 4
+				act 'Steal condoms from your parents'' stash':
+					*clr & cla
 					menu_off = 1
-                    minut+= rand(5,7)
+					minut+= rand(5,7)
 					gs 'stat'
 					if preziktype = 0: prezik += rand(1,3)
 					if preziktype = 1 or preziktype = 2: prezikcount += rand(1,3)
-                    prezikday = daystart
-                    prezikProver = 0
-                    '<center><img <<$set_imgh>> src="images/shared/accessories/birthcontrol/condoms_steal.jpg"></center>'
-                    'After you make sure you''re not seen, you quickly search your parents'' room for their condom stash and take a few. Now you have '+iif(preziktype = 0, '<<prezik>>', '<<prezikcount>>')+' undamaged condoms.'
-                    act 'Continue': gt $loc, $metka
-                end
-            else
-                'You have already taken some condoms out of your parents'' stash recently. You should wait a while, otherwise they might get suspicious.'
-            end
-        end
+					prezikday = daystart
+					prezikProver = 0
+					'<center><img <<$set_imgh>> src="images/shared/accessories/birthcontrol/condoms_steal.jpg"></center>'
+					'After you make sure you''re not seen, you quickly search your parents'' room for their condom stash and take a few. Now you have '+iif(preziktype = 0, '<<prezik>>', '<<prezikcount>>')+' condoms.'
 	end
 
 	if hour = 21 and parsexrand = 5 and parentsexday ! daystart:gt 'seeparentsex'
@@ -58,7 +52,7 @@ if $ARGS[0] = 'kamasutra':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/book.jpg"></center>'
 	'The cover says "Kamasutra"'
 	act 'Leave': gt $loc, $metka
-	act 'Read': kamasutra_page = 0 & kamasutra_day = daystart & gt 'bedrPar2', 'read_book'	
+	act 'Read': kamasutra_page = 0 & kamasutra_day = daystart & gt 'bedrPar2', 'read_book'
 end
 
 ! read book
@@ -85,7 +79,7 @@ end
 if $ARGS[0] = 'wardrobe_search':
 	*clr & cla
 	if (hour >= 21 or hour < 6) and indorf = 0:
-		'What are you thinking? You can''t go through the wardrobe while your parents are sleeping right there!' 
+		'What are you thinking? You can''t go through the wardrobe while your parents are sleeping right there!'
 		act 'Leave ': gt $loc, $metka
 		exit
 	end
@@ -96,7 +90,7 @@ if $ARGS[0] = 'wardrobe_search':
 		$failwords[2]='You dig through your mother''s closet, but find nothing interesting except underwear.'
 		*pl $failwords[rand(0,2)]
 		killvar '$failwords'
-	else 
+	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/wardrobetoy.jpg"></center>'
 		$findmomtoy[0]='Digging through the closet you find a <a href="exec: gt ''bedrPar2'',''momtoy_play''">Dildo</a>'
 		$findmomtoy[1]='Rummaging through your mother''s lingerie you find a small <a href="exec: gt ''bedrPar2'',''momtoy_play''">Dildo</a>'
@@ -113,10 +107,10 @@ if $ARGS[0] = 'momtoy_play':
 	dildohand = 10
 	selfmomtoyplay = 1
 	'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'
-	if pcs_horny < 70: 
+	if pcs_horny < 70:
 		act 'Put it back': gt $loc, $metka
 	else
-		act 'Play with it': gt 'selfplay', 'start'	
+		act 'Play with it': gt 'selfplay', 'start'
 	end
 end
 

locations/din_van.qsrc

@@ -29,9 +29,9 @@ $showerdin = {
 }
 
 $bteeth = {
-	menu_off = 1
 	if pcs_breath ! 1:
 		act 'Brush your teeth (0:05)':
+		menu_off = 1
 			cla
 			*clr
 			minut += 5
@@ -47,15 +47,15 @@ $bteeth = {
 }
 
 $dryOff = {
-	menu_off = 1
 	act 'Get out and dry off':
+		menu_off = 1
 		mirror_steam = hour & menu_off = 0 & gt $loc, $metka
 	end
 }
 
 $shower = {
-	menu_off = 1
 	act 'Take a shower (0:15)':
+		menu_off = 1
 		cla
 		*clr
 		shampoo -= 1
@@ -107,6 +107,7 @@ $shower = {
 
 		if pcs_horny >= 40:
 			act 'Use the shower head on your pussy':
+				menu_off = 1
 				cla
 				*clr
 				if rand(0, 5) = 0 and obdysh = 1:gt 'vann', 'v4'
@@ -186,6 +187,7 @@ $bath = {
 		end
 
 		act '"Wash" your pussy':
+			menu_off = 1
 			cla
 			*clr
 			if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
@@ -211,11 +213,11 @@ $bath = {
 }
 
 $brit = {
-	menu_off = 1
 	if shave_menu = 1  and stanok > 1:
 		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (pubestyle >= 2 and pubestyle <=7 and pcs_pubes > 11) or (pubestyle = 8 and pcs_pubes > 11) or (pubestyle = 9 and pcs_pubes > 20) or (pubestyle = 10 and pcs_pubes > 26):
 			if pubestyle > 0:
 				act 'Shave yourself (0:15)':
+					menu_off = 1
 					*clr & cla
 					minut += 15
 					pcs_leghair = 0
@@ -264,6 +266,7 @@ $brit = {
 		if pcs_pubes > 3:
 			if pubestyle = 1:
 				act 'Shave your pussy (0:10)':
+					menu_off = 1
 					*clr & cla
 					minut += 10
 					pcs_pubes = 0
@@ -277,6 +280,7 @@ $brit = {
 				end
 			elseif (pubestyle >= 2 and pubestyle <= 7) and pcs_pubes > 15:
 				act 'Trim your pussy (0:10)':
+					menu_off = 1
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
 					*nl
@@ -294,6 +298,7 @@ $brit = {
 				end
 			elseif pubestyle = 8 and pcs_pubes > 19:
 				act 'Trim your pubic hair (0:10)':
+					menu_off = 1
 					*clr & cla
 					minut += 10
 					pcs_pubes = 19
@@ -307,6 +312,7 @@ $brit = {
 				end
 			elseif pubestyle = 9 and pcs_pubes >= 25:
 				act 'Trim your bush (0:10)':
+					menu_off = 1
 					*clr & cla
 					minut += 10
 					pcs_pubes = 21
@@ -320,6 +326,7 @@ $brit = {
 				end
 			elseif pubestyle = 10 and pcs_pubes >= 30:
 				act 'Trim back your bush (0:10)':
+					menu_off = 1
 					*clr & cla
 					minut += 10
 					pcs_pubes = 26
@@ -336,6 +343,7 @@ $brit = {
 	elseif shave_menu = 3 and stanok > 0:
 		if pcs_leghair > 3:
 			act 'Shave your legs (0:05)':
+				menu_off = 1
 				*clr & cla
 				minut += 5
 				pcs_leghair = 0
@@ -360,9 +368,9 @@ $brit = {
 }
 
 $tampon = {
-	menu_off = 1
 	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
 		act 'Use a sanitary pad (0:05)':
+			menu_off = 1
 			cla
 			*clr
 			sanpad -= 1
@@ -377,6 +385,7 @@ $tampon = {
 	end
 	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
 		act 'Use a tampon (0:05)':
+			menu_off = 1
 			cla
 			*clr
 			tampon -= 1
@@ -392,9 +401,9 @@ $tampon = {
 }
 
 $quickwash = {
-	menu_off = 1
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
+			menu_off = 1
 			cla
 			*clr
 
@@ -465,9 +474,9 @@ $removepan = {
 }
 
 $basin = {
-	menu_off = 1
 	if cumloc[11] = 1 or cumloc[12] = 1:
 		act 'Clean the sperm from your face (0:10)':
+			menu_off = 1
 			cla
 			*clr
 			pcs_makeup = 1
@@ -487,6 +496,7 @@ $basin = {
 
 	if body_write > 0 or face_write > 0:
 		act 'Wash the writings off your body (0:10)':
+			menu_off = 1
 			cla
 			*clr
 			body_write = 0
@@ -504,6 +514,7 @@ $basin = {
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Wipe the cum off your clothes (0:10)':
+			menu_off = 1
 			cla
 			*clr
 			cumspclnt = 6
@@ -519,6 +530,7 @@ $basin = {
 
 	if pcs_makeup ! 1:
 		act 'Wash off cosmetics (0:10)':
+			menu_off = 1
 			cla
 			pcs_makeup = 1
 			cumspclnt = 9
@@ -535,6 +547,7 @@ $basin = {
 
 	if false_lashes >= 1:
 		act 'Remove false lashes (0:05)':
+			menu_off = 1
 			cla
 			'You carefully peel off the glued-on strip, careful to protect your natural lashes.'
 			lashsavechance = rand(0,4)
@@ -711,9 +724,9 @@ $pirManage = {
 }
 
 $enema = {
-	menu_off = 1
 	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
 		act 'Give yourself an enema (0:05)':
+			menu_off = 1
 			cla
 			*clr
 			cumspclnt = 7
@@ -732,9 +745,9 @@ $enema = {
 }
 
 $toymanage = {
-	menu_off = 1
 	if analplug = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
+			menu_off = 1
 			cla
 			*clr
 			minut += 5
@@ -750,6 +763,7 @@ $toymanage = {
 		end
 	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
 		act 'Insert your butt plug (0:05)':
+			menu_off = 1
 			cla
 			*clr
 			minut += 5
@@ -770,6 +784,7 @@ $toymanage = {
 
 	if vibrator = 1 and vibratorIN = 1:
 		act 'Remove the vibrator (0:05)':
+			menu_off = 1
 			cla
 			*clr
 			minut += 5
@@ -785,6 +800,7 @@ $toymanage = {
 		end
 	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
 		act 'Insert the vibrator in your vagina (0:05)':
+			menu_off = 1
 			cla
 			*clr
 			minut += 5
@@ -796,7 +812,31 @@ $toymanage = {
 			*nl
 			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
 
-			act 'Finish':menu_off = 0 & gt $loc, $metka
+			act 'Finish':gt $loc, $metka
+		end
+	end
+}
+
+$palelady = {
+	if dur > 0:'You have <<dur>> doses of Pale Lady.'
+
+	if dur > 0 and narkday ! daystart:
+		act 'Use some Pale Lady (0:05)':
+			menu_off = 1
+			cla
+			*clr
+			minut += 5
+			narkday = daystart
+			pcs_health = pcs_vital * 10 + pcs_stren * 5
+			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
+			pcs_mood = 100
+			pcs_horny = 100
+			nark += 10
+			dur -= 1
+			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
+			'You snort some Pale Lady, feeling dizzy for just a moment. After that you feel fantastic, and incredibly horny.'
+
+			act 'Continue': menu_off = 0 & gt $loc, $metka
 		end
 	end
 }