Merge remote-tracking branch 'sovietmercader/master'

locations/annafrends.qsrc

@@ -7,15 +7,15 @@ if $ARGS[0] = 'scene1':
 	gs 'stat'
 	gs 'reks'
 
-	'Your sister Anja and her friends Lena, Ira, Rex, and Roman are sitting outside the community center drinking beer.'
+	'Your sister Anya and her friends Lena, Ira, Rex, and Roman are sitting outside the community center drinking beer.'
 	temprand = rand(0, 4)
 
 	if temprand = 0:
-		!!Anja
-		'Impatiently, Anja picks up a bottle of beer and shouts, "Come on guys! Will you pour me some beer today or not?"'
+		!!Anya
+		'Impatiently, Anya picks up a bottle of beer and shouts, "Come on guys! Will you pour me some beer today or not?"'
 
 		if rand(0, 1) = 0:
-			'Rex takes the bottle out of Anja''s hands.'
+			'Rex takes the bottle out of Anya''s hands.'
 			temprand = rand(0, 4)
 
 			if temprand = 0:
@@ -23,20 +23,20 @@ if $ARGS[0] = 'scene1':
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Between fits of giggles, Anja says "I haven''t even started to yell. If I do, you''ll know!"'
+					'Between fits of giggles, Anya says "I haven''t even started to yell. If I do, you''ll know!"'
 				elseif temprand = 1:
 					'With a resounding slap on Rex'' shoulder, Lena says "Hurry up, you piece of dog shit!"'
 				else
 					'With a smile, Ira says "Don''t get angry, Rex."'
 
-					if rand(0, 10) = 0:'Anja quickly interjects, "We might need to chain him to a post until he calms down."'
+					if rand(0, 10) = 0:'Anya quickly interjects, "We might need to chain him to a post until he calms down."'
 				end
 			elseif temprand = 1:
 				'"Well, you always like to be late for the fun. Relax your ass, I''m sorting it all out."'
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Between fits of giggles, Anja says "I haven''t even started to yell. If I do, you''ll know!"'
+					'Between fits of giggles, Anya says "I haven''t even started to yell. If I do, you''ll know!"'
 				elseif temprand = 1:
 					'With a resounding slap on Rex'' shoulder, Lena says "Hurry, you piece of dog shit!"'
 				else
@@ -44,25 +44,25 @@ if $ARGS[0] = 'scene1':
 					temprand = rand(0, 2)
 
 					if temprand = 0:
-						'Anja quips, "You''ll forever remain a virgin, Roma."'
+						'Anya quips, "You''ll forever remain a virgin, Roma."'
 						if rand(0, 10) = 0:
 							'Roma grins "Is that an offer?"'
 							temprand = rand(0, 2)
 
 							if temprand = 0:
-								'Anja laughs "Dream on, punk."'
+								'Anya laughs "Dream on, punk."'
 							elseif temprand = 1:
-								'Anja laughs "Only in your dreams, punk."'
+								'Anya laughs "Only in your dreams, punk."'
 							else
-								'Anja laughs "Yeah, right. Can you hear that? It''s a whore coming to help you."'
+								'Anya laughs "Yeah, right. Can you hear that? It''s a whore coming to help you."'
 							end
 						end
 					elseif temprand = 1:
-						'Anja quips "And you''re just sad because you can''t get any girls Roma."'
+						'Anya quips "And you''re just sad because you can''t get any girls Roma."'
 
 						if rand(0, 10) = 0:'Rex grins "Yeah, our eternal virgin Roma is truly able to enliven the conversation with the topic of anal gases."'
 					else
-						'Anja quips "The smell comes from you."'
+						'Anya quips "The smell comes from you."'
 
 						if rand(0, 10) = 0:'Roma grins "Yes, no, it sobachatiny bears."'
 					end
@@ -72,7 +72,7 @@ if $ARGS[0] = 'scene1':
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Anja giggles "Yeah, what else do you need them for?"'
+					'Anya giggles "Yeah, what else do you need them for?"'
 
 					if rand(0, 10) = 0:'With mock indignation, Rex answers "Really just one other thing."'
 				elseif temprand = 1:
@@ -82,27 +82,27 @@ if $ARGS[0] = 'scene1':
 				else
 					'Ira smiles, saying "Don''t get so upset, Rex."'
 
-					if rand(0, 10) = 0:'Anja quickly interjects, "We might need to chain him up to a tree to keep him calm."'
+					if rand(0, 10) = 0:'Anya quickly interjects, "We might need to chain him up to a tree to keep him calm."'
 				end
 			elseif temprand = 3:
 				'"Allow me, madame."'
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Anja giggles "Of course, monsieur."'
+					'Anya giggles "Of course, monsieur."'
 				elseif temprand = 1:
-					'With mock indignation, Anja says "Don''t you Madame me!"'
+					'With mock indignation, Anya says "Don''t you Madame me!"'
 
 					if rand(0, 10) = 0:'Rex bowes gallantly and answers "I''m truly sorry, mademoiselle."'
 				else
-					'Impatiently, Anja says "Pour it already, you clown."'
+					'Impatiently, Anya says "Pour it already, you clown."'
 				end
 			else
 				'"Shit! Where''re the cups? Did we not buy any?"'
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Anja picks up the cups, "Here they are, you blind monster."'
+					'Anya picks up the cups, "Here they are, you blind monster."'
 				elseif temprand = 1:
 					'Roma says "Rex, you''re the one who bought them, is your memory really that bad?"'
 				else
@@ -110,7 +110,7 @@ if $ARGS[0] = 'scene1':
 				end
 			end
 		else
-			'Roma takes the bottle from Anja and opens it. "Somebody hold the cups."'
+			'Roma takes the bottle from Anya and opens it. "Somebody hold the cups."'
 			temprand = rand(0, 2)
 
 			if temprand = 0:
@@ -130,7 +130,7 @@ if $ARGS[0] = 'scene1':
 				elseif temprand = 1:
 					'Outraged, Rex says "How the fuck could you spill that?"'
 				else
-					'Indignantly, Anja says "Always the same; never let somebody else pour if you can do it yourself instead."'
+					'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
 				end
 			end
 		end
@@ -150,7 +150,7 @@ if $ARGS[0] = 'scene1':
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Anja picks up the cups, "Here they are, you blind monster."'
+					'Anya picks up the cups, "Here they are, you blind monster."'
 				elseif temprand = 1:
 					'Roma says "Rex, you''re the one who bought them, is your memory really that bad?"'
 				else
@@ -181,7 +181,7 @@ if $ARGS[0] = 'scene1':
 				elseif temprand3 = 1:
 					'Outraged, Rex says "How the fuck could you spill that?"'
 				elseif temprand3 = 2:
-					'Indignantly, Anja says "Always the same; never let somebody else pour if you can do it yourself instead."'
+					'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
 				end
 			end
 		end
@@ -207,7 +207,7 @@ if $ARGS[0] = 'scene1':
 			elseif temprand = 1:
 				'Outraged, Rex says "How the fuck could you spill that?"'
 			else
-				'Indignantly, Anja says "Always the same; never let somebody else pour if you can do it yourself instead."'
+				'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
 			end
 		end
 	end
@@ -337,7 +337,7 @@ if $ARGS[0] = 'scene1':
 
 !sisboyparty
 !-1 - don''t go to the party
-!0 - don''t know about Vecherinka
+!0 - don''t know about the parties
 !1 - knows about the parties
 !2 - agreed to go to the party
 
@@ -425,7 +425,7 @@ if $ARGS[0] = 'scene2':
 		gennpc = rand(0, 2)
 
 		if gennpc = 0:
-			'Anja walks up to you and asks "<<$pcs_nickname>>, let''s go to the toilet."'
+			'Anya walks up to you and asks "<<$pcs_nickname>>, let''s go to the toilet."'
 		elseif gennpc = 1:
 			'Lena walks up to you and asks "<<$pcs_nickname>>, do you want to go to the toilet?"'
 		elseif gennpc = 2:
@@ -446,7 +446,7 @@ if $ARGS[0] = 'scene3':
 	minut += 5
 	gs 'stat'
 
-	if gennpc = 0:$annafrendname = 'Anja' & $annafrendname2 = 'Anja'
+	if gennpc = 0:$annafrendname = 'Anya' & $annafrendname2 = 'Anya'
 	if gennpc = 1:$annafrendname = 'Lena' & $annafrendname2 = 'Lena'
 	if gennpc = 2:$annafrendname = 'Ira' & $annafrendname2 = 'Ira'
 

locations/dinsister.qsrc

@@ -100,12 +100,12 @@ $sischecks = {
 
 	if pirsC > 0 and pirsC < 10000 and pirsCsister = 0:
 		pirsCsister = 1
-		'You sister looks at your earrings and reaching up to hold and inspect one closely says, "Well, finally! I thought you would never get your ears pierced."'
+		'Your sister looks at your earrings and reaching up to hold and inspect one closely says, "Well, finally! I thought you would never get your ears pierced."'
 	end
 
 	if pirsD > 0 and pirsD < 10000 and pirsDsister = 0:
 		pirsDsister = 1
-		'Anja is clearly shocked by your nose ring: "Damn, <<$pcs_nickname>>, tell me who did this to you and I''ll get them for you."'
+		'Anya is clearly shocked by your nose ring: "Damn, <<$pcs_nickname>>, tell me who did this to you and I''ll get them for you."'
 		'She dances around you shadow boxing and you both end up laughing loudly.'
 	end
 

locations/selfplay.qsrc

@@ -70,7 +70,7 @@ if $ARGS[0] = 'start':
 			minut -= 15
 			gs 'stat'
 
-			'<<$AnjaMsg>>'
+			'<<$AnyaMsg>>'
 
 			act 'Stop touching yourself':gt $loc, $metka
 
@@ -101,7 +101,7 @@ if $ARGS[0] = 'start':
 			if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
 			gs 'stat'
-			'<<$AnjaMsg>>'
+			'<<$AnyaMsg>>'
 
 			act 'Stop touching yourself':gt $loc, $metka
 
@@ -151,7 +151,7 @@ if $ARGS[0] = 'start':
 				end
 
 				gs 'stat'
-				'<<$AnjaMsg>>'
+				'<<$AnyaMsg>>'
 
 				act 'Stop touching yourself':gt $loc, $metka
 
@@ -207,7 +207,7 @@ if $ARGS[0] = 'start':
 						if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
 						gs 'stat'
-						'<<$AnjaMsg>>'
+						'<<$AnyaMsg>>'
 
 						act 'Stop touching yourself':gt $loc, $metka
 
@@ -261,7 +261,7 @@ if $ARGS[0] = 'start':
 								if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
 								gs 'stat'
-								'<<$AnjaMsg>>'
+								'<<$AnyaMsg>>'
 
 								act 'Stop touching yourself':gt $loc, $metka
 
@@ -318,7 +318,7 @@ if $ARGS[0] = 'start':
 										if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
 										gs 'stat'
-										'<<$AnjaMsg>>'
+										'<<$AnyaMsg>>'
 									end
 								end
 							end
@@ -355,7 +355,7 @@ if $ARGS[0] = 'start':
 
 								gs 'dinsex2', 'd_vag_sex_dildo', 15
 								gs 'stat'
-								'<<$AnjaMsg>>'
+								'<<$AnyaMsg>>'
 
 								act 'Stop using the dildo':gt 'selfplay', 'start'
 							end
@@ -376,7 +376,7 @@ if $ARGS[0] = 'start':
 
 							gs 'dinsex2', 'd_vag_sex_dildo', 15
 							gs 'stat'
-							'<<$AnjaMsg>>'
+							'<<$AnyaMsg>>'
 
 							act 'Stop using the dildo':gt 'selfplay', 'start'
 						end
@@ -398,7 +398,7 @@ if $ARGS[0] = 'start':
 
 						gs 'dinsex2', 'd_analsex_dildo',15
 						gs 'stat'
-						'<<$AnjaMsg>>'
+						'<<$AnyaMsg>>'
 
 						act 'Stop using the dildo':gt 'selfplay', 'start'
 					end
@@ -527,7 +527,7 @@ end
 
 if $ARGS[0] = 'sis_prov':
 
-	$AnjaMsg = ''
+	$AnyaMsg = ''
 
 	if $loc = 'bedrPar' and (hour >= 7 or hour < 23):
 		gs 'family'
@@ -539,16 +539,16 @@ if $ARGS[0] = 'sis_prov':
 				cls
 				if sisboytrio > 0 and sis_watch = 1:
 					sis_watch = 2
-					$AnjaMsg = 'Anya smiles as she enters the room and waves at you to carry on.'
+					$AnyaMsg = 'Anya smiles as she enters the room and waves at you to carry on.'
 				else
 					if proverkasisterhere = 2 and RAND(1,3) = 3:
 						SisterKnowMastr += 1
-						$AnjaMsg = '<font color="red"><b>Anja saw you masturbate.</b></font>'
+						$AnyaMsg = '<font color="red"><b>Anya saw you masturbate.</b></font>'
 					end
 
 					if proverkasisterhere = 1:
 						proverkasisterhere = 2
-						$AnjaMsg = '<font color="red"><b>You hear footsteps approaching your room.</b></font>'
+						$AnyaMsg = '<font color="red"><b>You hear footsteps approaching your room.</b></font>'
 					end
 				end
 			end
@@ -611,7 +611,7 @@ if $ARGS[0] = 'fingering':
 
 			gs 'arousal', 'masturbate', 2
 			gs 'stat'
-			'<<$AnjaMsg>>'
+			'<<$AnyaMsg>>'
 
 			gs 'selfplay', 'fingering2'
 
@@ -646,7 +646,7 @@ if $ARGS[0] = 'fingering2':
 		gs 'arousal', 'masturbate', 10
 		gs 'stat'
 
-		'<<$AnjaMsg>>'
+		'<<$AnyaMsg>>'
 
 		gs 'selfplay', 'fingering2', 1
 
@@ -689,7 +689,7 @@ if $ARGS[0] = 'fingering3':
 		gs 'arousal', 'masturbate', 2
 		gs 'stat'
 
-		'<<$AnjaMsg>>'
+		'<<$AnyaMsg>>'
 
 		act 'Fuck yourself with your fingers':
 			cls
@@ -718,7 +718,7 @@ if $ARGS[0] = 'fingering3':
 
 			if pcs_vag < 20:vaginaTemp += 1
 
-			'<<$AnjaMsg>>'
+			'<<$AnyaMsg>>'
 
 			gs 'selfplay', 'fingering3'
 

locations/telefon.qsrc

@@ -722,9 +722,9 @@ if $ARGS[0] = 'Phone_notebook':
 		if d1 = nyp_day and m1 = 12 and SchoolAtestat = 0 and StoryLine = 1:$calendarday += $list + 'New Year''s party at 14:00!'
 		if (npc_QW['A33']-2) mod 2 = 1 and sisboyday+1 = daynum:
 			if sisboytrioQW = 1:
-				$calendarday += $list + '<font color="orange">Threesome with Anja and Roma at 18:00</font>'
+				$calendarday += $list + '<font color="orange">Threesome with Anya and Roma at 18:00</font>'
 			else
-				$calendarday += $list + '<font color="orange">Anja having sex with Roma at 18:00</font>'
+				$calendarday += $list + '<font color="orange">Anya having sex with Roma at 18:00</font>'
 			end
 		end
 		if sisboyparty = 2 and sisboyparty_day+1 = daynum:$calendarday += $list + '<font color="orange">Party at Rex, gathering before 18:00 at Community Center</font>'