Procházet zdrojové kódy

Repairing the Timeline in the Meynold home

Derryth_Love před 1 rokem
rodič
revize
f734adca8e
1 změnil soubory, kde provedl 18 přidání a 25 odebrání
  1. 18 25
      locations/mey_home.qsrc

+ 18 - 25
locations/mey_home.qsrc

@@ -35,7 +35,7 @@ if $args[0] = 'door':
 			'You walk up to the Meynolds residence and ring the doorbell...'
 			'After a short wait, you hear the lock click and you see Katja''s mother Tamara and sister Vicky standing by the door: <br><do>Oh hi, <<$pcs_nickname>>, welcome! Come in, make yourself at home.</do>'
 
-			act 'Enter': gt 'mey_home', 'start'
+			act 'Enter': minut += 1 & gt 'mey_home', 'start'
 		end
 	elseif locat['katja'] = 7:
 		cla
@@ -120,14 +120,14 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	act 'Kitchen': gt 'mey_home', '1'
-	act 'Bathroom': gt 'mey_home', '2'
-	act 'Guest room': gt 'mey_home', '3'
-	act 'Lounge': gt 'mey_home', '4'
-	act 'Katja''s room': gt 'mey_home', '5'
-	act 'Vicky''s room': gt 'mey_home', '6'
-	act 'Tamara Meynold''s room': gt 'mey_home', '7'
-	act 'Garden': gt 'mey_home', '8'
+	act 'Kitchen': minut += 1 & gt 'mey_home', '1'
+	act 'Bathroom': minut += 1 & gt 'mey_home', '2'
+	act 'Guest room': minut += 1 & gt 'mey_home', '3'
+	act 'Lounge': minut += 1 & gt 'mey_home', '4'
+	act 'Katja''s room': minut += 1 & gt 'mey_home', '5'
+	act 'Vicky''s room': minut += 1 & gt 'mey_home', '6'
+	act 'Tamara Meynold''s room': minut += 1 & gt 'mey_home', '7'
+	act 'Garden': minut += 1 & gt 'mey_home', '8'
 	if func('homes_properties', 'is_current_home') = 0 and func('homes_properties', 'can_live_here'):
 		act 'Set this household as your main home':gs 'homes_properties', 'set_home' & gt 'mey_home', 'start'
 	end
@@ -151,7 +151,7 @@ if $ARGS[0] = '1':
 	*nl
 	'The kitchen is huge and luxurious. It is decorated in a minimalist high-tech style. An oval dining room table standing in the middle of the room. The appliances are all hidden. The kitchen is sparkling clean.'
 
-	act 'Return to hallway': gt 'mey_home', 'start'
+	act 'Return to hallway': minut += 1 & gt 'mey_home', 'start'
 
 	if mey_vika['mey_vika_qw'] >= 32 and ((week < 6 and hour >= 14 and hour < 20) or (week = 6 and hour >= 10 and hour < 20)) and mey_tamara['help_day'] ! daystart:
 		act 'Cook for the whole family':
@@ -194,7 +194,6 @@ if $ARGS[0] = '2':
 	$menu_loc = 'mey_home'
 	$menu_arg = '2'
 	menu_off = 0
-	minut += 1
 	cls
 	gs'stat'
 	$location_type = 'bathroom'
@@ -204,7 +203,7 @@ if $ARGS[0] = '2':
 	'A luxurious bathroom looking like the five-star hotel bathrooms you read about in the magazines.'
 	'Above the beautiful vanity and sink there is a huge <a href="exec:gt ''mirror'',''start''">mirror</a>.'
 	!acts copy from [shulgabath]
-	act 'Return to the hallway': gt 'mey_home', 'start'
+	act 'Return to the hallway': minut += 1 & gt 'mey_home', 'start'
 	gs 'din_van', 'private'
 end
 
@@ -218,7 +217,6 @@ if $ARGS[0] = '3':
 	$menu_loc = 'mey_home'
 	$menu_arg = '3'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Guest room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
@@ -238,7 +236,7 @@ if $ARGS[0] = '3':
 		'Your <a href="exec:gt ''Komp'',''start''">computer</a> is on the desk.'
 	end
 
-	act 'Return to the hallway':
+	act 'Return to the hallway': minut += 1
 		if ($clothingworntype = 'nude' or PCloswimwear = 1):
 			*clr
 			'<center><img <<$set_imgh>> src="'+'images/pc/clothing/'+iif($pantyworntype = 'none','0','tanga')+'.jpg'+'"></center>'
@@ -288,15 +286,14 @@ if $ARGS[0] = '4':
 	$menu_loc = 'mey_home'
 	$menu_arg = '4'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Lounge</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/hall.jpg"></center>'
 	*nl
 	'Spacious room with a sofa and armchairs, on the wall hangs a large plasma TV, located next to the bookcase, and on the opposite side is the fireplace, from the hall there is access to a bright garden, overgrown with grapes'
 
-	act 'Return to hallway': gt 'mey_home', 'start'
-	act 'Garden': gt 'mey_home', '8'
+	act 'Return to hallway': gt minut += 1 & 'mey_home', 'start'
+	act 'Garden': minut += 1 & gt 'mey_home', '8'
 end
 
 if $ARGS[0] = '5':
@@ -306,7 +303,6 @@ if $ARGS[0] = '5':
 	$menu_loc = 'mey_home'
 	$menu_arg = '5'
 	menu_off = 0
-	minut += 1
 	$locclass = 'livingr'
 	gs 'katja_meynold_schedule'
 	gs 'stat'
@@ -325,7 +321,7 @@ if $ARGS[0] = '5':
 	else
 		'Katja is not in her room'
 	end
-	act 'Return to the hallway': gt 'mey_home', 'start'
+	act 'Return to the hallway': minut += 1 & gt 'mey_home', 'start'
 end
 
 if $ARGS[0] = '6':
@@ -335,7 +331,6 @@ if $ARGS[0] = '6':
 	$menu_loc = 'mey_home'
 	$menu_arg = '6'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Vicky''s room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_room.jpg"></center>'
@@ -343,7 +338,7 @@ if $ARGS[0] = '6':
 	'Vicky''s room is always in a mess. It''s clean, but everything is scattered all over the place. There are soft toys laying around in enormous quantities, and all the walls are plastered with posters of pop stars and film actors.'
 	'There''s a laptop on the table by the window, it accidentally brings a sense of orderliness. The stacks of magazines resemble music speakers. The rooms centerpiece is the ginormous bed, next to it is a wardrobe. There''s a lone chair somewhere in the corner hidden under all the stuff.'
 
-	act 'Return to hallway': gt 'mey_home', 'start'
+	act 'Return to hallway': minut += 1 & gt 'mey_home', 'start'
 end
 
 if $ARGS[0] = '7':
@@ -353,14 +348,13 @@ if $ARGS[0] = '7':
 	$menu_loc = 'mey_home'
 	$menu_arg = '7'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Tamara''s room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tamara_room.jpg"></center>'
 	*nl
 	'You would say Tamara Meynold''s room resembles an office, if it was not for the bed in the corner. There''s a computer on a desk, a wardrobe, and a big but a pretty modest bed. The room is quite small and cramped. There are no decorations but one, a sword hanging on the wall. It''s unclear what it''s doing there.'
 
-	act 'Return to hallway': gt 'mey_home', 'start'
+	act 'Return to hallway': minut += 1 & gt 'mey_home', 'start'
 end
 
 ! courtyard
@@ -371,7 +365,6 @@ if $ARGS[0] = '8':
 	$menu_loc = 'mey_home'
 	$menu_arg = '8'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Garden</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/courtyard.jpg"></center>'
@@ -381,7 +374,7 @@ if $ARGS[0] = '8':
 	if hour = 7 and minut >= 30 and week < 6:
 		'<a href="exec:gs''mey_tamara_events'',''tamara''">Aunt Tamara</a> is here talking on her phone.'
 	end
-	act 'Return to hallway': gt 'mey_home', 'start'
+	act 'Return to hallway': minut += 1 & gt 'mey_home', 'start'
 end
 
 if $ARGS[0] = 'mey_morning_vomit':