[changed] Tanya's variables converted to array

locations/city_center.qsrc

@@ -225,7 +225,7 @@ end
 
 
 if Enable_tablemap = 0:
-	if nichTanyaRelationship = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanyaFuckLast ! daystart:'<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment where Tanya lives</a>.'
+	if nichTanya['Relationship'] = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanya['FuckLast'] ! daystart:'<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment where Tanya lives</a>.'
 	if nichWork = 2:'<a href="exec:gt ''nichApartment''">Nicholas''s</a> apartment where you work as a live in maid.'
 	if izoldaQW >= 1:'Your friend <a href="exec:gt ''qwIzoldaApp''">Isolde''s</a> apartment.'
 	if mainQW >= 1:'<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout.'
@@ -233,7 +233,7 @@ if Enable_tablemap = 0:
 	if peter > 0:'<a href="exec:gt ''peterroom'', ''start_door''">Peter</a> the sexshop owner''s apartment.'
 else
 	st_count=0 & $show_table=''
-	if nichTanyaRelationship = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanyaFuckLast ! daystart:gs'show_table','<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment</a> where Tanya lives','3'
+	if nichTanya['Relationship'] = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanya['FuckLast'] ! daystart:gs'show_table','<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment</a> where Tanya lives','3'
 	if nichWork = 2:gs'show_table','<a href="exec:gt ''nichApartment''">Nicholas''s</a> apartment','3'
 	if izoldaQW >= 1:gs'show_table','<a href="exec:gt ''qwIzoldaApp''">Isolde''s</a> apartment','3'
 	if mainQW >= 1:gs'show_table','<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout','3'

locations/fit.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'dressing room':
 	*nl
 	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 	*nl
-	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
+	if nichTanya['Known'] = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'
 	end
 
@@ -304,11 +304,11 @@ if $ARGS[0] = 'tanyaIntroduction':
 	if $pantyworntype = 'none': gs 'underwear', 'wear'
 	gs 'panties', 'dispose'
 	gs 'clothing', 'wear_last_worn'
-	nichTanyaRelationship = 1
-	nichTanyaRelationshipState = 10
-	nichTanyaKnown = 1
+	nichTanya['Relationship'] = 1
+	nichTanya['RelationshipState'] = 10
+	nichTanya['Known'] = 1
 	npc_rel['A218'] += 5
-	nichTanyaFuckLast = daystart
+	nichTanya['FuckLast'] = daystart
 	gs 'arousal', 'end'
 	gs 'stat'
 	'"You can at least tell me your name, seeing as you did not even have the decency to do so before you assaulted me." The girl says, catching her breath. Despite her words she doesn''t seem to be angry with you.'

locations/nichApartment.qsrc

@@ -228,7 +228,7 @@ elseif $ARGS[0] = 'jobInterview':
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/01.jpg"></center>'
 			'Finally the elevator stops and its doors open.'
 			
-			if nichTanyaKnown = 0:
+			if nichTanya['Known'] = 0:
 				'In front of you stands a cute girl smiling at you.'
 				'"Hello. My name is Tanya. You are here for the maid-job I guess? Just follow me to the living room. My parents are waiting for you."'
 			else
@@ -425,7 +425,7 @@ elseif $ARGS[0] = 'visitTanya':
 		if npc_rel['A218'] < 30: npc_rel['A218'] += rand(1,2)
 		*clr & cla
 		!! PC agreed to meet the parents for the job interview. Tanya expects her to be unemployed and dressed as a maid.
-		if nichTanyaFuckLast = daystart:
+		if nichTanya['FuckLast'] = daystart:
 			!! Tanya and PC just had sex because PC cant go to the job interview yet
 			'Now that the immediate lust is sated and you''re both enjoying your postcoital bliss, you rest naked in each other''s arms.'
 			if $clothingworntype = 'gm_maid':
@@ -465,7 +465,7 @@ elseif $ARGS[0] = 'visitTanya':
 			'Not giving you a chance to say a word, she leads you to her room and pushes you on her bed.'
 			act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
 		end
-	elseif nichTanyaFuckCounter > rand(3,5) and nichJobRefused < 1 and nichWork = 0 and FUNC('body_din','pregnancyVisibility',0,'nude') = 0:
+	elseif nichTanya['FuckCounter'] > rand(3,5) and nichJobRefused < 1 and nichWork = 0 and FUNC('body_din','pregnancyVisibility',0,'nude') = 0:
 		!! Tanya will only offer the job while she believes that Sveta is not pregnant. Note that it is assumed that Tanya knows how Sveta looks naked and bases her decision on that!
 		'<center><img <<$set_imgh>> src="images/characters/city/tanya/door_01.jpg"></center>'
 		'Tanya opens the door for you. As you look into her eyes, they seem to be sparkling with excitement, and her entire face lights up as she smiles at you.'
@@ -477,7 +477,7 @@ elseif $ARGS[0] = 'visitTanya':
 		act 'Refuse':
 			cla
 			npc_rel['A218'] = 25
-			nichTanyaFuckLast = daystart
+			nichTanya['FuckLast'] = daystart
 			'"I don''t know about this, Tanya", you say carefully. "I mean, can you imagine me cleaning up and cooking, day in and day out? It doesn''t sound like me."'
 			'Her joyful expression falters and is quickly replaced with a cold, angry stare. "You just don''t want to be around me."'
 			'"No!", you exclaim, "No, of course I''d love to be around yo-"'
@@ -511,11 +511,11 @@ elseif $ARGS[0] = 'visitTanya':
 			'She bites down on her lip. Apparently her lust for you is bigger than her anger.'
 			'"Well, since you are here you could as well come in. Maybe you find a good way to apologize."'
 			killvar 'nichJobRefusedTReact'
-		elseif nichTanyaFuckLast = daystart - 1:
+		elseif nichTanya['FuckLast'] = daystart - 1:
 			'Tanya opens the door and smiles warmly at you. "Hello <<$pcs_nickname>>! I didn''t expect to see you so soon again."'
-		elseif nichTanyaFuckLast > daystart - 8:
+		elseif nichTanya['FuckLast'] > daystart - 8:
 			'Tanya opens the door and smiles warmly at you. "Hello <<$pcs_nickname>>! I was hoping you would show up today."'
-		elseif nichTanyaFuckLast > daystart - 30:
+		elseif nichTanya['FuckLast'] > daystart - 30:
 			'Tanya opens the door and smiles warmly at you. "Hello <<$pcs_nickname>>! Where have you been in the past weeks? I was beginning to wonder if you had forgotten me."'
 		else
 			'Tanya opens the door and smiles warmly at you. "Hello <<$pcs_nickname>>! After all these weeks of not hearing anything from you I was beginning to wonder if you would show up again. I''m very happy you did."'

locations/nichBedroomTanja.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		
 		act 'Spy':
 			*clr & cla
-			$nichTempPic = func('nichUtil','tanyaPic','sexH','spy','bf<<nichTanyaBF>>')
+			$nichTempPic = func('nichUtil','tanyaPic','sexH','spy','bf<<nichTanya[''BF'']>>')
 			'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 			'"Through the keyhole you can see Tanya and her boyfriend. They are obviously in the act of doing it."'
 			

locations/nichChore.qsrc

@@ -390,7 +390,7 @@ elseif $ARGS[0] = 'work':
 		nichRand = rand(1,100)
 		if nichChoreID = 5:
 			!! Tanyas room
-			if nichTanyaRelationship = 1 and nichTanyaDominance >= 20:
+			if nichTanya['Relationship'] = 1 and nichTanya['Dominance'] >= 20:
 				!! if Tanya and Sveta are in a relationship and Tanya is dominant
 				nichTanyPresent = FUNC('nichUtil','isPresent','tanya','bedroomTanya')
 				if nichTanyPresent ! 0:
@@ -400,7 +400,7 @@ elseif $ARGS[0] = 'work':
 						'When you start cleaning Tanya approaches you from behind and smacks you on your butt.'					
 						'"Hey <<$pcs_nickname>>, don''t miss that edge over there." she points at a small mess she obviously created on purpose.'
 						act 'Comply':
-							nichTanyaDominance += 2
+							nichTanya['Dominance'] += 2
 							'Once you are done cleaning up the first spot Tanya points you to another one. She obviously enjoys bossing you around, taking several opportunities to hit you on you butt again.'
 							minut += 10
 							cla
@@ -409,7 +409,7 @@ elseif $ARGS[0] = 'work':
 							end
 						end
 						act 'Tell her to stop this':
-							nichTanyaDominance -= 3
+							nichTanya['Dominance'] -= 3
 							'She looks a little bit disappointed as you tell her that you are not in the mood for this right now and want to focus on your work.'
 							cla
 							act 'Continue cleaning':

locations/nichLivingroom.qsrc

@@ -245,7 +245,7 @@ elseif $ARGS[0] = 'breakfast':
 		'"Of course, Master Nicholas." You reply as is expected of you.'
 		nichPregnancy = 1
 		nichAfterBFEvent = 90
-	elseif nichTanyaUni = 0 and (nichRand <= 20 or nichDebug = 1):
+	elseif nichTanya['Uni'] = 0 and (nichRand <= 20 or nichDebug = 1):
 		*nl
 		'Nicholas starts to read the newspaper. After a while he puts it aside and looks at Tanya.'
 		'"Tanya, I talked to one of my friends yesterday: Dimitrij Aslanov. I think you might know him."'
@@ -259,7 +259,7 @@ elseif $ARGS[0] = 'breakfast':
 		'Nicholas doesn''t look convinced by Tanyas change of heart. He drops the topic nevertheless and continues reading the newspaper.'
 		'Once he finishes he looks up and directs his next words at you. "<<$pcs_nickname>>, I would like to speak to you when you are done cleaning up the breakfast table."'
 		'"Of course, Master Nicholas." You reply as is expected of you.'
-		nichTanyaUni = 1
+		nichTanya['Uni'] = 1
 		nichAfterBFEvent = 1
 	elseif nichGalaKnowsPT = 1 and (nichRand <= 75 or nichDebug = 1):
 		*nl
@@ -334,7 +334,7 @@ elseif $ARGS[0] = 'breakfast':
 			'"<<$pcs_nickname>>, I am sure you heard what I said to Tanya earlier. I want her to become successful in life, to accomplish something on her own. But it seems as if she lacks the ambition to do so."'
 			'"The two of you seem to get along quite well. Maybe you could speak some sense into her?"'
 			act 'Agree':
-				nichTanyaUni = 11
+				nichTanya['Uni'] = 11
 				'"I will try, Master Nicholas."'
 				'He nods. "I won''t expect more from you than that."'
 				'He nods again, signalling you that you are dismissed for now.'

locations/nichTanya.qsrc

@@ -3,17 +3,17 @@
 !! Tanya is registered as NPC A218
 
 !! Important variables concerning Tanya:
-!! nichTanyaKnown: 0= no, 1= yes
-!! nichTanyaRelationship:
+!! nichTanya['Known']: 0= no, 1= yes
+!! nichTanya['Relationship']:
 !!					0= not in a relationship
 !!					1= in a relationship (sex is enabled)
-!! nichTanyaRelationshipState:
+!! nichTanya['RelationshipState']:
 !!					0 = they have never been together
 !!					10 = lovers (casually dating)
 !!					20 = girlfriends
 !!					1000-1009 = relationship broken up by Sveta
 !!					1010-1019 = relationship broken up by Tanya
-!! nichTanyaRelationshipBreakup:
+!! nichTanya['RelationshipBreakup']:
 !!					1 = Sveta has told Tanya that she doesnt want a real relationship. Break up can easily happen now.
 !! nichTanyaOpinion (deprecated!): 
 !!					0= she doesn't know you
@@ -21,46 +21,45 @@
 !!					10= you are her gf
 !!					20= you are her lover and told her you don't want to be her gf
 !!					30= you are her former lover
-!! nichTanyaBF: 0= she doesn't have a bf (includes her and Nicholas doing it, see nichNTRelation), 1= her bf is vladik, 2= her bf is grigory
-!! nichTanyaBFState: 0= PC hasn't met BF, 1 = PC has met BF, 2 = PC has fucked BF, 3 = PC has fucked BF and Tanya knows it
+!! nichTanya['BF']: 0= she doesn't have a bf (includes her and Nicholas doing it, see nichNTRelation), 1= her bf is vladik, 2= her bf is grigory
 
-!! nichTanyaDate: the type of date Tanya and Sveta are currently having
-!! nichTanyaDateCounter
-!! nichTanyaDateLast
-!! nichTanyaDateShopping: how many times Tanya and Sveta were shopping together (without special shopping events)
+!! nichTanya['Date']: the type of date Tanya and Sveta are currently having
+!! nichTanya['DateCounter']
+!! nichTanya['DateLast']
+!! nichTanya['DateShopping']: how many times Tanya and Sveta were shopping together (without special shopping events)
 
-!! nichTanyaFuckCounter: how many times Tanya and PC have fucked (doing it several times a day only counts once)
-!! nichTanyaFuckLast: the last day Tanya and PC have fucked
-!! nichTanyaFuckToday: how many times PC and Tanya have fucked today
-!! nichTanyaFuckPositions: how many positions there were during the current encounter. 3 are minimum and kissing does not count.
-!! nichTanyaFuckDom: how many times Tanya was dominant during the current encounter
-!! nichTanyaFuckSub: how many times Tanya was submissive during the current encounter
+!! nichTanya['FuckCounter']: how many times Tanya and PC have fucked (doing it several times a day only counts once)
+!! nichTanya['FuckLast']: the last day Tanya and PC have fucked
+!! nichTanya['FuckToday']: how many times PC and Tanya have fucked today
+!! nichTanya['FuckPositions']: how many positions there were during the current encounter. 3 are minimum and kissing does not count.
+!! nichTanya['FuckDom']: how many times Tanya was dominant during the current encounter
+!! nichTanya['FuckSub']: how many times Tanya was submissive during the current encounter
 
-!! nichTanyaStrapon: >0: Tanya owns a strapon and might use it sometimes (the value is the size of the strapon)
+!! nichTanya['Strapon']: >0: Tanya owns a strapon and might use it sometimes (the value is the size of the strapon)
 
-!! nichTanyaDominance: how dominant Tanya is <= -70: very submissive, <= -20: submissive, >= 20: dominant, >= 70 very dominant
-!! nichTanyaUni = 1: Nicholas has asked Tanya to go to university, 11: PC has agreed to help convince Tanya, 50: Tanya has decided to quit university and Nicholas hasnt reacted yet, 51: Nicholas has reacted to 50, 100: Tanya goes to university and Sveta has not been rewarded by Nicholas, 101: Sveta got her reward
-!! nichTanyaUniStart: the day Tanya decided to attend university again. Her schedule will not be affected on this day (meaning she will not just vanish to university)
+!! nichTanya['Dominance']: how dominant Tanya is <= -70: very submissive, <= -20: submissive, >= 20: dominant, >= 70 very dominant
+!! nichTanya['Uni'] = 1: Nicholas has asked Tanya to go to university, 11: PC has agreed to help convince Tanya, 50: Tanya has decided to quit university and Nicholas hasnt reacted yet, 51: Nicholas has reacted to 50, 100: Tanya goes to university and Sveta has not been rewarded by Nicholas, 101: Sveta got her reward
+!! nichTanya['UniStart']: the day Tanya decided to attend university again. Her schedule will not be affected on this day (meaning she will not just vanish to university)
 !! npc_rel['A218'] relationship value, only used for journal
 
-!! nichTanyaRoom: 0= Tanya doesnt clean her room herself, 1= Tanya cleans her room herself
+!! nichTanya['Room']: 0= Tanya doesnt clean her room herself, 1= Tanya cleans her room herself
 
 menu_off = 1
 
-if nichTanyaFuckLast ! daystart:
-	nichTanyaFuckToday = 0
+if nichTanya['FuckLast'] ! daystart:
+	nichTanya['FuckToday'] = 0
 end
 
 if $ARGS[0] = 'bedroomTanya':
 	$nichTanyaPic = func('nichUtil','tanyaPic','idle','apartment')
 	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
-	nichTanyaPropDate = 0
-	nichTanyaPropSex = 0
+	nichTanya['PropDate'] = 0
+	nichTanya['PropSex'] = 0
 	
 	
 	if nichGalaKnowsPT = 10:
 		!! Galas order to break up
-		if nichTanyaRelationship = 0:
+		if nichTanya['Relationship'] = 0:
 			!! they broke up already or never were together (most likely because the player tinkered with the vars)
 			nichGalaKnowsPT = 11
 			gt 'nichTanya', 'bedroomTanya'
@@ -72,44 +71,44 @@ if $ARGS[0] = 'bedroomTanya':
 				'You tell her how her mother demanded you to break up with her.'
 				'After you finished you look at Tanya waiting for her reaction.'
 				
-				if nichTanyaRelationshipBreakup = 1:
+				if nichTanya['RelationshipBreakup'] = 1:
 					'She does not appear to be very upset.'
 					'"Well, maybe she is right. After all you told me that you don''t want something more meaningful with me."'
 					'She hesitates for a second.'
 					'"And I really don''t want you to get into trouble with my mother. I think it would be for the best if stopped... well... whatever it is we are having."'
 					'You are about to object but Tanya seems to have made up her mind. So you can only nod and turn away.'
-					nichTanyaRelationship = 0
-					nichTanyaRelationshipState = 1010
+					nichTanya['Relationship'] = 0
+					nichTanya['RelationshipState'] = 1010
 					nichGalaKnowsPT = 11
 					npc_rel['A218'] = 30
-					killvar 'nichTanyaRelationshipBreakup'
+					nichTanya['RelationshipBreakup'] = 0
 					cla
 					act 'Leave':
 						gt $loc,'return'
 					end
-				elseif nichTanyaRelationshipState = 10:
+				elseif nichTanya['RelationshipState'] = 10:
 					'She does not appear to be very upset.'
 					'"Well, maybe she is right. I mean I wouldn''t have dreamt of being with a girl before I met you. And except for you I feel more attracted to men anyways."'
 					'She hesitates for a second.'
 					'"And I really don''t want you to get into trouble with my mother. I think it would be for the best if stopped... well... whatever it is we are having."'
 					'You are about to object but Tanya seems to have made up her mind. So you can only nod and turn away.'
-					nichTanyaRelationship = 0
-					nichTanyaRelationshipState = 1010
+					nichTanya['Relationship'] = 0
+					nichTanya['RelationshipState'] = 1010
 					nichGalaKnowsPT = 11
 					npc_rel['A218'] = 30
 					cla
 					act 'Leave':
 						gt $loc,'return'
 					end
-				elseif nichTanyaRelationshipState = 20:
+				elseif nichTanya['RelationshipState'] = 20:
 					'She appears very upset.'
 					'"What?! How can she..." she begins to sob. Trying to comfort her you embrace her.'
 					act 'Break up':
 						'"Tanya, I think you mother is right. It would be for the best if we broke up."'
 						'Hearing your words she pushes you away. Her eyes are watery but now she has an angry expression on her face.'
 						'"How can you?!" she yells at you. "Do I mean so little to you?! Get out of my room! Right! Now!"'
-						nichTanyaRelationship = 0
-						nichTanyaRelationshipState = 1000
+						nichTanya['Relationship'] = 0
+						nichTanya['RelationshipState'] = 1000
 						nichGalaKnowsPT = 11
 						npc_rel['A218'] = 10
 						cla
@@ -152,8 +151,8 @@ if $ARGS[0] = 'bedroomTanya':
 				end
 			end
 		end
-	elseif nichTanyaRelationshipBreakup = 1:
-		if nichTanyaFuckCounter > rand(20,30) and nichTanyaFuckToday = 0:
+	elseif nichTanya['RelationshipBreakup'] = 1:
+		if nichTanya['FuckCounter'] > rand(20,30) and nichTanya['FuckToday'] = 0:
 			'As you approach her she greets you with a smile. She walks over to her bed and sits down on the edge. Apparently she expects you to sit next to her.'
 			'Once you''he settled down she says with a serious voice "<<$pcs_nickname>>, we have to talk."'
 			'"You remember the boy I told you about? Well, we went out for a few dates. He is a really great guy and I think he genuinely loves me."'
@@ -166,18 +165,18 @@ if $ARGS[0] = 'bedroomTanya':
 			nichNTRelation = 10
 			act 'Sure':
 				cla
-				nichTanyaRelationship = 0
-				nichTanyaRelationshipState = 1011
+				nichTanya['Relationship'] = 0
+				nichTanya['RelationshipState'] = 1011
 				npc_rel['A218'] = 50
 				gs 'stat'
 				'"Of course."'
 				'"Oh <<$pcs_nickname>>, I hoped you''d say that." She hugs you.'
-				if nichTanyaUni >= 100:
+				if nichTanya['Uni'] >= 100:
 					'"You will meet Vlad shortly. I''m sure you will like him. He is a really nice guy."'
-					nichTanyaBF = 1
+					nichTanya['BF'] = 1
 				else
 					'"You will meet Grigory shortly. I''m sure you will like him. You two have much in common."'
-					nichTanyaBF = 2
+					nichTanya['BF'] = 2
 				end
 				
 				act 'Stand up':
@@ -187,11 +186,11 @@ if $ARGS[0] = 'bedroomTanya':
 			!!Todo: fight for her
 		else
 			'As you approach her she greets you with a smile.'
-			nichTanyaPropSex = 1
-			nichTanyaPropDate = 1
+			nichTanya['PropSex'] = 1
+			nichTanya['PropDate'] = 1
 		end
-	elseif nichTanyaRelationshipState = 10:
-		if nichTanyaFuckCounter > rand(12,15) and nichTanyaFuckToday = 0:
+	elseif nichTanya['RelationshipState'] = 10:
+		if nichTanya['FuckCounter'] > rand(12,15) and nichTanya['FuckToday'] = 0:
 			'As you approach her she greets you with a smile. She walks over to her bed and sits down on the edge. Apparently she expects you to sit next to her.'
 			'Once you''he settled down she says with a serious voice "<<$pcs_nickname>>, we have to talk."'
 			'You look at her. Her face does''t give away her thoughts.'
@@ -204,7 +203,7 @@ if $ARGS[0] = 'bedroomTanya':
 				'She looks a tiny bit disappointed. "Oh, that''s ok. So you wouldn''t mind if I brought a boy over here?"'
 				'"No, of course not."'
 				'"Well... that''s good... you have given me a lot to think about. Would you mind letting me think everything over?"'
-				nichTanyaRelationshipBreakup = 1
+				nichTanya['RelationshipBreakup'] = 1
 				act 'Of course not (Leave her)':
 					gt $loc
 				end
@@ -217,7 +216,7 @@ if $ARGS[0] = 'bedroomTanya':
 				'Once she is able to talk again she jumps up and hugs you. "Oh, this is so great. I am so happy now. Does this mean you are my girlfriend now?"'
 				'"I guess so."'
 				'Tanya looks overjoyed. Unable to find any more words to express her emotions she starts to hug and kiss you again.'
-				nichTanyaRelationshipState = 20
+				nichTanya['RelationshipState'] = 20
 				!! Tanya will break off with Nicholas
 				nichNTRelation = 10
 				npc_rel['A218'] += rand(8,12)
@@ -230,26 +229,26 @@ if $ARGS[0] = 'bedroomTanya':
 			end
 		else
 			'As you approach her she greets you with a smile.'
-			nichTanyaPropSex = 1
-			nichTanyaPropDate = 1
+			nichTanya['PropSex'] = 1
+			nichTanya['PropDate'] = 1
 		end
-	elseif nichTanyaRelationshipState = 20:
-		if nichTanyaFuckLast < daystart - 5:
+	elseif nichTanya['RelationshipState'] = 20:
+		if nichTanya['FuckLast'] < daystart - 5:
 			'As you approach her she greets you with a smile. "Hello sweety. Why didn''t you visit me lately? Have you been busy?"'
-		elseif nichTanyaFuckLast = daystart:
+		elseif nichTanya['FuckLast'] = daystart:
 			'As you approach her she greets you with a smile. "Hello sweety. Are you back for another round?"'
 		else
 			'As you approach her she greets you with a smile. "Hello sweety. How are you doing?"'
 		end
-		nichTanyaPropSex = 1
-		nichTanyaPropDate = 1
+		nichTanya['PropSex'] = 1
+		nichTanya['PropDate'] = 1
 	
 	end
 	
-	if nichTanyaPropSex = 1:
+	if nichTanya['PropSex'] = 1:
 		act 'Propose having sex':
 			cla
-			if nichTanyaFuckToday >= 3:
+			if nichTanya['FuckToday'] >= 3:
 				npc_rel['A218'] += rand(1,2)
 				'As you propose going for yet another round Tanya slowly shakes her head.'
 				'"I''m sorry, <<$pcs_nickname>>. I''m really exhausted. Doing it four times a day is too much for me. But we can cuddle if you''d like."'
@@ -271,30 +270,30 @@ if $ARGS[0] = 'bedroomTanya':
 		end
 	end
 	
-	if nichTanyaPropDate = 1 and (nichTanyaDateLast ! daystart or nichDebug = 1):
+	if nichTanya['PropDate'] = 1 and (nichTanya['DateLast'] ! daystart or nichDebug = 1):
 		act 'Propose going on a date':
 			npc_rel['A218'] += rand(1,2)
 			cla
 			*nl
-			nichTanyaDateCounter += 1
-			nichTanyaDateLast = daystart
+			nichTanya['DateCounter'] += 1
+			nichTanya['DateLast'] = daystart
 			'"Hey Tanya. I was wondering if you would like to go out on a date."'
 			'"Sure. That''s a great idea. What would you like to do?"'
 			act 'Let her pick':
 				cla
 				*nl
 				'"I don''t know. How about you?"'
-				if nichTanyaDominance >= 20 and nichTanyaStrapon = 0 and (rand(1,100) <= 50 or nichDebug = 1):
+				if nichTanya['Dominance'] >= 20 and nichTanya['Strapon'] = 0 and (rand(1,100) <= 50 or nichDebug = 1):
 					'"There is one thing I wanted to do with you for a while. Don''t ask what it is, it''s a surprise."'
-					nichTanyaDate = 100
+					nichTanya['Date'] = 100
 				else	
 					nichRand = rand(1,2)
 					if nichRand = 1:
 						'"There is a movie I''d like to see. I think they show it at the nearby movie theatre."'
-						nichTanyaDate = 1
+						nichTanya['Date'] = 1
 					else
 						'"Okay. Lets go shopping then."'
-						nichTanyaDate = 2
+						nichTanya['Date'] = 2
 					end
 				end
 				act 'Leave with her':
@@ -305,7 +304,7 @@ if $ARGS[0] = 'bedroomTanya':
 				cla
 				'"How about watching a movie?"'
 				'"Okay, sounds good. Lets go to the movie theatre then."'
-				nichTanyaDate = 1
+				nichTanya['Date'] = 1
 				act 'Leave with her':
 					gt 'nichTanya','date'
 				end
@@ -314,7 +313,7 @@ if $ARGS[0] = 'bedroomTanya':
 				cla
 				'"I''d like to go shopping."'
 				'"Great idea. Lets go to the mall then."'
-				nichTanyaDate = 2
+				nichTanya['Date'] = 2
 				act 'Leave with her':
 					gt 'nichTanya','date'
 				end
@@ -322,8 +321,8 @@ if $ARGS[0] = 'bedroomTanya':
 		end
 	end
 	
-	killvar 'nichTanyaPropDate'
-	killvar 'nichTanyaPropSex'
+	nichTanya['PropDate'] = 0
+	nichTanya['PropSex'] = 0
 	
 	act 'Talk with her':
 		gt 'nichTanya', 'chat'
@@ -336,7 +335,7 @@ if $ARGS[0] = 'bedroomTanya':
 elseif $ARGS[0] = 'bathroom':
 	'<center><img <<$set_imgh>> src="images/characters/city/tanya/idle/shower.jpg"></center>'
 	'Tanya is currently taking a shower. She hasn''t noticed you so far.'
-	if nichTanyaRelationship = 1:
+	if nichTanya['Relationship'] = 1:
 		act 'Join her':
 			npc_rel['A218'] += rand(2,4)
 			cla
@@ -365,11 +364,11 @@ elseif $ARGS[0] = 'bathroom':
 			gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
 			gs 'stat'
 		
-			if nichTanyaRelationshipState >= 1000 and nichTanyaRelationshipState < 1010:
+			if nichTanya['RelationshipState'] >= 1000 and nichTanya['RelationshipState'] < 1010:
 				'Tanya pushes you off.'
 				'"What the hell are you doing, <<$pcs_nickname>>?! First you break up with me and then you want to fuck me anyways? Get lost!"'	
 				act 'Leave': gs 'underwear', 'wear' & gs 'clothing', 'wear_last_worn' & gt 'nichBathMaster','return'
-			elseif nichTanyaRelationshipState >= 1010 and nichTanyaRelationshipState < 1020:
+			elseif nichTanya['RelationshipState'] >= 1010 and nichTanya['RelationshipState'] < 1020:
 				'Tanya pushes you off.'
 				'"What the hell are you doing, <<$pcs_nickname>>?! I told you it''s over! Get lost!"'	
 				act 'Leave': gs 'underwear', 'wear' & gs 'clothing', 'wear_last_worn' & gt 'nichBathMaster','return'
@@ -428,16 +427,16 @@ elseif $ARGS[0] = 'bathroomMolestSuccess':
 	'Just as the both of you are about to get more intimate you hear Tanyas name being called from outside the bathroom. She is clearly afraid of being spotted in the shower with you and quickly gets out of it and starts dressing.'
 	'"Sorry, <<$pcs_nickname>>. That what fun but I can''t risk being seen like this. Just talk to me in my room later. We have more privacy there."'
 	'With that she pushes you outside the bathroom once you are dressed.'
-	nichTanyaRelationship = 1
-	nichTanyaRelationshipState = 10
+	nichTanya['Relationship'] = 1
+	nichTanya['RelationshipState'] = 10
 	npc_rel['A218'] += 5
-	nichTanyaFuckLast = daystart
+	nichTanya['FuckLast'] = daystart
 	gs 'underwear', 'wear'
 	gs 'clothing', 'wear_last_worn'
 	gs 'stat'
 	act 'Back': gt 'nichApartment'
 elseif $ARGS[0] = 'date':
-	if nichTanyaDate = 1:
+	if nichTanya['Date'] = 1:
 		if nichDateState = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/cinema.jpg"></center>'
 			'The two of you head over to the cinema at the mall.'
@@ -491,14 +490,14 @@ elseif $ARGS[0] = 'date':
 				gt 'nichTanya','date'
 			end
 		else
-			killvar 'nichTanyaDate'
+			killvar 'nichTanya['Date']'
 			killvar 'nichDateState'
 			gt 'nichBedroomTanja'
 		end
-	elseif nichTanyaDate = 2:
-		if nichTanyaDateShopping = 0:
+	elseif nichTanya['Date'] = 2:
+		if nichTanya['DateShopping'] = 0:
 			minut += 120
-			nichTanyaDateShopping += 1
+			nichTanya['DateShopping'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping1.jpg"></center>'
 			'The two of you go to a shop for young fashion. You take turns trying on clothes and posing for each other.'
 			'You notice that the clothes Tanya puts on get skimpier every time. The last outfit she puts on only consists of high heels, a blue tanga and a skin tight white top.'
@@ -532,9 +531,9 @@ elseif $ARGS[0] = 'date':
 					gt 'nichBedroomTanja'
 				end
 			end
-		elseif nichTanyaDateShopping = 1:
+		elseif nichTanya['DateShopping'] = 1:
 			minut += 60
-			nichTanyaDateShopping += 1
+			nichTanya['DateShopping'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping2.jpg"></center>'
 			'The two of you visit various shops in the mall. One of the shops appears to be aimed at lumberjacks and truckers.'
 			'You take a look a the shirts and wonder why you are here. Then you realize that Tanya went missing. After a quick search you figure out that she must be in one of the chaning rooms.'
@@ -545,9 +544,9 @@ elseif $ARGS[0] = 'date':
 			act 'Return to the apartment':
 				gt 'nichBedroomTanja'
 			end
-		elseif nichTanyaDateShopping = 2:
+		elseif nichTanya['DateShopping'] = 2:
 			minut += 60
-			nichTanyaDateShopping += 1
+			nichTanya['DateShopping'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping3a.jpg"></center>'
 			'The two of you visit various shops in the mall. The last shop is an expensive boutique.'
 			'Tanya goes straight to the lingerie department. She collects some items, then she takes you by the hand and leads you to a changing room.'
@@ -597,7 +596,7 @@ elseif $ARGS[0] = 'date':
 			end
 		end
 	
-	elseif nichTanyaDate = 100:
+	elseif nichTanya['Date'] = 100:
 		!! Tanya wants to buy a dildo
 		if nichDateState = 0:
 			minut += 45
@@ -614,7 +613,7 @@ elseif $ARGS[0] = 'date':
 				'"There it is. I thought it would be fun to fuck you in a whole new way. And I think you should have a say in who your new ''lover'' will be."'
 				'She takes one of the strap-ons in her hand. "This one is called Vlad. How do you like it? Wait, there is one that''s called Igor. It''s a little bigger. Do you think you could handle it? Or how about this one? ''Labaan''. Sounds African. Look how big it is. It''s nearly as long and thick as my arm." She laughs out. "Which one would you prefer?"'
 				act 'Vlad (15 cm)':
-					nichTanyaStrapon = 15
+					nichTanya['Strapon'] = 15
 					'"I think I like Vlad best."'
 					if pcs_vag >= 25:
 						'"Really? I thought you might prefer a bigger one. But okay, I will buy this one then."'
@@ -628,7 +627,7 @@ elseif $ARGS[0] = 'date':
 					end
 				end			
 				act 'Igor (25 cm)':
-					nichTanyaStrapon = 25
+					nichTanya['Strapon'] = 25
 					'"I think I like Igor best."'
 					if pcs_vag >= 35:
 						'"Really? I thought you might prefer a bigger one. But okay, I will buy this one then."'
@@ -642,7 +641,7 @@ elseif $ARGS[0] = 'date':
 					end
 				end
 				act 'Labaan (35 cm)':
-					nichTanyaStrapon = 35
+					nichTanya['Strapon'] = 35
 					'"I think I like Labaan best."'
 					if pcs_vag <= 25:
 						'"Really? Are you sure? I didn''t think... well, it''s your choice. I will buy it then. Just don''t complain afterwards."'
@@ -691,7 +690,7 @@ elseif $ARGS[0] = 'date':
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/psovaginal/psovaginal0.jpg"></center>'
 			'Tanya mercilessly fucks you for more than ten minutes.'
 			'From your position you can''t see her. You can only feel her hands on your hips and her fake member grinding into you.'
-			dick = nichTanyaStrapon
+			dick = nichTanya['Strapon']
 			gs 'arousal', 'vaginal_strap', 15, 'lesbian', 'sub'
 			gs 'stat'
 			'After a while you hear a breath quicken. She pulls back your head by pulling on your hair. With a deep moan she cums.'
@@ -700,7 +699,7 @@ elseif $ARGS[0] = 'date':
 			minut += 15
 			act 'Finish':
 				gs 'arousal', 'end'
-				killvar 'nichTanyaDate'
+				nichTanya['Date'] = 0
 				killvar 'nichDateState'
 				gt 'nichBedroomTanja'
 			end
@@ -727,42 +726,50 @@ elseif $ARGS[0] = 'desc':
 	if month > nichTanyaBdM or (month = nichTanyaBdM and day > nichTanyaBdD):
 		'She is ' + (year - nichTanyaBdY) + ' years old.'
 	elseif month = nichTanyaBdM and day = nichTanyaBdD:
-		'Today is her ' + (year - nichTanyaBdY) + 'th birthday.'
+		if mid(year - nichTanyaBdY,4,1) = 1:
+			'Today is her ' + (year - nichTanyaBdY) + 'st birthday.'
+		if mid(year - nichTanyaBdY,4,1) = 2:
+			'Today is her ' + (year - nichTanyaBdY) + 'nd birthday.'
+		if mid(year - nichTanyaBdY,4,1) = 3:
+			'Today is her ' + (year - nichTanyaBdY) + 'rd birthday.'
+		else
+			'Today is her ' + (year - nichTanyaBdY) + 'th birthday.'
+		end
 	else
 		'She is ' + (year - nichTanyaBdY-1) + ' years old.'
 	end
 	
-	if nichTanyaRelationship = 0:
-		if nichTanyaRelationshipState = 0:
+	if nichTanya['Relationship'] = 0:
+		if nichTanya['RelationshipState'] = 0:
 			'She seems to be pretty indifferent about you.'
-		elseif nichTanyaRelationshipState >= 1000 and nichTanyaRelationshipState < 1010:
+		elseif nichTanya['RelationshipState'] >= 1000 and nichTanya['RelationshipState'] < 1010:
 			'The two of you have been together before you broke up with her.'
-		elseif nichTanyaRelationshipState >= 1010 and nichTanyaRelationshipState < 1020:
+		elseif nichTanya['RelationshipState'] >= 1010 and nichTanya['RelationshipState'] < 1020:
 			'The two of you have been together before she broke up with you.'
 		end
 	else
-		if nichTanyaRelationshipState = 10:
-			if nichTanyaRelationshipBreakup = 0:
+		if nichTanya['RelationshipState'] = 10:
+			if nichTanya['RelationshipBreakup'] = 0:
 				'She is your lesbian lover. You feel like she considers your relationship being casual. She probably wouldn''t mind if you had another lover. On the other hand she might have somebody else herself.'
 			else
 				'She is your lesbian lover. You told her that your relationship is a casual one. As far as you know there is at least one guy who is interested in her.'
 			end
-		elseif nichTanyaRelationshipState = 20:
+		elseif nichTanya['RelationshipState'] = 20:
 			'She is your girlfriend. She expects you to be faithful. Likewise you can expect the same from her.'
 		end
 	end
 	
-	if nichTanyaRelationship = 1:
-		if nichTanyaDominance >= 70:
-			'She acts very dominantly around you (<<nichTanyaDominance>>)'
-		elseif nichTanyaDominance >= 20:
-			'She acts dominantly around you (<<nichTanyaDominance>>)'
-		elseif nichTanyaDominance <= -70:
-			'She acts very submissively around you (<<nichTanyaDominance>>)'
-		elseif nichTanyaDominance <= -20:
-			'She acts submissively around you (<<nichTanyaDominance>>)'
+	if nichTanya['Relationship'] = 1:
+		if nichTanya['Dominance'] >= 70:
+			'She acts very dominantly around you (<<nichTanya[''Dominance'']>>)'
+		elseif nichTanya['Dominance'] >= 20:
+			'She acts dominantly around you (<<nichTanya[''Dominance'']>>)'
+		elseif nichTanya['Dominance'] <= -70:
+			'She acts very submissively around you (<<nichTanya[''Dominance'']>>)'
+		elseif nichTanya['Dominance'] <= -20:
+			'She acts submissively around you (<<nichTanya[''Dominance'']>>)'
 		else
-			'Her behaviour around you is neither remarkably dominant nor submissive (<<nichTanyaDominance>>)'
+			'Her behaviour around you is neither remarkably dominant nor submissive (<<nichTanya[''Dominance'']>>)'
 		end
 	end
 	
@@ -812,19 +819,19 @@ elseif $ARGS[0] = 'sexL':
 	
 	if $ARGS[1] = '' or $ARGS[1] = 'start':
 		!! the encounter starts here
-		nichTanyaFuckLast = daystart
-		if nichTanyaFuckToday = 0: nichTanyaFuckCounter += 1
-		nichTanyaFuckToday += 1
-		nichTanyaFuckDom = 0
-		nichTanyaFuckSub = 0
+		nichTanya['FuckLast'] = daystart
+		if nichTanya['FuckToday'] = 0: nichTanya['FuckCounter'] += 1
+		nichTanya['FuckToday'] += 1
+		nichTanya['FuckDom'] = 0
+		nichTanya['FuckSub'] = 0
 		$nichTempPic = func('nichUtil','tanyaPic','sexL','undress')
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'Tanya slowly undresses and poses seductively for you.'
 	elseif $ARGS[1] = 'repeat':
 		!! PC wants another round. Very similar to start but Tanya is already naked
-		nichTanyaFuckToday += 1
-		nichTanyaFuckDom = 0
-		nichTanyaFuckSub = 0
+		nichTanya['FuckToday'] += 1
+		nichTanya['FuckDom'] = 0
+		nichTanya['FuckSub'] = 0
 		$nichTempPic = func('nichUtil','tanyaPic','sexL','pose')
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'Tanya smiles at you and poses seductively, ready to go for another round.'
@@ -833,39 +840,39 @@ elseif $ARGS[0] = 'sexL':
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		!!TODO:description
 	elseif $ARGS[1] = 'aeatout':
-		nichTanyaFuckPositions += 1
+		nichTanya['FuckPositions'] += 1
 		$nichTempPic = func('nichUtil','tanyaPic','sexL','aeatout')
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'You begin by kissing her breasts, moving gradually down her body, lower and lower until you are facing her pussy. You start by gently caressing her swollen lips with up and down tongue lapping, up and down the swollen mound and moist slit, and getting ready to focus the tip of your tongue directly on her clitoris.  You part her outer lips with your fingers, spreading her pouty inner lips giving you full access to her puffy pink clitoris.'
 		gs 'arousal', 'cuni_give', -nichTempArousal, 'lesbian'
 		gs 'arousal', 'vaginal_finger_give', -nichTempArousal, 'lesbian'
 	elseif $ARGS[1] = 'peatout':
-		nichTanyaFuckPositions += 1
+		nichTanya['FuckPositions'] += 1
 		$nichTempPic = func('nichUtil','tanyaPic','sexL','peatout')
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'Tanya begins by dragging her tongue up your thighs to your crotch and plants light kisses from the top of your slit down to the opening of your vagina.  Her tongue pushes into your slickened hole a few times, then slides back up your cunny to caress your tingling clitoris again.'
 		gs 'arousal', 'cuni', -nichTempArousal, 'lesbian'
 	elseif $ARGS[1] = 'arimjob':
-		nichTanyaFuckPositions += 1
+		nichTanya['FuckPositions'] += 1
 		$nichTempPic = func('nichUtil','tanyaPic','sexL','arimjob')
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'You kiss her buttocks in ever decreasing circles, eventually getting to the center where her puckered anus is waiting.  Reaching your goal, you lick all around the tender star to get it plenty moist, then firmly push your tongue forward, penetrating her ass with just the tip.  You retract it, again licking all around her anus, and repeating your tongue invasion into that most private entrance.'
 		gs 'arousal', 'rimming_give', -nichTempArousal, 'lesbian'
 	elseif $ARGS[1] = 'primjob':
-		nichTanyaFuckPositions += 1
+		nichTanya['FuckPositions'] += 1
 		$nichTempPic = func('nichUtil','tanyaPic','sexL','primjob')
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'Tanya kisses your buttocks in ever decreasing circles, eventually getting to the center where your puckered anus is waiting.  Reaching her goal, she licks all around the tender star to get it plenty moist, then firmly pushes her tongue forward, penetrating your ass with just the tip.  She retracts it, again licking all around your anus, and repeats her tongue invasion into that most private entrance.'
 		gs 'arousal', 'rimming', -nichTempArousal, 'lesbian'
 	elseif $ARGS[1] = 'psovaginal':
-		nichTanyaFuckPositions += 1
+		nichTanya['FuckPositions'] += 1
 		$nichTempPic = func('nichUtil','tanyaPic','sexL','psovaginal')
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'You watch as Tanya puts on the strap-on, adjusting it to her hips and centering the fake cock, and then she moves to you and inserts it slowly into your pussy.  You moan and grind back at her while she fucks you with it.'
-		dick = nichTanyaStrapon
+		dick = nichTanya['Strapon']
 		gs 'arousal', 'vaginal_strap', -nichTempArousal, 'lesbian', 'sub'
 	elseif $ARGS[1] = 'asovaginal':
-		nichTanyaFuckPositions += 1
+		nichTanya['FuckPositions'] += 1
 		$nichTempPic = func('nichUtil','tanyaPic','sexL','astrapon')
 		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'You put on the strap-on, adjusting it to your hips and centering it. You let Tanya suck on it to moisten it up, then you insert it slowly into her pussy.  She moans and grinds back at you while you fuck her with it.'
@@ -879,15 +886,15 @@ elseif $ARGS[0] = 'sexL':
 		
 	gs 'stat'
 	
-	if nichTanyaDominance >= 70:
+	if nichTanya['Dominance'] >= 70:
 		nichTanyaChanceDom = 40
 		nichTanyaChanceSub = 5
-	elseif nichTanyaDominance >= 20:
+	elseif nichTanya['Dominance'] >= 20:
 		nichTanyaChanceDom = 20
-	elseif nichTanyaDominance <= -70:
+	elseif nichTanya['Dominance'] <= -70:
 		nichTanyaChanceDom = 5
 		nichTanyaChanceSub = 40
-	elseif nichTanyaDominance <= -30:
+	elseif nichTanya['Dominance'] <= -30:
 		nichTanyaChanceSub = 20
 	end
 	
@@ -896,9 +903,9 @@ elseif $ARGS[0] = 'sexL':
 	if nichRand <= nichTanyaChanceDom:
 		!! Tanya is dominant
 		nichRand = rand(0,2)
-		if nichRand = 0 and nichTanyaStrapon > 0:
+		if nichRand = 0 and nichTanya['Strapon'] > 0:
 			!!Tanya wants to use her strapon
-			if nichTanyaDominance >= 70:
+			if nichTanya['Dominance'] >= 70:
 				'Tanya takes out the strap-on the two of you bought together. Apparently she expects you to submit to her false member.'
 			else
 				'Tanya takes out the strap-on the two of you bought together.'
@@ -907,36 +914,36 @@ elseif $ARGS[0] = 'sexL':
 				gt 'nichTanya','sexL','kiss'
 			end
 			act 'Get fucked':
-				nichTanyaFuckDom += 2
+				nichTanya['FuckDom'] += 2
 				gt 'nichTanya','sexL','psovaginal'
 			end
 		elseif nichRand <= 1:
 			!! Tanya wants her pussy to be eaten
-			if nichTanyaDominance >= 70:
+			if nichTanya['Dominance'] >= 70:
 				'Tanya pushes your head in the direction of her vagina. Apparently she expects you to service her with your tongue.'
 			else
 				'Tanya softly directs your head in the direction of her vagina. Apparently she would like you to service her with your tongue.'
 			end
 			act 'Lick her':
-				nichTanyaFuckDom += 1
+				nichTanya['FuckDom'] += 1
 				gt 'nichTanya','sexL','aeatout'
 			end
 			act 'Have her lick you instead':
-				nichTanyaFuckSub += 1
+				nichTanya['FuckSub'] += 1
 				gt 'nichTanya','sexL','peatout'
 			end
 		else
-			if nichTanyaDominance >= 70:
+			if nichTanya['Dominance'] >= 70:
 				'Tanya pushes your head in the direction of her vagina. When she turns around you realize that it''s actually a rimjob she expects from you.'
 			else
 				'Tanya softly directs your head in the direction of her ass. Apparently she would like you to service her asshole with your tongue.'
 			end
 			act 'Lick her':
-				nichTanyaFuckDom += 1
+				nichTanya['FuckDom'] += 1
 				gt 'nichTanya','sexL','arimjob'
 			end
 			act 'Have her lick you instead':
-				nichTanyaFuckSub += 1
+				nichTanya['FuckSub'] += 1
 				gt 'nichTanya','sexL','primjob'
 			end
 		end
@@ -949,22 +956,22 @@ elseif $ARGS[0] = 'sexL':
 			'Tanya smiles at you while she approaches your vagina with her head. Apparently she wants to eat your pussy.'
 
 			act 'Lick her instead':
-				nichTanyaFuckDom += 1
+				nichTanya['FuckDom'] += 1
 				gt 'nichTanya','sexL','aeatout'
 			end
 			act 'Have her lick you':
-				nichTanyaFuckSub += 1
+				nichTanya['FuckSub'] += 1
 				gt 'nichTanya','sexL','peatout'
 			end
 		!!elseif nichRand = 1:
 		else
 			'Tanya approaches you from behind, her hands gently resting on your buttcheeks. Glancing behind you you see her approaching your ass with her tongue sticked out. Apparently she want to give you a rimjob.'
 			act 'Lick her instead':
-				nichTanyaFuckDom += 1
+				nichTanya['FuckDom'] += 1
 				gt 'nichTanya','sexL','arimjob'
 			end
 			act 'Have her lick you':
-				nichTanyaFuckSub += 1
+				nichTanya['FuckSub'] += 1
 				gt 'nichTanya','sexL','primjob'
 			end
 		end
@@ -975,46 +982,46 @@ elseif $ARGS[0] = 'sexL':
 			gt 'nichTanya','sexL','kiss'
 		end
 		act 'Lick her':
-			nichTanyaFuckDom += 1
+			nichTanya['FuckDom'] += 1
 			gt 'nichTanya','sexL','aeatout'
 		end
 		act 'Have her lick you':
-			nichTanyaFuckSub += 1
+			nichTanya['FuckSub'] += 1
 			gt 'nichTanya','sexL','peatout'
 		end
 		act 'Give rimjob':
-			nichTanyaFuckDom += 1
+			nichTanya['FuckDom'] += 1
 			gt 'nichTanya','sexL','arimjob'
 		end
 		act 'Receive rimjob':
-			nichTanyaFuckSub += 1
+			nichTanya['FuckSub'] += 1
 			gt 'nichTanya','sexL','primjob'
 		end
-		if nichTanyaStrapon > 0:
+		if nichTanya['Strapon'] > 0:
 			act 'Get fucked (her strapon)':
-				nichTanyaFuckDom += 1
+				nichTanya['FuckDom'] += 1
 				gt 'nichTanya','sexL','psovaginal'
 			end
 		end
 		if strapon > 0:
 			act 'Fuck her (your strapon)':
-				nichTanyaFuckSub += 1
+				nichTanya['FuckSub'] += 1
 				gt 'nichTanya','sexL','asovaginal'
 			end
 		end
-		if nichTanyaFuckPositions >= 3:
+		if nichTanya['FuckPositions'] >= 3:
 			act 'Finish':
-				if nichTanyaFuckSub >= nichTanyaFuckDom * 3:
-					nichTanyaDominance -= 2
-				elseif nichTanyaFuckDom >= nichTanyaFuckSub * 3:
-					nichTanyaDominance += 2
+				if nichTanya['FuckSub'] >= nichTanya['FuckDom'] * 3:
+					nichTanya['Dominance'] -= 2
+				elseif nichTanya['FuckDom'] >= nichTanya['FuckSub'] * 3:
+					nichTanya['Dominance'] += 2
 				end
 				
-				nichTanyaDominance = min(100,max(nichTanyaDominance,-100))
+				nichTanya['Dominance'] = min(100,max(nichTanya['Dominance'],-100))
 				
-				killvar 'nichTanyaFuckPositions'
-				killvar 'nichTanyaFuckDom'
-				killvar 'nichTanyaFuckSub'
+				killvar 'nichTanya['FuckPositions']'
+				killvar 'nichTanya['FuckDom']'
+				killvar 'nichTanya['FuckSub']'
 				
 				gs 'arousal','end'
 				
@@ -1069,7 +1076,7 @@ elseif $ARGS[0] = 'sexLAfter':
 		gt 'nichTanya', 'cuddle'
 	end
 	act 'Another round':
-		if nichTanyaFuckToday >= 3:
+		if nichTanya['FuckToday'] >= 3:
 			'As you propose going for yet another round Tanya slowly shakes her head.'
 			'"I''m sorry, <<$pcs_nickname>>. I''m really exhausted. Doing it four times a day is too much for me. But we can cuddle if you''d like."'
 		else
@@ -1086,9 +1093,9 @@ elseif $ARGS[0] = 'chat':
 	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
 	if $ARGS[1] = 'relationship':
 		'"How do you feel about us, Tanya?"'
-		if nichTanyaRelationshipState = 10:
+		if nichTanya['RelationshipState'] = 10:
 			'"I like our special times together. I really do. Before I met you I would never have dreamt of doing it with a woman. I don''t know if it is you or me but being with you doesn''t feel wrong. It''s quite the opposite really."'
-		elseif 	nichTanyaRelationshipState = 20:
+		elseif 	nichTanya['RelationshipState'] = 20:
 			'"You know I love you. Just spending time with you always makes me a bit happier."'
 		end
 		
@@ -1132,7 +1139,7 @@ elseif $ARGS[0] = 'chat':
 			
 			act 'His marriage':
 				'"What do you think about his marriage to your mother?"'
-				if nichTanyaRelationship = 0:
+				if nichTanya['Relationship'] = 0:
 					'"I don''t think I''d feel comfortable talking about this."'
 				else
 					'"I heard some people saying that my mother only married Nicholas for his money. But I can''t believe that. They have some problems. Maybe even big ones. But don''t all couples have some of them?"'
@@ -1165,16 +1172,16 @@ elseif $ARGS[0] = 'chat':
 		end
 	elseif $ARGS[1] = 'room':
 		'"I''d like to talk about your room."'
-		if nichTanyaRoom = 1:
+		if nichTanya['Room'] = 1:
 			'"Okay. I cleaned it just as you asked me to."'
 		else
 			'"Really? What about it?"'
 			act 'Have Tanya clean it':
 				cla
 				'"I think you should clean it yourself from now on."'
-				if nichTanyaDominance <= -30:
+				if nichTanya['Dominance'] <= -30:
 					'"Well, I guess you are right. I will try to keep the room clean from now on."'
-					nichTanyaRoom = 1
+					nichTanya['Room'] = 1
 					nichChoreState[5] = 0
 				else
 					'"Sorry, <<$pcs_nickname>>, but Nicholas pays you to clean it. Therefore you will be the one cleaning it."'
@@ -1189,7 +1196,7 @@ elseif $ARGS[0] = 'chat':
 		end	
 	else
 		'"What would you like to talk about?"'
-		if nichTanyaRelationship = 1:
+		if nichTanya['Relationship'] = 1:
 			act 'Our relationship':
 				gt 'nichTanya','chat', 'relationship'
 			end
@@ -1211,7 +1218,7 @@ elseif $ARGS[0] = 'chat':
 			gt 'nichTanya','chat', 'family'
 		end
 		
-		if nichTanyaUni = 11:
+		if nichTanya['Uni'] = 11:
 			act 'University':
 				'"I talked with Nicholas. And he really would like you to attend your courses at university."'
 				'"I know, I know!" Tanya seems to be annoyed "But I don''t know if university is the right place for me. What do you think?"'
@@ -1220,26 +1227,26 @@ elseif $ARGS[0] = 'chat':
 					'"I think you should take university seriously."'
 					'"Really? And why would I listen to you?"'
 					cla
-					if nichTanyaRelationshipState = 20:
+					if nichTanya['RelationshipState'] = 20:
 						act 'I love you (relationship)':
 							'"I love you and I only want the best for you. And I know that going to university is the best decision for your future."'
 							'She bites down on her lip and hesitates for a few seconds.'
 							'"I love you too. You know I do. And maybe you are right. I think I will give university another shot."'
-							nichTanyaUni = 100
-							nichTanyaUniStart = daystart
+							nichTanya['Uni'] = 100
+							nichTanya['UniStart'] = daystart
 							cla
 							act 'Another topic':
 								gt 'nichTanya', 'chat'
 							end
 						end
 					end
-					if nichTanyaDominance <= -30:
+					if nichTanya['Dominance'] <= -30:
 						act 'Because I tell you to (submissive Tanya)':
 							'"Because I tell you to."'
 							'She bites down on her lip and hesitates for a few seconds.'
 							'"Maybe you are right. I think I will give university another shot."'
-							nichTanyaUni = 100
-							nichTanyaUniStart = daystart
+							nichTanya['Uni'] = 100
+							nichTanya['UniStart'] = daystart
 							cla
 							act 'Another topic':
 								gt 'nichTanya', 'chat'
@@ -1251,8 +1258,8 @@ elseif $ARGS[0] = 'chat':
 							'"I know what I am talking about. I am a student myself."'
 							'She bites down on her lip and hesitates for a few seconds.'
 							'"Maybe you are right. I think I will give university another shot."'
-							nichTanyaUni = 100
-							nichTanyaUniStart = daystart
+							nichTanya['Uni'] = 100
+							nichTanya['UniStart'] = daystart
 							cla
 							act 'Another topic':
 								gt 'nichTanya', 'chat'
@@ -1264,8 +1271,8 @@ elseif $ARGS[0] = 'chat':
 							'"Just believe me. It will be the best for you in the long run."'
 							'She bites down on her lip and hesitates for a few seconds.'
 							'"Maybe you are right. I think I will give university another shot."'
-							nichTanyaUni = 100
-							nichTanyaUniStart = daystart
+							nichTanya['Uni'] = 100
+							nichTanya['UniStart'] = daystart
 							cla
 							act 'Another topic':
 								gt 'nichTanya', 'chat'
@@ -1279,7 +1286,7 @@ elseif $ARGS[0] = 'chat':
 				act 'You should quit university':
 					'"I agree with you. University is not for everybody. I think you will be happier without it."'
 					'Tanya beams at you. "Exactly! Thank you for your advise. I guess I will take it to heart."'
-					nichTanyaUni = 50
+					nichTanya['Uni'] = 50
 					cla
 					act 'Another topic':
 						gt 'nichTanya', 'chat'

locations/nichUtil.qsrc

@@ -46,28 +46,28 @@ elseif $ARGS[0] = 'debug':
 			gs 'nichUtil','clearVars'
 			abonement = 30
 			nichWork = 0
-			nichTanyaRelationship = 0
-			nichTanyaRelationshipState = 0
-			nichTanyaRelationshipBreakup = 0
-			nichTanyaFuckCounter = 0
+			nichTanya['Relationship'] = 0
+			nichTanya['RelationshipState'] = 0
+			nichTanya['RelationshipBreakup'] = 0
+			nichTanya['FuckCounter'] = 0
 			gt 'fit','start'
 		elseif $ARGS[2] = 'getHired':
 			nichWork = 0
-			nichTanyaRelationship = 1
-			nichTanyaRelationshipState = 10
-			nichTanyaRelationshipBreakup = 0
+			nichTanya['Relationship'] = 1
+			nichTanya['RelationshipState'] = 10
+			nichTanya['RelationshipBreakup'] = 0
 			nichJobRefused = 0
-			nichTanyaFuckCounter = 6
+			nichTanya['FuckCounter'] = 6
 			hour = 16
 			gt 'city_center'
 		elseif $ARGS[2] = 'tanyaDate100':
 			nichWork = 2
-			nichTanyaRelationship = 1
-			nichTanyaRelationshipState = 10
-			nichTanyaRelationshipBreakup = 0
-			nichTanyaFuckCounter = 6
-			nichTanyaDominance = 30
-			nichTanyaStrapon = 0
+			nichTanya['Relationship'] = 1
+			nichTanya['RelationshipState'] = 10
+			nichTanya['RelationshipBreakup'] = 0
+			nichTanya['FuckCounter'] = 6
+			nichTanya['Dominance'] = 30
+			nichTanya['Strapon'] = 0
 			nichGalaKnowsPT = 0
 			hour = 16
 			$loc = 'nichBedroomTanja'
@@ -142,14 +142,14 @@ elseif $ARGS[0] = 'debug':
 	
 	'<b>Tanya</b>'
 	'Set relationship to:'
-	'-<a href="exec: nichTanyaRelationship = 0 & nichTanyaRelationshipState = 0    & gt ''nichUtil'', ''debug''">Not together (and never have been)</a>'
-	'-<a href="exec: nichTanyaRelationship = 0 & nichTanyaRelationshipState = 1000 & gt ''nichUtil'', ''debug''">Not together (you broke up)</a>'
-	'-<a href="exec: nichTanyaRelationship = 0 & nichTanyaRelationshipState = 1010 & gt ''nichUtil'', ''debug''">Not together (Tanya broke up)</a>'
-	'-<a href="exec: nichTanyaRelationship = 1 & nichTanyaRelationshipState = 10   & gt ''nichUtil'', ''debug''">Casually dating</a>'
-	'-<a href="exec: nichTanyaRelationship = 1 & nichTanyaRelationshipState = 20   & gt ''nichUtil'', ''debug''">In a relationship</a>'
-	'You fucked Tanya <<nichTanyaFuckCounter>> times'
-	'The last time you fucked Tanya was '+(daystart-nichTanyaFuckLast)+' days ago'
-	'Tanya has a dominance of <<nichTanyaDominance>> (range: -100 - 100)'
+	'-<a href="exec: nichTanya[''Relationship''] = 0 & nichTanya[''RelationshipState''] = 0    & gt ''nichUtil'', ''debug''">Not together (and never have been)</a>'
+	'-<a href="exec: nichTanya[''Relationship''] = 0 & nichTanya[''RelationshipState''] = 1000 & gt ''nichUtil'', ''debug''">Not together (you broke up)</a>'
+	'-<a href="exec: nichTanya[''Relationship''] = 0 & nichTanya[''RelationshipState''] = 1010 & gt ''nichUtil'', ''debug''">Not together (Tanya broke up)</a>'
+	'-<a href="exec: nichTanya[''Relationship''] = 1 & nichTanya[''RelationshipState''] = 10   & gt ''nichUtil'', ''debug''">Casually dating</a>'
+	'-<a href="exec: nichTanya[''Relationship''] = 1 & nichTanya[''RelationshipState''] = 20   & gt ''nichUtil'', ''debug''">In a relationship</a>'
+	'You fucked Tanya <<nichTanya[''FuckCounter'']>> times'
+	'The last time you fucked Tanya was '+(daystart-nichTanya[''FuckLast''])+' days ago'
+	'Tanya has a dominance of <<nichTanya[''Dominance'']>> (range: -100 - 100)'
 	
 	act 'DEBUG: New Workday': gs 'nichUtil', 'startWorkday'
 	
@@ -229,8 +229,8 @@ elseif $ARGS[0] = 'startWorkday':
 	nichChoreState[3] += 5
 	!! 4: laundry
 	nichChoreState[4] += 5
-	!! 5: tanya bedroom, if nichTanyaRoom = 1 she will clean it herself
-	if nichTanyaRoom = 0:
+	!! 5: tanya bedroom, if nichTanya['Room'] = 1 she will clean it herself
+	if nichTanya['Room'] = 0:
 		nichChoreState[5] += 5
 	end
 	!! 6: master bathroom
@@ -314,7 +314,7 @@ elseif $ARGS[0] = 'clearVars':
 	killvar 'nichNTRelation'
 	killvar 'nichSex'
 	
-	!!Do not kill nichTanyaUni
+	!!Do not kill nichTanya['Uni']
 	!!Do not kill Tanyas fuck vars since Sveta might meet her after leaving her job
 	killvar 'nichTanyaSpyLast'
 	killvar 'nichTanyaSpyCounter'
@@ -746,7 +746,7 @@ if $ARGS[0] = 'npcActivity':
 		
 		!! TODO: daily activities
 		!! Tanya will go to university from 10:15-14:00
-		if nichTanyaUni >= 100 and nichTanyaUniStart ! daystart:
+		if nichTanya['Uni'] >= 100 and nichTanya['UniStart'] ! daystart:
 			if week <= 5:
 				gs 'nichUtil', 'npcActivityAdd', 'leaveUni', 10 , 20
 				gs 'nichUtil', 'npcActivityAdd', 'uni', 14 , 0
@@ -792,7 +792,7 @@ if $ARGS[0] = 'npcActivity':
 			!! Needs to have corresponding entries to Nicholas entries.
 			if nichNTRelation < 10:
 				gs 'nichUtil', 'npcActivityAdd', 'nicholas', 22 , 0
-			elseif nichTanyaBF > 0:
+			elseif nichTanya['BF'] > 0:
 				gs 'nichUtil', 'npcActivityAdd', 'boyfriend', 23 , 0
 			else
 				gs 'nichUtil', 'npcActivityAdd', 'tanya', 22 , 0

locations/saveupdater.qsrc

@@ -1502,8 +1502,57 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	end
 end
 
-if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080806:
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080900:
 	if $wardrobeDefaultPagePref = 'savedOutfits':$wardrobeDefaultPagePref = 'default1'
+	
+	if nichTanyaKnown = 1:
+		nichTanya['Known'] = nichTanyaKnown
+		nichTanya['Relationship'] = nichTanyaRelationship
+		nichTanya['RelationshipState'] = nichTanyaRelationshipState
+		nichTanya['RelationshipBreakup'] = nichTanyaRelationshipBreakup
+		nichTanya['BF'] = nichTanyaBF
+		nichTanya['Date'] = nichTanyaDate
+		nichTanya['DateCounter'] = nichTanyaDateCounter
+		nichTanya['DateLast'] = nichTanyaDateLast
+		nichTanya['DateShopping'] = nichTanyaDateShopping
+		nichTanya['FuckCounter'] = nichTanyaFuckCounter
+		nichTanya['FuckLast'] = nichTanyaFuckLast
+		nichTanya['FuckToday'] = nichTanyaFuckToday
+		nichTanya['FuckPositions'] = nichTanyaFuckPositions
+		nichTanya['FuckDom'] = nichTanyaFuckDom
+		nichTanya['FuckSub'] = nichTanyaFuckSub
+		nichTanya['Strapon'] = nichTanyaStrapon
+		nichTanya['Dominance'] = nichTanyaDominance
+		nichTanya['Uni'] = nichTanyaUni
+		nichTanya['UniStart'] = nichTanyaUniStart
+		nichTanya['Room'] = nichTanyaRoom
+		nichTanya['PropSex'] = nichTanyaPropSex
+		nichTanya['PropDate'] = nichTanyaPropDate
+		
+		killvar 'nichTanyaKnown'
+		killvar 'nichTanyaRelationship'
+		killvar 'nichTanyaRelationshipState'
+		killvar 'nichTanyaRelationshipBreakup'
+		killvar 'nichTanyaBF'
+		killvar 'nichTanyaBFState'
+		killvar 'nichTanyaDate'
+		killvar 'nichTanyaDateCounter'
+		killvar 'nichTanyaDateLast'
+		killvar 'nichTanyaDateShopping'
+		killvar 'nichTanyaFuckCounter'
+		killvar 'nichTanyaFuckLast'
+		killvar 'nichTanyaFuckToday'
+		killvar 'nichTanyaFuckPositions'
+		killvar 'nichTanyaFuckDom'
+		killvar 'nichTanyaFuckSub'
+		killvar 'nichTanyaStrapon'
+		killvar 'nichTanyaDominance'
+		killvar 'nichTanyaUni'
+		killvar 'nichTanyaUniStart'
+		killvar 'nichTanyaRoom'
+		killvar 'nichTanyaPropSex'
+		killvar 'nichTanyaPropDate'
+	end
 end
 
 if traits > 0 or trait > 0: