[Fixes][Text Edit] Moved Parrot story variables to an array, fixed text in a few places

locations/bedrPar.qsrc

@@ -27,25 +27,25 @@ if momloc = 26:
 	end
 end
 
-if saveparQW = 2:
+if ParrotQW['Level'] = 2:
 	*clr & cla
 	menu_off = 1
-	'As soon as you enter the room you rush over to <<$namepopu2>>''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.'
-	saveparQW = 3
-	saveparjourQW = 3
+	'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, $metka
 	exit
 end
-if sisrelparday + 3 < daystart and saveparQW = 1:
+if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
 	*clr & cla
 	menu_off = 1
-	'When you enter the room you notice <<$namepopu2>>''s cage is open and he is gone.'
+	'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
 	'You sister must have released him since you were not able to find a solution in time.'
-	popugai2 = 0
-	saveparQW = 0
-	saveparjourQW = 2
-	saveparQWfailed = 0
+	ParrotQW['Owned2'] = 0
+	ParrotQW['Level'] = 0
+	ParrotQW['Day'] = 2
+	ParrotQW['Failed'] = 0
 	act 'Continue':gt $loc, $metka
 	exit
 end
@@ -54,21 +54,21 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:gt 'to
 
 if anyaloc = 25: gt 'sisterQW', 'sisboyQW_expel'
 
-if sisterHere = 2 and popugai2 = 1 and sispopconf = 0:
+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 <<$namepopu2>> in his cage'
+	'"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"'
-		sispopconf = 1
+		ParrotQW['SisKeepParrot'] = 1
 	end
 	if npc_rel['A33']  <= 50:
 		'"No he isn''t cute, and I suggest you take it out of here, I am not sharing my room with a bird."'
 		'You feel kind of sad but you understand your sister. You should have asked her before buying it.'
 		'You go to the window, open it and release the bird'
-		popugai2 = 0
+		ParrotQW['Owned2'] = 0
 	end
 
 	act 'Leave':gt $loc, $metka
@@ -85,28 +85,28 @@ end
 *nl
 'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 *nl
-if popugai2 = 1:
-	'<a href="exec:gt ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'
-	if daystart - parbuydate <= 10: '<<$namepopu2>> starts squawking at you when you enter the room.'
-	if daystart - parbuydate > 10 and daystart - parbuydate <= 20: 'When <<$namepopu2>> sees you he starts ''speaking''. It sounds almost like he is saying "<b>hello  <<$pcs_nickname>></b>"'
-	if daystart - parbuydate > 20 and daystart - parbuydate <= 30: 'When <<$namepopu2>> sees you he starts ''speaking''. He is clearly saying "<b>hello  <<$pcs_nickname>></b>"'
-	if daystart - parbuydate > 30 and daystart - parbuydate <= 35: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty</b>"'
-	if daystart - parbuydate > 35 and daystart - parbuydate <= 40: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body</b>"'
-	if daystart - parbuydate > 40 and daystart - parbuydate <= 50: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
-	if daystart - parbuydate > 50 and daystart - parbuydate <= 55: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
-	if daystart - parbuydate > 55 and saveparQW < 3: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
-	if saveparQW = 3:
+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 <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>What Did You Say To Me?</b>"'
-		if parfixrand = 1:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>3.1415926535897932384 ....</b>"'
-		if parfixrand = 2:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Come Closer, My Friend</b>"'
-		if parfixrand = 3:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Here Kitty, Kitty!</b>"'
-		if parfixrand = 4:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>I Just Met You and This is Crazy</b>"'
-		if parfixrand = 5:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Bow Before Me!</b>"'
-		if parfixrand = 6:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>He’s Just a Friend, Honest!</b>"'
-		if parfixrand = 7:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>What Did You Do To My Socks?</b>"'
-		if parfixrand = 8:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>That’s What She Said!</b>"'
-		if parfixrand = 9:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Help! They’ve Turned Me Into a Parrot!</b>"'
+		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
 
@@ -135,7 +135,7 @@ gad = 0
 if npc_QW['A33'] > 10:npc_QW['A33'] = 10
 
 act 'Exit the room':
-	if sisterHere = 2 and daystart - parbuydate > 55 and popugai2 = 1 and sisrelparday = 0 : gt 'sister_chat', 'pargone'
+	if sisterHere = 2 and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
 	gt'korrPar'
 end
 

locations/korr.qsrc

@@ -79,7 +79,7 @@ end
 if umbrella > 0:'On a hook hangs an umbrella.'
 
 if krolik = 1:'Resting on the floor there''s your rabbit <a href="exec:gt ''krol'', ''start''"><<$namekrol>></a>.'
-if popugai = 1:'In the cage sits your parrot <a href="exec:gt ''popu'', ''start''"><<$namepopu>></a>.'
+if ParrotQW['Owned1'] = 1:'In the cage sits your parrot <a href="exec:gt ''popu'', ''start''"><<$ParrotQW[''Name1'']>></a>.'
 
 if parkday ! daystart and parkblackmail = 1:
 	parkblackmail = 2

locations/korr2x.qsrc

@@ -32,7 +32,7 @@ end
 
 if umbrella > 0:'On a hook hangs an umbrella'
 if krolik = 1:'On the floor, resting is <a href="exec:gt ''krol'',''start''"><<$namekrol>></a>'
-if popugai = 1:'In the cell, sitting is <a href="exec:gt ''popu'',''start''"><<$namepopu>></a>'
+if ParrotQW['Owned1'] = 1:'In the cage sits your parrot <a href="exec:gt ''popu'', ''start''"><<$ParrotQW[''Name1'']>></a>.'
 if parkday ! daystart and parkblackmail = 1:
 	parkblackmail = 2
 	parkday = daystart

locations/popu.qsrc

@@ -8,12 +8,12 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><img <<$set_imgh>> src="images/pets/parrot2.jpg"></center>'
-	'<center><<$namepopu>> sitting in his cell.</center>'
+	'<center><<$ParrotQW[''Name1'']>> sitting in his cage.</center>'
 
 	act 'Leave':dynamic $brodila
 
 	act 'Open a window and release your parrot':
-		popugai = 0
+		ParrotQW['Owned1'] = 0
 		minut += 10
 		dynamic $brodila
 	end
@@ -25,16 +25,16 @@ if $ARGS[0] = 'start2':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><img <<$set_imgh>> src="images/pets/parrot2.jpg"></center>'
-	'<center><<$namepopu2>> sitting in his cell.</center>'
+	'<center><<$ParrotQW[''Name2'']>> sitting in his cage.</center>'
 
 	act 'Leave':gt $loc, $metka
 
 	act 'Open a window and release your parrot':
-		if daystart - parbuydate > 30:
-			'You have become too attached to <<$namepopu2>>. You can''t bring yourself to release him'
+		if daystart - ParrotQW['BuyDate'] > 30:
+			'You have become too attached to <<$ParrotQW[''Name2'']>>. You can''t bring yourself to release him'
 		else
-			'You say goodbye to <<$namepopu2>> and release him'
-			popugai2 = 0
+			'You say goodbye to <<$ParrotQW[''Name2'']>> and release him'
+			ParrotQW['Owned2'] = 0
 			minut += 10
 		end
 	end

locations/saveupdater.qsrc

@@ -841,6 +841,19 @@ killvar 'imgrand'
 
 !! ----- Natasha story variables migrated to array ----- 0.8.0
 
+!! ----- Parrot story variables migrated to array
+if saveparQW > 0:       ParrotQW['Level'] = saveparQW & killvar 'saveparQW'
+if popugai > 0:         ParrotQW['Owned1'] = popugai & killvar 'popugai'
+if popugai2 > 0:        ParrotQW['Owned2'] = popugai2 & killvar 'popugai2'
+if saveparjourQW > 0:   ParrotQW['Day'] = saveparjourQW & killvar 'saveparjourQW'
+if parbuydate > 0:      ParrotQW['BuyDate'] = parbuydate & killvar 'parbuydate'
+if sisrelparday > 0:    ParrotQW['SisterReleaseParrotDay'] = sisrelparday & killvar 'sisrelparday'
+if saveparQWfailed > 0: ParrotQW['Failed'] = saveparQWfailed & killvar 'saveparQWfailed'
+If sispopconf > 0:      ParrotQW['SisKeepParrot'] = sispopconf & killvar 'sispopconf'
+if $namepopu ! '':      $ParrotQW['Name1'] = $namepopu & killvar '$namepopu'
+if $namepopu2 ! '':     $ParrotQW['Name2'] = $namepopu2 & killvar '$namepopu2'
+!! ----- Parrot story variables migrated to array
+
 !! Updating npc_bust[] array to the new values ----- 0.8.0
 if npc_bust['A12'] = 9: npc_bust['A12'] = 23
 if npc_bust['A13'] = 9: npc_bust['A13'] = 8

locations/sister_chat.qsrc

@@ -1086,16 +1086,16 @@ if $ARGS[0] = 'pargone':
 	if npc_rel['A33'] > 75:
 		'"Fine you have 3 days, if there is no solution by then , I will release him myself"'
 		'"Thanks sis, don''t worry I will find something."'
-		sisrelparday = daystart
-		saveparQW = 1
-		saveparjourQW = 1
+		ParrotQW['SisterReleaseParrotDay'] = daystart
+		ParrotQW['Level'] = 1
+		ParrotQW['Day'] = 1
 
 	else
 		'"No <<$pcs_nickname>>, it is too dangerous"'
-		'<<$npc_firstname[''A33'']>>, reaches for the cage and opens it. <<$namepopu2>> immediately flies out and leaves through the open window.'
+		'<<$npc_firstname[''A33'']>>, reaches for the cage and opens it. <<$ParrotQW[''Name2'']>> immediately flies out and leaves through the open window.'
 		'You look at your pet flying away and have to hold back your tears'
 		'You turn away from your sister because you don''t want her to see you crying.'
-		popugai2 = 0
+		ParrotQW['Owned2'] = 0
 
 	end
 	act 'Move away': gt $loc, $metka

locations/zoomagazine.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Pet Emporium</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pet shop/shop.jpg"</center>'
-	if saveparQW = 1 and saveparQWfailed = 0:
+	if ParrotQW['Level'] = 1 and ParrotQW['Failed'] = 0:
 		menu_off = 1
 		minut += 5
 		cla & *clr
@@ -38,7 +38,7 @@ if $ARGS[0] = 'start':
 			'Smiling, the owner replies, "Okay, I might have a solution for this, but I will have to determine if the parrot was lying or not. So, in a nutshell, you will have to show me that body of yours."'
 			'You realize the owner is probably just an old pervert trying to get some, but this is your only chance to save your bird.'
 			act 'Berate him for wasting your time and leave the store':
-				saveparQWfailed = 1
+				ParrotQW['Failed'] = 1
 				minut += 3
 				gt 'torgcentr'
 			end
@@ -89,7 +89,7 @@ if $ARGS[0] = 'start':
 							gs 'arousal','end'
 							gs 'cum_call','face', $npclastgenerated
 							guy += 1
-							saveparQW = 2
+							ParrotQW['Level'] = 2
 							gs 'stat'
 							act 'Leave the store': minut += 3 & gt 'torgcentr'
 							
@@ -116,7 +116,7 @@ if $ARGS[0] = 'start':
 				money -= 2000
 				'<center><img <<$set_imgh>> src="images/pets/x_2b1d398b.jpg"></center>'
 				'<center><b>You bought a rabbit.</b></center>'
-				$namekrol = input ("I call rabbit ...")
+				$namekrol = input ("I call the rabbit ...")
 				if $namekrol = '':$namekrol = 'Bugs'
 			else
 				'You need to have your own place before you can buy a rabbit.'
@@ -125,18 +125,18 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if money >= 3000 and popugai = 0:
+	if money >= 3000 and ParrotQW['Owned1'] = 0 and home_owned[2] = 0 :
 		act 'Buy a parrot (3000 <b>₽</b>)':
 			cla & *clr
 			menu_off = 1
 			if home_owned[1] > 0:
 				minut += 10
-				popugai += 1
+				ParrotQW['Owned1'] += 1
 				money -= 3000
 				'<center><img <<$set_imgh>> src="images/pets/parrot1.jpg"></center>'
 				'<center><b>You bought a parrot.</b></center>'
-				$namepopu = input ("I call parrot ...")
-				if $namepopu = '':$namepopu = 'Polly'
+				$ParrotQW['Name1'] = input ("I call the parrot ...")
+				if $ParrotQW['Name1'] = '':$ParrotQW['Name1'] = 'Polly'
 			else
 				'You need to have your own place before you can buy a parrot.'
 			end
@@ -144,19 +144,19 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-	if money >= 3000 and popugai2 = 0 and home_owned[2] = 1 :
+	if money >= 3000 and ParrotQW['Owned2'] = 0 and home_owned[2] = 1 :
 		act 'Buy a parrot for your parent''s apartment (3000 <b>₽</b>)':
 			cla & *clr
 			menu_off = 1
 			minut += 10
-			popugai2 += 1
-			sispopconf = 0
-			parbuydate = daystart
+			ParrotQW['Owned2'] += 1
+			ParrotQW['SisKeepParrot'] = 0
+			ParrotQW['BuyDate'] = daystart
 			money -= 3000
 			'<center><img <<$set_imgh>> src="images/pets/parrot1.jpg"></center>'
 			'<center><b>You bought a parrot.</b></center>'
-			$namepopu2 = input ("I call parrot ...")
-			if $namepopu2 = '':$namepopu2 = 'Polly'
+			$ParrotQW['Name2'] = input ("I call the parrot ...")
+			if $ParrotQW['Name2'] = '':$ParrotQW['Name'] = 'Polly'
 
 			act 'Move away from the counter': gt 'zoomagazine', 'start'
 		end