[changed] Collated some Tanya variables and adjusted number of sex visits to unlock overnight stays and maid job offer

locations/city_center.qsrc

@@ -225,7 +225,7 @@ end
 
 
 if Enable_tablemap = 0:
-	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 nichTanya['Relationship'] > 0 and nichTanya['Relationship'] < 4 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 sex shop owner''s apartment.'
 else
 	st_count=0 & $show_table=''
-	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 nichTanya['Relationship'] > 0 and nichTanya['Relationship'] < 4 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

@@ -311,7 +311,6 @@ if $ARGS[0] = 'tanyaIntroduction':
 	gs 'panties', 'dispose'
 	gs 'clothing', 'wear_last_worn'
 	nichTanya['Relationship'] = 1
-	nichTanya['RelationshipState'] = 10
 	nichTanya['Known'] = 1
 	npc_rel['A218'] += 5
 	nichTanya['FuckLast'] = daystart

locations/nichApartment.qsrc

@@ -426,7 +426,7 @@ if $ARGS[0] = 'visitTanya':
 	
 	if nichWork = 1:
 		gt 'nichApartment', 'agreed_to_job'
-	elseif nichTanya['FuckCounter'] > rand(3,5) and nichJobRefused < 1 and nichWork = 0 and FUNC('body_din','pregnancyVisibility',0,'nude') = 0:
+	elseif nichTanya['FuckCounter'] > rand(15,18) 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!
 		gt 'nichApartment', 'job_offer'
 	else
@@ -435,7 +435,7 @@ if $ARGS[0] = 'visitTanya':
 end
 
 if $ARGS[0] = 'agreed_to_job':
-	if npc_rel['A218'] < 30: npc_rel['A218'] += rand(1,2)
+	if npc_rel['A218'] < 50: 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 nichTanya['FuckLast'] = daystart:

locations/nichChore.qsrc

@@ -390,7 +390,7 @@ elseif $ARGS[0] = 'work':
 		nichRand = rand(1,100)
 		if nichChoreID = 5:
 			!! Tanyas room
-			if nichTanya['Relationship'] = 1 and nichTanya['Dominance'] >= 20:
+			if nichTanya['Relationship'] > 0 and nichTanya['Relationship'] < 4 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:

locations/nichTanya.qsrc

@@ -6,15 +6,12 @@
 !! nichTanya['Known']: 0= no, 1= yes
 !! nichTanya['Relationship']:
 !!					0= not in a relationship
-!!					1= in a relationship (sex is enabled)
-!! 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
-!! nichTanya['RelationshipBreakup']:
-!!					1 = Sveta has told Tanya that she doesnt want a real relationship. Break up can easily happen now.
+!!					1= fuck buddy
+!!					2= friend with benefits
+!!					3= lovers
+!!					4= relationship ended by Sveta
+!!					5= relationship ended by Tanya
+!!					6= relationship ended as Tanya has bf
 !! 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
 
 !! nichTanya['Date']: the type of date Tanya and Sveta are currently having
@@ -64,44 +61,40 @@ 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 nichTanya['RelationshipBreakup'] = 1:
+				if nichTanya['Relationship'] = 2:
 					'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.'
-					nichTanya['Relationship'] = 0
-					nichTanya['RelationshipState'] = 1010
+					nichTanya['Relationship'] = 5
 					nichGalaKnowsPT = 11
 					npc_rel['A218'] = 30
-					nichTanya['RelationshipBreakup'] = 0
 					cla
 					act 'Leave':
 						gt $loc,'return'
 					end
-				elseif nichTanya['RelationshipState'] = 10:
+				elseif nichTanya['Relationship'] = 1:
 					'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.'
-					nichTanya['Relationship'] = 0
-					nichTanya['RelationshipState'] = 1010
+					nichTanya['Relationship'] = 5
 					nichGalaKnowsPT = 11
 					npc_rel['A218'] = 30
 					cla
 					act 'Leave':
 						gt $loc,'return'
 					end
-				elseif nichTanya['RelationshipState'] = 20:
+				elseif nichTanya['Relationship'] = 3:
 					'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!"'
-						nichTanya['Relationship'] = 0
-						nichTanya['RelationshipState'] = 1000
+						nichTanya['Relationship'] = 4
 						nichGalaKnowsPT = 11
 						npc_rel['A218'] = 10
 						cla
@@ -144,8 +137,8 @@ if $ARGS[0] = 'bedroomTanya':
 				end
 			end
 		end
-	elseif nichTanya['RelationshipBreakup'] = 1:
-		if nichTanya['FuckCounter'] > rand(20,30) and nichTanya['FuckToday'] = 0:
+	elseif nichTanya['Relationship'] = 2:
+		if nichTanya['FuckCounter'] > rand(30,40) 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."'
@@ -159,7 +152,7 @@ if $ARGS[0] = 'bedroomTanya':
 			act 'Sure':
 				cla
 				nichTanya['Relationship'] = 0
-				nichTanya['RelationshipState'] = 1011
+				nichTanya['Relationship'] = 6
 				npc_rel['A218'] = 50
 				gs 'stat'
 				'"Of course."'
@@ -182,8 +175,8 @@ if $ARGS[0] = 'bedroomTanya':
 			nichTanya['PropSex'] = 1
 			nichTanya['PropDate'] = 1
 		end
-	elseif nichTanya['RelationshipState'] = 10:
-		if nichTanya['FuckCounter'] > rand(12,15) and nichTanya['FuckToday'] = 0:
+	elseif nichTanya['Relationship'] = 1:
+		if nichTanya['FuckCounter'] > rand(22,25) 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.'
@@ -196,7 +189,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?"'
-				nichTanya['RelationshipBreakup'] = 1
+				nichTanya['Relationship'] = 2
 				act 'Of course not (Leave her)':
 					gt $loc
 				end
@@ -209,7 +202,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.'
-				nichTanya['RelationshipState'] = 20
+				nichTanya['Relationship'] = 3
 				!! Tanya will break off with Nicholas
 				nichNTRelation = 10
 				gs 'npc_relationship', 'modify', 'A218', 'adore'
@@ -225,7 +218,7 @@ if $ARGS[0] = 'bedroomTanya':
 			nichTanya['PropSex'] = 1
 			nichTanya['PropDate'] = 1
 		end
-	elseif nichTanya['RelationshipState'] = 20:
+	elseif nichTanya['Relationship'] = 3:
 		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 nichTanya['FuckLast'] = daystart:
@@ -826,7 +819,7 @@ if $ARGS[0] = 'date_end':
 
 		act 'Chat with Tanya': gt 'nichTanya', 'chat'
 
-		if npc_rel['A218'] < 40 or nichTanya['Date_stay'] = 1:
+		if nichTanya['FuckCounter'] < rand(7,12) or nichTanya['Date_stay'] = 1:
 			act 'Say goodbye to Tanya':
 				*clr & cla
 				'You, in turn smile at her and reply. "Yes it was Tanya, I had a really great time. However, regrettably I need to get going so see you soon."'
@@ -969,7 +962,7 @@ end
 if $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 nichTanya['Relationship'] = 1:
+	if nichTanya['Relationship'] > 0 and nichTanya['Relationship'] < 4:
 		act 'Join her':
 			gs 'npc_relationship', 'modify', 'A218', 'like'
 			cla
@@ -998,11 +991,11 @@ if $ARGS[0] = 'bathroom':
 			gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
 			gs 'stat'
 
-			if nichTanya['RelationshipState'] >= 1000 and nichTanya['RelationshipState'] < 1010:
+			if nichTanya['Relationship'] = 4:
 				'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 nichTanya['RelationshipState'] >= 1010 and nichTanya['RelationshipState'] < 1020:
+			elseif nichTanya['Relationship'] >= 5:
 				'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'
@@ -1064,7 +1057,6 @@ if $ARGS[0] = 'bathroomMolestSuccess':
 	'"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.'
 	nichTanya['Relationship'] = 1
-	nichTanya['RelationshipState'] = 10
 	gs 'npc_relationship', 'modify', 'A218', 'like'
 	nichTanya['FuckLast'] = daystart
 	gs 'underwear', 'wear'
@@ -1380,24 +1372,24 @@ if $ARGS[0] = 'desc':
 	if nichTanya['Relationship'] = 0:
 		if nichTanya['RelationshipState'] = 0:
 			'She seems to be pretty indifferent about you.'
-		elseif nichTanya['RelationshipState'] >= 1000 and nichTanya['RelationshipState'] < 1010:
+		elseif nichTanya['Relationship'] = 4:
 			'The two of you have been together before you broke up with her.'
-		elseif nichTanya['RelationshipState'] >= 1010 and nichTanya['RelationshipState'] < 1020:
+		elseif nichTanya['Relationship'] >= 5:
 			'The two of you have been together before she broke up with you.'
 		end
 	else
-		if nichTanya['RelationshipState'] = 10:
+		if nichTanya['Relationship'] = 1:
 			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.'
+				'She is your fuck buddy. You feel like she considers your relationship to be 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.'
+				'She is your friend with benefits. Your relationship is a casual one. You are both free to see other people.'
 			end
-		elseif nichTanya['RelationshipState'] = 20:
-			'She is your girlfriend. She expects you to be faithful. Likewise you can expect the same from her.'
+		elseif nichTanya['Relationship'] = 3:
+			'She is your lesbian lover. She expects you to be faithful. Likewise you can expect the same from her.'
 		end
 	end
 
-	if nichTanya['Relationship'] = 1:
+	if nichTanya['Relationship'] > 0 and nichTanya['Relationship'] < 4:
 		if nichTanya['Dominance'] >= 70:
 			'She acts very dominantly around you (<<nichTanya[''Dominance'']>>)'
 		elseif nichTanya['Dominance'] >= 20:
@@ -1686,7 +1678,7 @@ if $ARGS[0] = 'chat':
 	
 	act 'General chat': gt 'nichTanya', 'general'
 	
-	if nichTanya['Relationship'] = 1:
+	if nichTanya['Relationship'] > 0 and nichTanya['Relationship'] < 4:
 		act 'Our relationship':
 			gt 'nichTanya', 'relationship'
 		end
@@ -1736,7 +1728,7 @@ if $ARGS[0] = 'university':
 		'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
 		'"I think you should take university seriously."'
 		'"Really? And why would I listen to you?"'
-		if nichTanya['RelationshipState'] = 20:
+		if nichTanya['Relationship'] = 3:
 			act 'I love you (relationship)':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
@@ -1826,9 +1818,9 @@ if $ARGS[0] = 'relationship':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
 	'"How do you feel about us, Tanya?"'
-	if nichTanya['RelationshipState'] = 10:
+	if nichTanya['Relationship'] = 1:
 		'"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 	nichTanya['RelationshipState'] = 20:
+	elseif 	nichTanya['Relationship'] = 3:
 		'"You know I love you. Just spending time with you always makes me a bit happier."'
 	end
 

locations/nichUtil.qsrc

@@ -47,25 +47,19 @@ elseif $ARGS[0] = 'debug':
 			abonement = 30
 			nichWork = 0
 			nichTanya['Relationship'] = 0
-			nichTanya['RelationshipState'] = 0
-			nichTanya['RelationshipBreakup'] = 0
 			nichTanya['FuckCounter'] = 0
 			gt 'fit','start'
 		elseif $ARGS[2] = 'getHired':
 			nichWork = 0
 			nichTanya['Relationship'] = 1
-			nichTanya['RelationshipState'] = 10
-			nichTanya['RelationshipBreakup'] = 0
 			nichJobRefused = 0
-			nichTanya['FuckCounter'] = 6
+			nichTanya['FuckCounter'] = 10
 			hour = 16
 			gt 'city_center'
 		elseif $ARGS[2] = 'tanyaDate100':
 			nichWork = 2
 			nichTanya['Relationship'] = 1
-			nichTanya['RelationshipState'] = 10
-			nichTanya['RelationshipBreakup'] = 0
-			nichTanya['FuckCounter'] = 6
+			nichTanya['FuckCounter'] = 10
 			nichTanya['Dominance'] = 30
 			nichTanya['Strapon'] = 0
 			nichGalaKnowsPT = 0

locations/saveupdater.qsrc

@@ -2321,8 +2321,18 @@ end
 !!------------------------------------!!Version 0.9.1.1!!-----------------------------------------------!!
 if temp_current_save_version < 00090101:
 
-if pornstudio > 1: pornstudio = 1
-
+	if pornstudio > 1: pornstudio = 1
+
+	if nichTanya['RelationshipBreakup'] ! 0 or nichTanya['RelationshipState'] ! 0:
+		if nichTanya['RelationshipBreakup'] = 1: nichTanya['Relationship'] = 2
+		if nichTanya['RelationshipState'] = 10: nichTanya['Relationship'] = 1
+		if nichTanya['RelationshipState'] = 20: nichTanya['Relationship'] = 3
+		if nichTanya['RelationshipState'] = 1000: nichTanya['Relationship'] = 4
+		if nichTanya['RelationshipState'] = 1010: nichTanya['Relationship'] = 5
+		if nichTanya['RelationshipState'] = 1011: nichTanya['Relationship'] = 6
+		gs 'shortgs', 'remove_array_element', 'nichTanya','RelationshipBreakup'
+		gs 'shortgs', 'remove_array_element', 'nichTanya','RelationshipState'
+	end