Browse Source

reorganize the bedroom code

rachels 3 years ago
parent
commit
92a4901deb
2 changed files with 368 additions and 359 deletions
  1. 367 358
      locations/bedrPar.qsrc
  2. 1 1
      locations/zoomagazine.qsrc

+ 367 - 358
locations/bedrPar.qsrc

@@ -2,6 +2,7 @@
 
 CLOSE ALL
 *clr & cla
+fromoutside = iif($loc = 'bedrPar',0,1)
 $loc = 'bedrPar'
 $loc_arg = ''
 $location_type = 'private'
@@ -14,420 +15,428 @@ gs 'stat'
 gs 'themes', 'indoors'
 gs 'family_schedule'
 
-if momloc = 26:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
-	if prezik > 0 and rand(1,3) = 1:
-		gt 'mother', 'condom_find'
-	elseif dildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
-		gt 'mother', 'dildo_find'
-	elseif analplug = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
-		gt 'mother', 'plug_find'
-	else
-		'As you walk into your bedroom you find your <<$npc_nickname[''A29'']>> cleaning the room. Sweeping, folding clothes and putting them away, dusting, making the beds and just generally cleaning everything.'
-		act 'Leave': gt $loc, $loc_arg
-	end
-end
-
-if ParrotQW['Level'] = 2:
-	*clr & cla
-	menu_off = 1
-	'As soon as you enter the room you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial in to his water bowl.'
-	'You really hope this will work and keep him from spilling yours and your sister''s bedroom secrets.'
-	ParrotQW['Level'] = 3
-	ParrotQW['Day'] = 3
-	act 'Continue':gt $loc, $loc_arg
-	exit
-end
-if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
-	*clr & cla
-	menu_off = 1
-	'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
-	'Your sister must have released him since you were not able to find a solution in time.'
-	ParrotQW['Owned2'] = 0
-	ParrotQW['Level'] = 0
-	ParrotQW['Day'] = 2
-	ParrotQW['Failed'] = 0
-	act 'Continue':gt $loc, $loc_arg
-	exit
-end
-
-if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:gt 'tobiQW', 'start'
-
-if anyaloc = 11: gt 'sisterQW', 'sisboyQW_expel'
-
-if sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
-	*clr & cla
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage.'
-	'"I went to the shopping center and bought this bird. Isn''t he the cutest?"'
-	if npc_rel['A33'] > 50:
-		'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care."'
-		ParrotQW['SisKeepParrot'] = 1
-	end
-	if npc_rel['A33']  <= 50:
-		'"No he isn''t cute, and I suggest you get it out of here. I am not sharing my room with a bird!"'
-		'You are somewhat upset, but you understand. You should have asked her before buying it.'
-		'You go to the window, open it and release the bird.'
+if $ARGS[0] = '':
+	if momloc = 26 and fromoutside:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
+		if prezik > 0 and rand(1,3) = 1:
+			gt 'mother', 'condom_find'
+		elseif dildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
+			gt 'mother', 'dildo_find'
+		elseif analplug = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
+			gt 'mother', 'plug_find'
+		else
+			'As you walk into your bedroom you find your <<$npc_nickname[''A29'']>> cleaning the room. Sweeping, folding clothes and putting them away, dusting, making the beds and just generally cleaning everything.'
+			act 'Leave': gt 'korrPar'
+		end
+	elseif ParrotQW['Level'] = 2:
+		*clr & cla
+		menu_off = 1
+		'As soon as you enter the room you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial in to his water bowl.'
+		'You really hope this will work and keep him from spilling yours and your sister''s bedroom secrets.'
+		ParrotQW['Level'] = 3
+		ParrotQW['Day'] = 3
+		
+		act 'Continue':gt $loc, $loc_arg
+	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
+		*clr & cla
+		menu_off = 1
+		'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
+		'Your sister must have released him since you were not able to find a solution in time.'
 		ParrotQW['Owned2'] = 0
-	end
-
-	act 'Leave':gt $loc, $loc_arg
-	exit
-end
-
-'<center><h1><font color="maroon">Your bedroom</font></h1></center>'
-! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
-*nl
-'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
-*nl
-'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
-*nl
-'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
-*nl
-if ParrotQW['Owned2'] = 1:
-	'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
-	if daystart - ParrotQW['BuyDate'] <= 10: '<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
-	if daystart - ParrotQW['BuyDate'] > 10 and daystart - ParrotQW['BuyDate'] <= 20: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. It sounds almost like he is saying "<b>Hello <<$pcs_nickname>>!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 20 and daystart - ParrotQW['BuyDate'] <= 30: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is clearly saying "<b>Hello <<$pcs_nickname>>!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 30 and daystart - ParrotQW['BuyDate'] <= 35: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 35 and daystart - ParrotQW['BuyDate'] <= 40: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 40 and daystart - ParrotQW['BuyDate'] <= 50: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>>, you''re the best!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 50 and daystart - ParrotQW['BuyDate'] <= 55: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, swallow it all!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Level'] < 3: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, your pussy tastes great!</b>"'
-	if ParrotQW['Level'] = 3:
-		parfixrand = rand(0,9)
-		if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you say to me?</b>"'
-		if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>3.1415926535897932384...</b>"'
-		if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Come closer, my friend.</b>"'
-		if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
-		if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
-		if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
-		if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He’s just a friend, honest!</b>"'
-		if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
-		if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
-		if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'
-		killvar 'parfixrand'
-	end
-
-	*nl
-end
-'<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>.')
-
-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
-
-if sewing_kit = 1:
-	'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored neatly under your bed.'
-	*nl
-	'You have <<tkan>> pieces of sewing fabric left.'
-end
-
-if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
-
-gad = 0
-
-if npc_QW['A33'] > 10:npc_QW['A33'] = 10
-!!Default is Anya not being here or being asleep, can be overwritten in next block
-sisterHere = 0
-
-if sister_indorf = 0:
-	if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
+		ParrotQW['Level'] = 0
+		ParrotQW['Day'] = 2
+		ParrotQW['Failed'] = 0
+		gs 'stat'
+		
+		act 'Continue':gt $loc, $loc_arg
+	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:
+		gt 'tobiQW', 'start'
+		
+	elseif anyaloc = 11: 
+		gt 'sisterQW', 'sisboyQW_expel'
+		
+	elseif sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 		*clr & cla
 		menu_off = 1
-		minut += 5
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
+		'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage.'
+		'"I went to the shopping center and bought this bird. Isn''t he the cutest?"'
+		if npc_rel['A33'] > 50:
+			'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care."'
+			ParrotQW['SisKeepParrot'] = 1
+		end
+		if npc_rel['A33']  <= 50:
+			'"No he isn''t cute, and I suggest you get it out of here. I am not sharing my room with a bird!"'
+			'You are somewhat upset, but you understand. You should have asked her before buying it.'
+			'You go to the window, open it and release the bird.'
+			ParrotQW['Owned2'] = 0
+		end
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_6_<<rand(1,7)>>.jpg"></center>'
-		'Drunk and disheveled, Anya bursts into the room.'
-		'You notice that her hair, and all her clothes are smeared in sticky sperm.'
-		'In this state, she falls on the bed and instantly falls asleep.'
-		sisboyparty = 1
-		act 'Move away': gt $loc
+
+		act 'Leave': gt 'korrPar'
 	else
-		sisterdialog = 1
-
-		if anyaloc = 1:
-			'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
-		elseif anyaloc = 4:
-			sisterdialog = 3
-			sisterHere = 1
-			'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
-		elseif anyaloc = 15:
-			sisterHere = 1
-			'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
-		elseif anyaloc = 26:
-			if sisboypartyQW = 1: sisboypartyQW = 2
-			if sisboyparty = -1: sisboyparty = 1
-			'A drunken Anya is sound asleep in her bed.'
+		'<center><h1><font color="maroon">Your bedroom</font></h1></center>'
+		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
+		*nl
+		'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
+		*nl
+		'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
+		*nl
+		'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+		*nl
+		if ParrotQW['Owned2'] = 1:
+			'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
+			if daystart - ParrotQW['BuyDate'] <= 10: 
+				'<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
+			elseif daystart - ParrotQW['BuyDate'] <= 20: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. It sounds almost like he is saying "<b>Hello <<$pcs_nickname>>!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 30: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is clearly saying "<b>Hello <<$pcs_nickname>>!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 35: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 40: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 50: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>>, you''re the best!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 55: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, swallow it all!</b>"'
+			else
+				if ParrotQW['Level'] < 3: 
+					'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, your pussy tastes great!</b>"'
+				else
+					parfixrand = rand(0,9)
+					if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you say to me?</b>"'
+					if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>3.1415926535897932384...</b>"'
+					if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Come closer, my friend.</b>"'
+					if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
+					if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
+					if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
+					if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He’s just a friend, honest!</b>"'
+					if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
+					if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
+					if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'
+					killvar 'parfixrand'
+				end
+			end
+			*nl
+		end
+		
+		'<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>.')
+
+		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
-	end
-end
-
-act 'Exit the room':
-	if (anyaloc = 4 or anyaloc = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
-	gt'korrPar'
-end
 
-gs 'unicoursework', 'start', $curloc
 
-if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
-!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
-sis_watch = 0
+		if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
 
-if sisterHere = 0 or sisboytrio > 0:
-	if pornMagazine > 0:gs 'events', 'read_porn'
-	if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
-		act 'Send Rex a text message': gt 'reks','sms'
-	end
-	if pcs_horny >= 50:
-		act 'Masturbate':gt 'selfplay', 'start'
-	end
-
-	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
-end
+		if npc_QW['A33'] > 10:npc_QW['A33'] = 10
+		!!Default is Anya not being here or being asleep, can be overwritten in next block
+		sisterHere = 0
 
-gs 'events', 'read'
+		if sister_indorf = 0:
+			if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_6_<<rand(1,7)>>.jpg"></center>'
+				'Drunk and disheveled, Anya bursts into the room.'
+				'You notice that her hair, and all her clothes are smeared in sticky sperm.'
+				'In this state, she falls on the bed and instantly falls asleep.'
+				sisboyparty = 1
+				act 'Move away': gt $loc
+			else
+				sisterdialog = 1
+
+				if anyaloc = 1:
+					'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
+				elseif anyaloc = 4:
+					sisterdialog = 3
+					sisterHere = 1
+					'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
+				elseif anyaloc = 15:
+					sisterHere = 1
+					'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
+				elseif anyaloc = 26:
+					if sisboypartyQW = 1: sisboypartyQW = 2
+					if sisboyparty = -1: sisboyparty = 1
+					'A drunken Anya is sound asleep in her bed.'
+				end
+			end
+		end
 
-if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
+		act 'Exit the room':
+			if (anyaloc = 4 or anyaloc = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
+			gt 'korrPar'
+		end
 
-if sisterHere = 0: dynamic $palelady
+		gs 'unicoursework', 'start', $curloc
 
-gs 'exercise', 'start'
+		if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
+		!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
+		sis_watch = 0
 
-if gobelen>0:'You have <<gobelen>> completed tapestries.'
-if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
-if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
-if pcs_sewng >= 80:
-	if newgobelen = 0 and tkan > 0:
-		act'Start a new tapestry':
-			*clr & cla
-			menu_off = 1
-			tkan -= 1
-			newgobelen = 1
-			minut += 15
-			gs'stat'
-			'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-			act'Set the tapestry aside':gt $curloc
-		end
-	end
-	if newgobelen>=1:
-		'Your tapestry is <<newgobelen/10>> percent finished.'
-		act'Work on the tapestry for an hour':
-			*clr & cla
-			menu_off = 1
-			minut+=60
-			sewng_exp += rand(pcs_intel/10, pcs_intel/5)
-			gobramax = (pcs_sewng - 70) * 6
-			gobramin = (pcs_sewng - 70) * 2
-			newgobelen += rand(gobramin,gobramax)
-			gs'stat'
-			if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-				if newgobelen >= 1000:
-				newgobelen = 0
-				gobelen += 1
-				'Your work on the tapestry is done.'
+		if sisterHere = 0 or sisboytrio > 0:
+			if pornMagazine > 0:gs 'events', 'read_porn'
+			if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
+				act 'Send Rex a text message': gt 'reks','sms'
+			end
+			if pcs_horny >= 50:
+				act 'Masturbate':gt 'selfplay', 'start'
 			end
-			act'Set the tapestry aside':gt $curloc
+
+			if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+			if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 		end
-	end
-end
 
-if ml_guitar['carried'] = 1:
-	act 'Place the guitar next to your desk': 
-		ml_guitar['carried'] = 0
-		$ml_guitar['location'] = $curloc
-		gt 'bedrPar', 'start'
-	end
-elseif ml_guitar['hasguitar'] and ml_guitar['carried'] = 0:
-	act 'Pick up the guitar':
-		ml_guitar['carried'] = 1
-		$ml_guitar['location'] = ''
-		gt 'bedrPar', 'start'
-	end
-end
+		gs 'events', 'read'
 
-			
-if ml_online['account'] = 0 and internet > 0: 
-	act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
-end
+		if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
-!!Uploading recorded music if there are any not uploaded yet
-if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
-	if pcs_inhib < 30:
-		if pcs_inhib < 10: 
-			$diff = 'hard'
-		elseif pcs_inhib < 20: 
-			$diff = 'medium'
-		else 
-			$diff = 'easy'
-		end
-		gs 'willpower', 'skill', 'self', $diff
+		if sisterHere = 0: dynamic $palelady
 
-		will_cost = (will_cost * 2) - (pcs_perform)
-		if will_cost <= pcs_willpwr:
-			act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
-		else	
-			act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		gs 'exercise', 'start'
+
+		if sewing_kit = 1:
+			'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored neatly under your bed.'
+			*nl
+			if tkan <= 0:
+				'You do not have any fabric.'
+			else
+				if pcs_sewng < 40:
+					'You have <<tkan>> pieces of sewing fabric left.'
+				elseif pcs_sewng < 80:
+					'You have enough fabric for <<tkan>> lessons.'
+				else
+					if newgobelen = 0:
+						act'Start a new tapestry':
+							*clr & cla
+							menu_off = 1
+							tkan -= 1
+							newgobelen = 1
+							minut += 15
+							gs'stat'
+							'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
+
+							act'Set the tapestry aside':gt $curloc
+						end
+					end
+				end
+			end	
+			if newgobelen>=1:
+				'Your tapestry is <<newgobelen/10>> percent finished.'
+				act'Work on the tapestry for an hour':
+					*clr & cla
+					menu_off = 1
+					minut+=60
+					sewng_exp += rand(pcs_intel/10, pcs_intel/5)
+					gobramax = (pcs_sewng - 70) * 6
+					gobramin = (pcs_sewng - 70) * 2
+					newgobelen += rand(gobramin,gobramax)
+					gs'stat'
+					if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
+						if newgobelen >= 1000:
+						newgobelen = 0
+						gobelen += 1
+						'Your work on the tapestry is done.'
+					end
+					act'Set the tapestry aside':gt $curloc
+				end
+			end
+			if gobelen > 0: 'You have <<gobelen>> completed tapestries.'
 		end
-	end
-	act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
-end
 
-if ml_uploadablemusic > 0:
-	act 'Delete old recordings': gt 'music_onlinemusic', 'deleteoldmusic'
-end
+		if ml_guitar['carried'] = 1:
+			act 'Place the guitar next to your desk':
+				ml_guitar['carried'] = 0
+				$ml_guitar['location'] = $curloc
+				gt $loc, $loc_arg
+			end
+		elseif $ml_guitar['location'] = $curloc:
+			act 'Pick up the guitar':
+				ml_guitar['carried'] = 1
+				$ml_guitar['location'] = ''
+				gt $loc, $loc_arg
+			end
+		end
 
-if hour > 8 and hour < 22:
 
-	if ml_guitar['hasguitar'] = 1:
-		act 'Play something on the guitar (10 minutes)':
-			pcs_mood += 10
-			minut += 10
-			gs 'stat'
-			'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
-			'You hum along the tune, relaxing into the music, just enjoying it. When you look up about 10 minutes has passed and you are in a much better mood.'
+		if ml_online['account'] = 0 and internet > 0:
+			act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
 		end
-	end
 
-	if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
-		if sisterHere = 1 and pcs_inhib < 30:
-			if pcs_inhib < 10: 
-				$diff = 'hard'
-			elseif pcs_inhib < 20: 
-				$diff = 'medium'
-			else 
-				$diff = 'easy'
-			end
-			gs 'willpower', 'skill', 'self', $diff
-			will_cost = (will_cost * 3) - (pcs_perform)
-			if will_cost <= pcs_willpwr:
-				act 'Practice guitar (0:30) (<<will_cost>> Willpower)': 
-					inhib_exp += rand(1,2)
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					gt 'music_bedroomPractice', 'guitar'
+		!!Uploading recorded music if there are any not uploaded yet
+		if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
+			if pcs_inhib < 30:
+				if pcs_inhib < 10:
+					$diff = 'hard'
+				elseif pcs_inhib < 20:
+					$diff = 'medium'
+				else
+					$diff = 'easy'
+				end
+				gs 'willpower', 'skill', 'self', $diff
+
+				will_cost = (will_cost * 2) - (pcs_perform)
+				if will_cost <= pcs_willpwr:
+					act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
+				else
+					act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-			else
-				act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
 			end
-		else
-			act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
+			act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
 		end
-	end
 
-	!! Streaming music 
-	if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
-		ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
-
-		if pcs_inhib < 30:
-			if pcs_inhib < 10: 
-				$diff = 'hard'
-			elseif pcs_inhib < 20: 
-				$diff = 'medium'
-			else 
-				$diff = 'easy'
-			end
-			gs 'willpower', 'skill', 'self', $diff
-			will_cost = (will_cost * 3) - (pcs_perform)
-	
-			if will_cost <= pcs_willpwr:
-				act 'Live stream (<<ml_streamtime>> minutes) (<<will_cost>> Willpower)': 
-					inhib_exp += rand(1,3)	
-					gs 'willpower', 'pay', 'self'
+		if ml_uploadablemusic > 0:
+			act 'Delete old recordings': gt 'music_onlinemusic', 'deleteoldmusic'
+		end
+
+		if hour > 8 and hour < 22:
+
+			if ml_guitar['hasguitar'] = 1:
+				act 'Play something on the guitar (10 minutes)':
+					pcs_mood += 10
+					minut += 10
 					gs 'stat'
-					gt 'music_onlinemusic', 'liveStream'
+					'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
+					'You hum along the tune, relaxing into the music, just enjoying it. When you look up about 10 minutes has passed and you are in a much better mood.'
 				end
-			else	
-				act 'Live stream (<<ml_streamtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else 
-			act 'Live stream (<<ml_streamtime>> minutes)': gt 'music_onlinemusic', 'liveStream'			
-		end
-	end
 
-	!! Recording music
-	if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
-		if pcs_inhib < 20:
-			if pcs_inhib < 10: 
-				$diff = 'medium'
-			elseif pcs_inhib < 20: 
-				$diff = 'easy'
+			if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+				if sisterHere = 1 and pcs_inhib < 30:
+					if pcs_inhib < 10:
+						$diff = 'hard'
+					elseif pcs_inhib < 20:
+						$diff = 'medium'
+					else
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+					will_cost = (will_cost * 3) - (pcs_perform)
+					if will_cost <= pcs_willpwr:
+						act 'Practice guitar (0:30) (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,2)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_bedroomPractice', 'guitar'
+						end
+					else
+						act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
+					end
+				else
+					act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
+				end
 			end
-			gs 'willpower', 'skill', 'self', $diff
 
-			if will_cost <= pcs_willpwr:
-				act 'Record a song with your phone (0:30) (<<will_cost>> Willpower)': 
-					inhib_exp += rand(1,2)	
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					gt 'music_onlinemusic', 'recordSong'
-				end							
-				if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-					act 'Record and edit a song (2:00) (<<will_cost>> Willpower)': 
-						inhib_exp += rand(1,2)	
-						gs 'willpower', 'pay', 'self'
-						gs 'stat'
-						gt 'music_onlinemusic', 'recordAndEditSong' 
-					end						
+			!! Streaming music
+			if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+				ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
+
+				if pcs_inhib < 30:
+					if pcs_inhib < 10:
+						$diff = 'hard'
+					elseif pcs_inhib < 20:
+						$diff = 'medium'
+					else
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+					will_cost = (will_cost * 3) - (pcs_perform)
+
+					if will_cost <= pcs_willpwr:
+						act 'Live stream (<<ml_streamtime>> minutes) (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,3)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_onlinemusic', 'liveStream'
+						end
+					else
+						act 'Live stream (<<ml_streamtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				else
+					act 'Live stream (<<ml_streamtime>> minutes)': gt 'music_onlinemusic', 'liveStream'
 				end
-			else	
-				act 'Record a song (0:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				act 'Record and edit a song (1:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'				
 			end
-		else
-			act 'Record a song with your phone (0:30)': gt 'music_onlinemusic', 'recordSong'
-			if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-				act 'Record and edit a song (2:00)': gt 'music_onlinemusic', 'recordAndEditSong' 
+
+			!! Recording music
+			if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+				if pcs_inhib < 20:
+					if pcs_inhib < 10:
+						$diff = 'medium'
+					elseif pcs_inhib < 20:
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+
+					if will_cost <= pcs_willpwr:
+						act 'Record a song with your phone (0:30) (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,2)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_onlinemusic', 'recordSong'
+						end
+						if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+							act 'Record and edit a song (2:00) (<<will_cost>> Willpower)':
+								inhib_exp += rand(1,2)
+								gs 'willpower', 'pay', 'self'
+								gs 'stat'
+								gt 'music_onlinemusic', 'recordAndEditSong'
+							end
+						end
+					else
+						act 'Record a song (0:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						act 'Record and edit a song (1:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				else
+					act 'Record a song with your phone (0:30)': gt 'music_onlinemusic', 'recordSong'
+					if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+						act 'Record and edit a song (2:00)': gt 'music_onlinemusic', 'recordAndEditSong'
+					end
+				end
 			end
 		end
-	end
 
-end
+		 !! if ml_deparcoQW > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
 
- !! if ml_deparcoQW > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
+		if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
+			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
+		elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
+			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
+		elseif sisterHere = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
+			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+		elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 30:
+			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+		end
+		gs 'lact_bp', 'massage'
 
-if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
-	'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
-elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
-	'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
-elseif sisterHere = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
-	'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
-elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 30:
-	'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+		'</td><td width = "100" valign="top"></td><td>'
+		gs 'subkid'
+		'</td></tr></table>'
+		
+		act 'Relax on your bed': gt 'bed', 'start'
+	end
 end
-gs 'lact_bp', 'massage'
-
-'</td><td width = "100" valign="top"></td><td>'
-gs 'subkid'
-'</td></tr></table>'
-
-act 'Relax on your bed': gt 'bed', 'start'
 
 if $ARGS[0] = 'intro':
-	cla & *clr
-	$loc_arg = ''
-	$loc = 'korrPar'
-	$temp_nickname = '<<$npc_nickname[''A29'']>>'
 	grandmaQW['last_month_paid'] = month
 	menu_off = 1
 	hour = 6
 	gs 'stat'
 	music_loop = 0
-	CLOSE ALL
 	'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 	*nl
 	'All of a sudden, you hear a familiar voice yell out. "<<$pcs_nickname>>, time to get up! You can''t spend the whole day laying around!"'
 	wait 1000
-	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
-	if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+	$temp_nickname = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
+	if $temp_nickname ! '':$npc_nickname['A29'] = '<<$temp_nickname>>'
 	killvar '$temp_nickname'
 	act 'Continue':
 		cla & *clr

+ 1 - 1
locations/zoomagazine.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = 'start':
 			menu_off = 1
 			if home_owned[1] > 0:
 				minut += 10
-				ParrotQW['Owned1'] += 1
+				ParrotQW['Owned1'] = 1
 				money -= 3000
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pet shop/pets/parrot.jpg"></center>'
 				'<center><b>You bought a parrot.</b></center>'