Переглянути джерело

[added] Maid: Tanya can be molested in her own shower

Christine 5 роки тому
батько
коміт
4a3855adbf

+ 2 - 2
locations/down.qsrc

@@ -223,7 +223,7 @@ end
 
 
 if Enable_tablemap = 0:
-	if nichTanyaOpinion = 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 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 nichWork = 2:'<a href="exec:gt ''nichApartment''">Nicholas''</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 ''lab'', ''start''">Tatiana''s</a> secret hideout.'
@@ -231,7 +231,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 nichTanyaOpinion = 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 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 nichWork = 2:gs'show_table','<a href="exec:gt ''nichApartment''">Nicholas''</a> apartment','3'
 	if izoldaQW >= 1:gs'show_table','<a href="exec:gt ''qwIzoldaApp''">Isoldes</a> apartment','3'
 	if mainQW >= 1:gs'show_table','<a href="exec:gt ''lab'', ''start''">Tatiana''s</a> secret hideout','3'

+ 8 - 6
locations/fit.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'dressing room':
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
 	
-	if nichTanyaOpinion = 0 and (rand(1,100) <= 20 or nichDebug = 1):
+	if nichTanyaKnown = 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
 
@@ -168,7 +168,7 @@ if $ARGS[0] = 'fitgirl':
 				*clr
 				tanday = daystart
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower_mol0.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/showermol0.jpg"></center>'
 				'You walk up to the girl and gently place one hand on her right breast. She turns to face you.'
 
 				gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
@@ -186,8 +186,8 @@ if $ARGS[0] = 'fitgirl':
 						*clr
 						gs 'underwear', 'remove'
 						gs 'clothing', 'strip'
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower_mol1.jpg"></center>'
+
+						'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/showermol1.jpg"></center>'
 						'While she is trying to understand what is happening you begin fondling her sex with your fingers, and then her hand strokes your ass.'
 
 						gs 'arousal', 'foreplay', 10, 'dom', 'lesbian'
@@ -209,7 +209,7 @@ if $ARGS[0] = 'fitgirl':
 							*clr
 							gs 'underwear', 'remove'
 							gs 'clothing', 'strip'
-							'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower_mol2.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/showermol2.jpg"></center>'
 							'The girl presses up to you even stronger and kisses your lips.'
 
 							gs 'arousal', 'kiss', 5, 'dom', 'lesbian'
@@ -237,7 +237,9 @@ if $ARGS[0] = 'tanyaIntroduction':
 	if $pantyworntype = 'none': gs 'underwear', 'wear'
 	gs 'panties', 'dispose'
 	gs 'clothing', 'wear_last_worn'
-	nichTanyaOpinion = 1
+	nichTanyaRelationship = 1
+	nichTanyaRelationshipState = 10
+	nichTanyaKnown = 1
 	npc_rel['A218'] += 5
 	nichTanyaFuckLast = daystart
 	'"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.'

+ 1 - 5
locations/loadg.qsrc

@@ -97,11 +97,7 @@ if alko < 0: alko = 0
 if pranik < 0: pranik = 0
 if poroshok < 0: poroshok = 0
 
-if $loc = 'tanapartment' or $loc = 'tanhouse' or $loc = 'tanhousezal' or $loc = 'tanhozspal' or $loc = 'tankitchen' or $loc = 'tanNicholas' or $loc = 'tanroom' or $loc = 'tanspalnya' or $loc = 'tanvanr':
-	$loc = 'nichApartment'
-	$metka = ''
-	gt 'nichUtil','updateNotice'
-end
+gs 'nichUtil','onLoad'
 
 --- loadg ---------------------------------
 

+ 1 - 1
locations/nichApartment.qsrc

@@ -225,7 +225,7 @@ elseif $ARGS[0] = 'jobInterview':
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/01.jpg"></center>'
 			'Finally the elevator stops and the its doors open.'
 			
-			if nichTanyaOpinion = 0:
+			if nichTanyaKnown = 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

+ 1 - 1
locations/nichBathMaster.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	end
 	
 	if $nichTanyAct = 'bathMorning':
-		'Tanya is currently in here using the shower.'
+		'<a href="exec: gt ''nichTanya'', ''bathroom''">Tanya</a> is currently in here using the shower.'
 		nichCleanAppropriate = 0
 	elseif $nichTanyAct = 'bathEvening':
 		'Tanya is currently in here brushing her teeth.'	

+ 1 - 1
locations/nichChore.qsrc

@@ -398,7 +398,7 @@ elseif $ARGS[0] = 'work':
 	if ARGS[2] ! 1:
 		if nichChoreID = 5:
 			!! Tanyas room
-			if nichTanyaOpinion > 0 and nichTanyaOpinion < 30 and nichTanyaDominance >= 20:
+			if nichTanyaRelationship = 1 and nichTanyaDominance >= 20:
 				!! if Tanya and Sveta are in a relationship and Tanya is dominant
 				nichTanyPresent = FUNC('nichUtil','isPresent','tanya','bedroomTanya')
 				if nichTanyPresent ! 0:

+ 200 - 76
locations/nichTanya.qsrc

@@ -3,6 +3,18 @@
 !! Tanya is registered as NPC A218
 
 !! Important variables concerning Tanya:
+!! nichTanyaKnown: 0= no, 1= yes
+!! nichTanyaRelationship:
+!!					0= not in a relationship
+!!					1= in a relationship (sex is enabled)
+!! nichTanyaRelationshipState:
+!!					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:
+!!					1 = Sveta has told Tanya that she doesnt want a real relationship. Break up can easily happen now.
 !! nichTanyaOpinion: 
 !!					0= she doesn't know you
 !!					1= you are her lover
@@ -44,9 +56,10 @@ if $ARGS[0] = 'bedroomTanya':
 	nichTanyaPropDate = 0
 	nichTanyaPropSex = 0
 	
+	
 	if nichGalaKnowsPT = 10:
 		!! Galas order to break up
-		if nichTanyaOpinion >= 30 or nichTanyaOpinion = 0:
+		if nichTanyaRelationship = 0:
 			!! they broke up already or never were together (most likely because the player tinkered with the vars)
 			nichGalaKnowsPT = 11
 			gt 'nichTanya', 'bedroomTanya'
@@ -57,26 +70,43 @@ if $ARGS[0] = 'bedroomTanya':
 				'"Tanya, I have to talk with you..."'
 				'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 nichTanyaOpinion = 1:
+				
+				if nichTanyaRelationshipBreakup = 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
+					nichGalaKnowsPT = 11
+					killvar 'nichTanyaRelationshipBreakup'
+					cla
+					act 'Leave':
+						gt $loc,'return'
+					end
+				elseif nichTanyaRelationshipState = 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.'
-					nichTanyaOpinion = 30
+					nichTanyaRelationship = 0
+					nichTanyaRelationshipState = 1010
 					nichGalaKnowsPT = 11
 					cla
 					act 'Leave':
 						gt $loc,'return'
 					end
-				elseif nichTanyaOpinion = 10:
+				elseif nichTanyaRelationshipState = 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!"'
-						nichTanyaOpinion = 30
+						nichTanyaRelationship = 0
+						nichTanyaRelationshipState = 1000
 						nichGalaKnowsPT = 11
 						cla
 						act 'Leave':
@@ -106,18 +136,6 @@ if $ARGS[0] = 'bedroomTanya':
 							gt $loc,'return'
 						end
 					end
-				elseif nichTanyaOpinion = 20:
-					'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.'
-					nichTanyaOpinion = 30
-					nichGalaKnowsPT = 11
-					cla
-					act 'Leave':
-						gt $loc,'return'
-					end
 				end
 			end
 			act 'Don''t tell her':
@@ -129,7 +147,43 @@ if $ARGS[0] = 'bedroomTanya':
 				end
 			end
 		end
-	elseif nichTanyaOpinion = 1:
+	elseif nichTanyaRelationshipBreakup = 1:
+		if nichTanyaFuckCounter > rand(20,30) and nichTanyaFuckToday = 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."'
+			'She hesitates for a few seconds. "And since you told me that you are not interested in something longlasting..."'
+			'She stops for another few seconds. She obviously feels uncomfortable to speak out what she has to say.'
+			'"Well... he is my boyfriend now. And I am his girlfriend."'
+			'"So you are saying..."'
+			'"Yes. I''m afraid our time of having fun together is over. Don''t get me wrong, I really enjoyed it. But it''s time for me to move on now. You understand that, do you?"'
+			!! Tanya will break off with Nicholas
+			nichNTRelation = 10
+			act 'Sure':
+				cla
+				nichTanyaRelationship = 0
+				nichTanyaRelationshipState = 1011
+				'"Of course."'
+				'"Oh <<$pcs_nickname>>, I hoped you''d say that." She hugs you.'
+				if nichTanyaUni >= 100:
+					'"You will meet Vlad shortly. I''m sure you will like him. He is a really nice guy."'
+					nichTanyaBF = 1
+				else
+					'"You will meet Grigory shortly. I''m sure you will like him. You two have much in common."'
+					nichTanyaBF = 2
+				end
+				
+				act 'Stand up':
+					gt $loc
+				end
+			end
+			!!Todo: fight for her
+		else
+			'As you approach her she greets you with a smile.'
+			nichTanyaPropSex = 1
+			nichTanyaPropDate = 1
+		end
+	elseif nichTanyaRelationshipState = 10:
 		if nichTanyaFuckCounter > rand(12,15) and nichTanyaFuckToday = 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."'
@@ -143,7 +197,7 @@ if $ARGS[0] = 'bedroomTanya':
 				'She looks a tiny bit dissapointed. "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?"'
-				nichTanyaOpinion = 20
+				nichTanyaRelationshipBreakup = 1
 				act 'Of course not (Leave her)':
 					gt $loc
 				end
@@ -156,7 +210,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.'
-				nichTanyaOpinion = 10
+				nichTanyaRelationshipState = 20
 				!! Tanya will break off with Nicholas
 				nichNTRelation = 10
 				act 'Fuck her':
@@ -171,7 +225,7 @@ if $ARGS[0] = 'bedroomTanya':
 			nichTanyaPropSex = 1
 			nichTanyaPropDate = 1
 		end
-	elseif nichTanyaOpinion = 10:
+	elseif nichTanyaRelationshipState = 20:
 		if nichTanyaFuckLast < 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:
@@ -181,42 +235,7 @@ if $ARGS[0] = 'bedroomTanya':
 		end
 		nichTanyaPropSex = 1
 		nichTanyaPropDate = 1
-	elseif nichTanyaOpinion = 20:
-		if nichTanyaFuckCounter > rand(20,30) and nichTanyaFuckToday = 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."'
-			'She hesitates for a few seconds. "And since you told me that you are not interested in something longlasting..."'
-			'She stops for another few seconds. She obviously feels uncomfortable to speak out what she has to say.'
-			'"Well... he is my boyfriend now. And I am his girlfriend."'
-			'"So you are saying..."'
-			'"Yes. I''m afraid our time of having fun together is over. Don''t get me wrong, I really enjoyed it. But it''s time for me to move on now. You understand that, do you?"'
-			!! Tanya will break off with Nicholas
-			nichNTRelation = 10
-			nichTanyaBF = 1
-			act 'Sure':
-				cla
-				nichTanyaOpinion = 30
-				'"Of course."'
-				'"Oh <<$pcs_nickname>>, I hoped you''d say that." She hugs you.'
-				if nichTanyaUni >= 100:
-					'"You will meet Vlad shortly. I''m sure you will like him. He is a really nice guy."'
-					nichTanyaBF = 1
-				else
-					'"You will meet Grigory shortly. I''m sure you will like him. You two have much in common."'
-					nichTanyaBF = 2
-				end
-				
-				act 'Stand up':
-					gt $loc
-				end
-			end
-			!!Todo: fight for her
-		else
-			'As you approach her she greets you with a smile.'
-			nichTanyaPropSex = 1
-			nichTanyaPropDate = 1
-		end
+	
 	end
 	
 	if nichTanyaPropSex = 1:
@@ -303,6 +322,106 @@ if $ARGS[0] = 'bedroomTanya':
 	act 'Move away':
 		gt $loc
 	end
+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 pcs_dom > 10:
+	
+	else
+		if nichTanyaRelationship = 1:
+			act 'Join her':
+				cla
+				*clr
+				'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/showermol0.jpg"></center>'
+				'You silently put your clothes off. Then you join Tanya in the shower and gently place one hand on her right breast. She turns to face you.'
+				
+				gs 'underwear', 'remove'
+				gs 'clothing', 'strip'
+				gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
+				gs 'stat'
+				
+				'"Hey <<$pcs_nickname>>."'
+			end
+		else
+			act 'Molest her':
+				cla
+				*clr
+				'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/showermol0.jpg"></center>'
+				'You silently put your clothes off. Then you join Tanya in the shower and gently place one hand on her right breast. She turns to face you.'
+				
+				gs 'underwear', 'remove'
+				gs 'clothing', 'strip'
+				gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
+				gs 'stat'
+			
+				if nichTanyaRelationshipState >= 1000 and nichTanyaRelationshipState < 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': gt 'nichBathMaster','return'
+				elseif nichTanyaRelationshipState >= 1010 and nichTanyaRelationshipState < 1020:
+					'Tanya pushes you off.'
+					'"What the hell are you doing, <<$pcs_nickname>>?! I told you it''s over! Get lost!"'	
+					act 'Leave': gt 'nichBathMaster','return'
+				elseif pcs_apprnc < 80:
+					'Tanya pushes you off.'
+					'"What the hell are you doing, <<$pcs_nickname>>?! Get lost!"'	
+					act 'Leave': gt 'nichBathMaster','return'
+				elseif pcs_apprnc >= 80:
+					'Tanya quickly turns around. She looks a little bit puzzled as she realizes that it was you who grabed her. Did she expect somebody else?.'
+
+					act 'Take advantage of the confusion':
+						cla
+						*clr
+						
+						'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/showermol1.jpg"></center>'
+						'While she is trying to understand what is happening you begin fondling her sex with your fingers, and then her hand strokes your ass.'
+
+						gs 'arousal', 'foreplay', 10, 'dom', 'lesbian'
+						gs 'stat'
+
+						act 'Further':tanznak = 1 & gt 'nichTanya', 'bathroomMolestSuccess'
+					end
+
+					act 'Wait for her reaction':
+						*clr & cla
+						gs 'stat'
+
+						if pcs_apprnc < 120:
+							'Tanya smiles at you, but removes your hand and leaves, blowing you a kiss.'
+
+							act 'Leave': gt 'nichBathMaster','return'
+						elseif pcs_apprnc >= 120:
+							cla
+							*clr
+							'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/showermol2.jpg"></center>'
+							'Tanya presses up to you even stronger and kisses your lips.'
+
+							gs 'arousal', 'kiss', 5, 'dom', 'lesbian'
+							gs 'stat'
+
+							act 'Further':
+								tanznak = 1
+								gt 'nichTanya', 'bathroomMolestSuccess'
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+elseif $ARGS[0] = 'bathroomMolestSuccess':
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower1.jpg"></center>'
+	'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
+	npc_rel['A218'] += 5
+	nichTanyaFuckLast = daystart
+	gs 'underwear', 'wear'
+	gs 'clothing', 'wear_last_worn'
+	gs 'stat'
+	act 'Back': gt 'nichApartment'
 elseif $ARGS[0] = 'date':
 	if nichTanyaDate = 1:
 		if nichDateState = 0:
@@ -595,19 +714,27 @@ elseif $ARGS[0] = 'desc':
 		'She is ' + (year - nichTanyaBdY-1) + ' years old.'
 	end
 	
-	if nichTanyaOpinion = 0:
-		'She seems to be pretty indifferent about you.'
-	elseif nichTanyaOpinion = 1:
-		'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.'
-	elseif nichTanyaOpinion = 10:
-		'She is your girlfriend. She expects you to be faithful. Likewise you can expect the same from her.'
-	elseif nichTanyaOpinion = 20:
-		'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.'
-	elseif nichTanyaOpinion = 30:
-		'She is your former lesbian lover.'
+	if nichTanyaRelationship = 0:
+		if nichTanyaRelationshipState = 0:
+			'She seems to be pretty indifferent about you.'
+		else nichTanyaRelationshipState >= 1000 and nichTanyaRelationshipState < 1010:
+			'The two of you have been together before until you broke up.'
+		else nichTanyaRelationshipState >= 1010 and nichTanyaRelationshipState < 1020:
+			'The two of you have been together before until she broke up.'
+		end
+	else
+		if nichTanyaRelationshipState = 10:
+			if nichTanyaRelationshipBreakup = 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:
+			'She is your girlfriend. She expects you to be faithful. Likewise you can expect the same from her.'
+		end
 	end
 	
-	if nichTanyaOpinion > 0 and nichTanyaOpinion < 30:
+	if nichTanyaRelationship = 1:
 		if nichTanyaDominance >= 70:
 			'She acts very dominantly around you (<<nichTanyaDominance>>)'
 		elseif nichTanyaDominance >= 20:
@@ -944,13 +1071,10 @@ elseif $ARGS[0] = 'chat':
 	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
 	if $ARGS[1] = 'relationship':
 		'"How do you feel about us, Tanya?"'
-		if nichTanyaOpinion = 1 or nichTanyaOpinion = 20:
+		if nichTanyaRelationshipState = 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 	nichTanyaOpinion = 10:
+		elseif 	nichTanyaRelationshipState = 20:
 			'"You know I love you. Just spending time with you always makes me a bit happier."'
-			if nichTanyaDominance <= -70:
-				'""'
-			end
 		end
 		
 		act 'What would your mother say?':
@@ -993,7 +1117,7 @@ elseif $ARGS[0] = 'chat':
 			
 			act 'His marriage':
 				'"What do you think about his marriage to your mother?"'
-				if nichTanyaOpinion >= 20 and nichTanyaOpinion< 30:
+				if nichTanyaRelationship = 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?"'
@@ -1050,7 +1174,7 @@ elseif $ARGS[0] = 'chat':
 		end	
 	else
 		'"What would you like to talk about?"'
-		if nichTanyaOpinion >= 1 and nichTanyaOpinion < 30:
+		if nichTanyaRelationship = 1:
 			act 'Our relationship':
 				gt 'nichTanya','chat', 'relationship'
 			end
@@ -1081,7 +1205,7 @@ elseif $ARGS[0] = 'chat':
 					'"I think you should take university seriously."'
 					'"Really? And why would I listen to you?"'
 					cla
-					if nichTanyaOpinion >= 10 and nichTanyaOpinion < 20:
+					if nichTanyaRelationshipState = 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.'

+ 42 - 4
locations/nichUtil.qsrc

@@ -45,19 +45,25 @@ elseif $ARGS[0] = 'debug':
 			gs 'nichUtil','clearVars'
 			abonement = 30
 			nichWork = 0
-			nichTanyaOpinion = 0
+			nichTanyaRelationship = 0
+			nichTanyaRelationshipState = 0
+			nichTanyaRelationshipBreakup = 0
 			nichTanyaFuckCounter = 0
 			gt 'fit','start'
 		elseif $ARGS[2] = 'getHired':
 			nichWork = 0
-			nichTanyaOpinion = 1
+			nichTanyaRelationship = 1
+			nichTanyaRelationshipState = 10
+			nichTanyaRelationshipBreakup = 0
 			nichJobRefused = 0
 			nichTanyaFuckCounter = 6
 			hour = 16
 			gt 'down'
 		elseif $ARGS[2] = 'tanyaDate100':
 			nichWork = 2
-			nichTanyaOpinion = 1
+			nichTanyaRelationship = 1
+			nichTanyaRelationshipState = 10
+			nichTanyaRelationshipBreakup = 0
 			nichTanyaFuckCounter = 6
 			nichTanyaDominance = 30
 			nichTanyaStrapon = 0
@@ -339,6 +345,36 @@ if $ARGS[0] = 'hired':
 	$npc_nickname['A52'] = 'Master '+$npc_firstname['A52']
 end
 
+if $ARGS[0] = 'onLoad':
+	if $loc = 'tanapartment' or $loc = 'tanhouse' or $loc = 'tanhousezal' or $loc = 'tanhozspal' or $loc = 'tankitchen' or $loc = 'tanNicholas' or $loc = 'tanroom' or $loc = 'tanspalnya' or $loc = 'tanvanr':
+		$loc = 'nichApartment'
+		$metka = ''
+		gt 'nichUtil','updateNotice'
+	end
+end
+
+!!
+if $ARGS[0] = 'updateVars':
+	if nichTanyaOpinion > 0:
+		nichTanyaKnown = 1
+		if nichTanyaOpinion = 1:
+			nichTanyaRelationship = 1
+			nichTanyaRelationshipState = 10
+		elseif nichTanyaOpinion = 10:
+			nichTanyaRelationship = 1
+			nichTanyaRelationshipState = 20
+		elseif nichTanyaOpinion = 20:
+			nichTanyaRelationship = 1
+			nichTanyaRelationshipState = 10
+		elseif nichTanyaOpinion = 30:
+			nichTanyaRelationship = 0
+			nichTanyaRelationshipState = 1010
+		end
+		killvar 'nichTanyaOpinion'
+	end
+end
+
+
 !! convert the old vars to the new system
 if $ARGS[0] = 'convert':
 	
@@ -376,7 +412,9 @@ if $ARGS[0] = 'updateNotice':
 	act 'Stay hired':
 		gs 'nichUtil', 'hired'
 		nichPerformance = tan_work_rep * 5
-		nichTanyaOpinion = 1
+		nichTanyaRelationship = 1
+		nichTanyaRelationshipState = 10
+		nichTanyaRelationshipBreakup = 0
 		gt $loc, $metka
 	end