Merge remote-tracking branch 'Anya/master'

locations/bed2.qsrc

@@ -139,7 +139,18 @@ if $ARGS[0] = '':
 	end
 	gs 'events', 'read'
 
-	if anyaloc['inroom'] = 0 or anyaloc = 1 or anyaloc = 26:
+	if $loc = 'bedrPar':
+		if anyaloc['inroom'] = 0 or anyaloc = 1 or anyaloc = 26:
+			if pornMagazine > 0:gs 'events', 'read_porn'
+			if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and fame['pav_slut'] >= 150) or (pcs_horny > 50 and fame['pav_slut'] >= 50 and pcs_inhib >= 60):
+				act 'Masturbate':
+					InSleep = 0
+					gt 'selfplay', 'start'
+				end
+			end
+		end
+	else
+		if pornMagazine > 0:gs 'events', 'read_porn'
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and fame['pav_slut'] >= 150) or (pcs_horny > 50 and fame['pav_slut'] >= 50 and pcs_inhib >= 60):
 			act 'Masturbate':
 				InSleep = 0

locations/uni_dorm.qsrc

@@ -232,16 +232,17 @@ if $ARGS[0] = 'tenth_floor':
 		act 'Enter the men''s restroom (<<will_cost>> Willpower)':
 			gs 'willpower', 'exhib', 'self'
 			gs 'willpower', 'pay', 'self'
+			minut =+ 1
 			gs 'stat'
 			gt 'uni_dorm', 'mens_restroom'
 		end
 	else
 		act 'Enter the men''s restroom (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Enter the women''s restroom': gt 'uni_dorm', 'womens_restroom'
+	act 'Enter the women''s restroom': minut += 1 & gt 'uni_dorm', 'womens_restroom'
 	act 'Leave':gt 'uni_dorm', 'elevator'
 	act 'Go to the shared shower':
-		minut += 5
+		minut += 1
 		obdysh = 1
 		gt 'vann', 'start'
 	end
@@ -250,15 +251,12 @@ if $ARGS[0] = 'tenth_floor':
 		if courtletter_date <= daystart and courtletter_date ! 0:
 			gt 'sentence', 'letter'
 		end
-		act 'Your room':gt 'uni_dorm', 'dorm_room'
-		act 'Go to the shared kitchen':
-			minut += 5
-			gt 'uni_dorm', 'dorm_kitchen'
-		end
+		act 'Your room': minut += 1 & gt 'uni_dorm', 'dorm_room'
+		act 'Go to the shared kitchen': minut += 1 & gt 'uni_dorm', 'dorm_kitchen'
 	end
 	if (home_owned[11] = 1 or university['student'] = 1) and week = 5 and hour > 18 and hour < 23:
 		'You can hear music blasting in the corridor. It seems the Friday party is in full swing.'
-		act 'The party':gt 'vecher', 'start'
+		act 'The party': minut += 1 & gt 'vecher', 'start'
 	end
 end
 
@@ -274,7 +272,7 @@ if $ARGS[0] = 'mens_restroom':
 	'<center><b><font color="maroon">Dormitory - Men''s Restroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_mens.jpg"></center>'
 	'You peek around the corner. Inside this room, stalls line the right side, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant and stale piss.'
-	act 'Leave': gt 'uni_dorm', 'tenth_floor'
+	act 'Leave': minut += 1 & gt 'uni_dorm', 'tenth_floor'
 	
 	dynamic $tampon
 	dynamic $quickwash
@@ -293,7 +291,7 @@ if $ARGS[0] = 'womens_restroom':
 	'<center><b><font color="maroon">Dormitory - Women''s Restroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_womens.jpg"></center>'
 	'You peek around the corner. Inside this room, stalls line the right side and rows of sinks, with <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant.'
-	act 'Leave': gt 'uni_dorm', 'tenth_floor'
+	act 'Leave': minut += 1 & gt 'uni_dorm', 'tenth_floor'
 	
 	dynamic $tampon
 	dynamic $quickwash
@@ -318,13 +316,26 @@ if $ARGS[0] = 'dorm_room':
 	gs 'stat'
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_room/room.jpg"></center>'
-	'This is your room which you share with another girl named Vika Kirilova.'
-	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	'This is your room, which you share with another girl named Vika Kirilova.'
+	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is at the foot of it.'
+	if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
+	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> lying on your desk.'
+	'To the left of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
-	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
-	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> lying on your bed.'
+
+	if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
+		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
+	elseif tabletki > 0:
+		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers.'
+	elseif prezik + prezikcount + preziksabo > 0:
+		'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
+	end
+
+	*nl
+	'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 	*nl
 	gs 'exercise', 'start'
+
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_sleep = 0
 		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
@@ -344,12 +355,14 @@ if $ARGS[0] = 'dorm_room':
 	act 'Walk out in the corridor':
 		if $clothingworntype ! 'nude':
 			odkomp = 0
-			minut += 5
+			minut += 1
 			gt 'uni_dorm', 'tenth_floor'
 		else
 			'You need to get dressed.'
 		end
 	end
+	
+	act 'Relax on your bed': gt 'bed', 'start'
 
 	if university['semester_week'] > 0:
 		i = 0
@@ -415,38 +428,25 @@ if $args[0] = 'dorm_kitchen':
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_kitchen'
 	menu_off = 0
+	gs 'kit_din'
 	gs 'stat'
-	'<center><b>in the dorm kitchen</b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obkitchen.jpg"></center>'
-	'This is this floors large shared kitchen, it is fairly tidy. There is a lot of cabnits along two walls, two ovens and two refrigerators as well. There is several tables with chairs around them scattered around the room.'
-	act 'Return to the corridor':gt 'uni_dorm', 'tenth_floor'
+	'<center><b>Dorm Kitchen</b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_kitchen.jpg"></center>'
+	'This is the large shared kitchen for this floor. It is fairly tidy, with a lot of cabinets along two of the walls. Two ovens and two refrigerators, as well as several tables with chairs around them, are scattered around the room.'
+	act 'Return to the corridor': minut += 1 & gt 'uni_dorm', 'tenth_floor'
 
 	if eda > 0:
-		'Your shelf in the refrigerator holds <b><<eda>></b> servings of food.'
 		if edahot = 0:
-			act 'Cook food (0:25)':
-				cla
-				*clr
-				menu_off = 1
-				minut += 25
-				edahot += 1
-				eda -= 1
-				pcs_mood -= 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
-				'You prepare a meal.'
-				gs 'uni_dorm', 'food'
-			end
+			$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
+		else
+			$edagot = ''
 		end
+		'Your shelf in the refrigerator holds enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
+	else
+		'<b><font color="red">Your shelf in the refrigerator is bare, there is nothing left for you to eat.</font></b>'
 	end
 
-	if edaD = 0 and eda = 0:'<b><font color = red>Your shelf in the refrigerator is bare, there is nothing left for you to eat.</font></b>'
-
-
-	if edahot > 0:
-		'A cooked meal is on the table.'
-		gs 'uni_dorm', 'food'
-	end
+	if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
 
 	dynamic $edasnack
 	dynamic $sandwich
@@ -460,12 +460,5 @@ if $args[0] = 'dorm_kitchen':
 	dynamic $vitamin
 end
 
-if $args[0] = 'food':
-	act 'Eat cooked food (0:20)':
-		edahot = 0
-		gt 'food', 'm_meal'
-	end
-end
-
 --- uni_dorm ---------------------------------
 

locations/vann.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 
 	if obdysh = 1 and vannin = 0:
-		vanobrand = rand(0, 10)
+		vanobrand = rand(0, 15)
 		vannin = 1
 
 		if vanobrand = 0:gt 'vann', 'v1'
@@ -20,9 +20,9 @@ if $ARGS[0] = 'start':
 	vannin = 1
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
 
-	if obdysh = 1 or palMir = 1 or bordysh = 1:	gs 'din_van', 'private'
+	act 'Leave the room':gt 'vann', 'fin'
 
-	act 'Get out':gt 'vann', 'fin'
+	if obdysh = 1 or palMir = 1 or bordysh = 1:	gs 'din_van', 'private'
 end
 
 if $ARGS[0] = 'fin':