1
0

3 Incheckningar e38cda7219 ... be4972beaf

Upphovsman SHA1 Meddelande Datum
  Kevin_Smarts be4972beaf Merge remote-tracking branch 'Anya/master' 2 år sedan
  Kevin_Smarts 579347e6e8 [fixed] This one was correct 2 år sedan
  Anya bfd2ce36e8 [Updated] Tamara's last name to Meynold for Derryth_Love 2 år sedan

+ 3 - 3
locations/KatjaHomeTalk.qsrc

@@ -1834,7 +1834,7 @@ if $ARGS[0] = 'TamVal_2':
 	act 'A Talk':
 		*clr & cla
 		menu_off = 1
-		'<center><h4><font color="maroon">Tamara Mikhailovna</font></h4></center>'
+		'<center><h4><font color="maroon">Tamara Meynold</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tamara.jpg"></center>'
 
 		if zz_stage >= 1:
@@ -1849,8 +1849,8 @@ if $ARGS[0] = 'TamVal_2':
 			'Finally, after saying your goodbyes, you leave the house.'
 
 		else
-			'"<<$pcs_nickname>> isn''t it? I''m Tamara Mikhailovna, my pleasure."'
-			'"Hello Mrs. Mikhailovna."'
+			'"<<$pcs_nickname>> isn''t it? I''m Tamara Meynold, my pleasure."'
+			'"Hello Mrs. Maynold."'
 			'"So... <<$pcs_nickname>>, what exactly is troubling my little girl?"'
 			'She is asking you without concern, and for a moment, you don''t know what to say, but finally decide to answer.'
 			'"She is troubled about the fact that Valentina and you are in a... well... romantic relationship."'

+ 1 - 1
locations/bank.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Bank</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/bank.jpg"></center>'
 
-	if week <= 5 and hour = 16 and minut >= 30 and mey_vika['mey_vika_qw'] >= 32: 'Seems like <a href="exec:gs''mey_tamara_events'',''tamara''">Tamara Mikhailovna</a> is heading home.'
+	if week <= 5 and hour = 16 and minut >= 30 and mey_vika['mey_vika_qw'] >= 32: 'Seems like <a href="exec:gs''mey_tamara_events'',''tamara''">Tamara Meynold</a> is heading home.'
 
 	if bankAccount = 0:
 		'Do you want to open an account?'

+ 3 - 3
locations/mey_home.qsrc

@@ -89,7 +89,7 @@ if $ARGS[0] = 'start':
 		end
 		! check appearance before going to corporate
 		if week = 7 and (hour = 17 or hour = 18) and mey_vika['mey_vika_qw'] = 41:
-			'<br><a href="exec: gt''mey_tamara_events'',''check_look''">Tamara Mikhailovna.</a> is waiting for you in the lobby.'
+			'<br><a href="exec: gt''mey_tamara_events'',''check_look''">Tamara Meynold.</a> is waiting for you in the lobby.'
 
 			exit
 		end
@@ -351,7 +351,7 @@ if $ARGS[0] = '7':
 	'<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 Mikhailovna''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.'
+	'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'
 end
@@ -370,7 +370,7 @@ if $ARGS[0] = '8':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/courtyard.jpg"></center>'
 	*nl
 	'The garden is quite small for the house and overgrown, most of the space is taken up by a small pool.'
-	'A car belonging to Tamara Mikhailovna is parked on the drive next to the garden.'
+	'A car belonging to Tamara Meynold is parked on the drive next to the garden.'
 	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

+ 8 - 8
locations/mey_tamara_events.qsrc

@@ -13,9 +13,9 @@ menu_off = 1
 
 if $args[0] = 'tamara':
 	*clr & cla
-	'<center><h4><font color="maroon">Tamara Mikhailovna</font></h4></center>'
+	'<center><h4><font color="maroon">Tamara Meynold</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tamara.jpg"></center>'
-	'Tamara Mikhailovna, the twins mother, is a tall, big busted woman, quite outspoken just like a man. She''s a very attractive woman just under "fifty" years old, redheaded just like the daughters.'
+	'Tamara Meynold, the twins mother, is a tall, big busted woman, quite outspoken just like a man. She''s a very attractive woman just under "fifty" years old, redheaded just like the daughters.'
 	'If it wasn''t for the fiery hair color, no one would ever think that Katja and Vicky are her daughters. Tamara works in the city Bank holding a middle management position, even though she often complains about the work, the pay is good so she stays put.'
 
 	if $curloc = 'bank': act 'To go home': minut += 30 & gt 'mey_home', 'start'
@@ -29,7 +29,7 @@ end
 !! the first meeting
 if $args[0] = 'first_meet':
 	*clr & cla
-	'<center><h4><font color="maroon">Tamara Mikhailovna</font></h4></center>'
+	'<center><h4><font color="maroon">Tamara Meynold</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tamara.jpg"></center>'
 	if katjaQW['QWstage'] >= 2:
 		'You ring on the bell to the Meynold residence. The door opens and you can see Katja and Vicky standing there with their mother. The girls'' mother is a very attractive woman just under "fifty" years old, busty and tastefully dressed even at home, and just like the twins, also a redhead.'
@@ -44,7 +44,7 @@ if $args[0] = 'first_meet':
 		'"Hello guys! Hi, Vanya."'
 		'"Vicky, would you like to introduce your girlfriend?"'
 		'You stand there a bit shyly, while Vicky introduces you two. Vicky''s mother smiles warmly and replies:'
-		'"I''m Tamara Mikhailovna. Come in, come in, don''t be shy! Vicky doesn''t invite her friends over very often, so I''m always wondering who her friends are. Well, I won''t disturb you further, I''ll be in the kitchen having some tea."'
+		'"I''m Tamara Meynold. Come in, come in, don''t be shy! Vicky doesn''t invite her friends over very often, so I''m always wondering who her friends are. Well, I won''t disturb you further, I''ll be in the kitchen having some tea."'
 	end
 
 	act 'In the kitchen (1:00)':
@@ -53,7 +53,7 @@ if $args[0] = 'first_meet':
 		mey_vika['mey_vika_qw'] = 25
 		$locclass = 'kitr'
 		gs 'stat'
-		'<center><h4><font color="maroon">Tamara Mikhailovna</font></h4></center>'
+		'<center><h4><font color="maroon">Tamara Meynold</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tamara_first_meet_tea.jpg"></center>'
 		'You enter the kitchen seeing Tamara drinking tea by herself. She notices you and calls you over to join her. You sit down next to her and she pours you a cup of tea and begins talking continuously:'
 		'"I divorced my husband, he liked to drink, and when drunk, he always became aggressive and wanted to fight. He kept on drinking after our divorce, until he crossed paths with an other drunk and they started arguing ending in my ex-husband stabbing this person to death. They put him away for a long time. And since he didn''t know how to handle himself in prison, he got stabbed to death. And all I can say is, good riddance, he was a bad man that deserved what he got."'
@@ -62,7 +62,7 @@ if $args[0] = 'first_meet':
 		'"Sighing, she replies:"'
 		'"After the experience I had with my ex-husband, all the desire went away for getting into a new relationship. And there was no time either, I had to earn money and raise my daughters. There was never time to treat myself I was always sacrificing so my daughters could live a good life! Who would want me now, an old battered woman with a rusty roof?"'
 		'You start objecting:'
-		'"What are you saying Ms. Mikhailovna, there is nothing called too old! You are a beautiful and a successful woman in your prime age. The men would be running head over heels for you!"'
+		'"What are you saying Ms. Meynold, there is nothing called too old! You are a beautiful and a successful woman in your prime age. The men would be running head over heels for you!"'
 		'"Thank you for the kind words. You don''t need to be so formal, <<$pcs_nickname>>. We''re not at work. You can call me Aunt Tamara."'
 		'"Vicky, your girlfriend is wonderful! You should invite <<$pcs_nickname>> here more often!"'
 		'Vicky interrupts your conversation:'
@@ -422,7 +422,7 @@ if $args[0] = 'rebuke':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/rebuke5.jpg"></center>'
 						'You drink tea in the kitchen and taste the most delicious cookies you''ve ever tasted. Aunt Tamara laughs and tells all sorts of stories and the anxiety that was in your belly disappears.'
-						'She''s not the Snow Queen Tamara Mikhailovna anymore, that frightened you as just as she takes pleasure doing the same thing to her subordinates at the Bank. Instead she''s the fun-loving and kind Aunt Tamara again.'
+						'She''s not the Snow Queen Tamara Meynold anymore, that frightened you as just as she takes pleasure doing the same thing to her subordinates at the Bank. Instead she''s the fun-loving and kind Aunt Tamara again.'
 						'All of a sudden Tamara puts down her cup...'
 
 						act 'Listen':
@@ -723,7 +723,7 @@ if $args[0] = 'party4a':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party24.jpg"></center>'
 							'As you come out from the office you stumble upon an angry Tamara. Not allowing you to go back to the party, she orders you...'
 							'"Follow me!"'
-							'You faintly realize that you''ve done something wrong. But champagne is still controlling your senses, and you''re in a great mood after the sex you just had. You try to justify yourself saying that nothing happened and that you "just went out to powder your nose and that it took a while..." However, Tamara Mikhailovna doesn''t even budge, she walks in front of you, now visibly upset.'
+							'You faintly realize that you''ve done something wrong. But champagne is still controlling your senses, and you''re in a great mood after the sex you just had. You try to justify yourself saying that nothing happened and that you "just went out to powder your nose and that it took a while..." However, Tamara Meynold doesn''t even budge, she walks in front of you, now visibly upset.'
 							'Approaching her car, she opens the rear passenger door...'
 							'"Get in, now!"'
 							'You sit down, not understanding why she''s so upset.'

+ 1 - 1
locations/mey_vika_events.qsrc

@@ -1171,7 +1171,7 @@ if $ARGS[0] = 'learning0':
 								'"I''ve seen a lot and been through a lot in my life. And I don''t want my children to go through the same mishaps as I did. Sex is an integral part of our lives and if you know how to properly make use of this knowledge, you will find many doors opening. There are many wrong choices you can make in life. And who would I be, if I didn''t prepare my children for the adult life?"'
 								'"Y-You teach them these things?" you ask. "My <<$npc_nickname[''A29'']>> would lock me in my room if she even thought I''d consider such things."'
 								'"Oh sweety, your mother isn''t exactly making things easier on you by forcing you to find everything out on yourself. Things can be a lot easier when you have someone to teach you."'
-								'Tamara Mikhailovna sighs...'
+								'Tamara Meynold sighs...'
 								'"If only I could make Katja understand..."'
 								'"If you want, I can mentor you. Don''t give up, dear. You have nothing to lose, but a lot to gain instead."'
 								'Through the tears you smile at her. After all, she is a wonderful woman.'

+ 1 - 1
locations/sportShop.qsrc

@@ -294,7 +294,7 @@ if $ARGS[0] = 'purses':
 	:loopdanilovich_purses
 		if danilovich_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''purses2''"><img src="images/pc/items/danilovich/purses/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 20:jump 'loopdanilovich_purses'
+	if i <= 60:jump 'loopdanilovich_purses'
 end
 
 if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'danilovich',i, 1500