[changed] Tanya is more willing to chat to Sveta and isn't just about the sexytimes, plus converted a Dom check to willpower

locations/nichApartment.qsrc

@@ -560,6 +560,7 @@ if $ARGS[0] = 'casual_visit':
 	
 	'Without saying another word she takes your hand and leads you to her room.'
 	act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
+	act 'Chat with Tanya': gt 'nichTanya', 'chat'
 end
 
 if $ARGS[0] = 'removeNote':

locations/nichTanya.qsrc

@@ -1041,216 +1041,261 @@ end
 
 if $ARGS[0] = 'chat':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
-	if $ARGS[1] = 'relationship':
-		'"How do you feel about us, Tanya?"'
-		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 	nichTanya['RelationshipState'] = 20:
-			'"You know I love you. Just spending time with you always makes me a bit happier."'
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
+	'"What would you like to talk about?"'
+	
+	act 'General chat': gt 'nichTanya', 'general'
+	
+	if nichTanya['Relationship'] = 1:
+		act 'Our relationship':
+			gt 'nichTanya', 'relationship'
 		end
+	end
 
-		act 'What would your mother say?':
-			'"What do you think your mother would say if she found out about us?"'
-			'Tanya thinks about her answer for a few moments.'
-			'"I don''t think she would be very happy. She frequently mentions that she expects me to marry a rich boy just like she did. I guess she would view you as some kind of distraction from this goal."'
+	if nichJobRefused = 2:
+		act 'Job offer':
+			gt 'nichTanya', 'jobOffer'
 		end
+	end
 
-		act 'What would Nicholas say?':
-			'"What do you think Nicholas would say if he found out about us?"'
-			'Tanya hesitates for a second.'
-			'"I guess he would understand. It surely would be difficult for him. But I think he would want me to be happy."'
+	if nichWork = 2:
+		act 'Tanya''s room':
+			gt 'nichTanya', 'room'
 		end
+	end
 
-		act 'What would your friends say?':
-			'"What do you think your friends would say if they found out about us?"'
-			'"I don''t think they would mind. And if they did they wouldn''t be good friends anyways."'
-		end
+	act 'Tanya''s family':
+		gt 'nichTanya', 'family'
+	end
 
-		act 'Another topic':
-			gt 'nichTanya', 'chat'
+	if nichTanya['Uni'] = 11:
+		act 'University':
+			gt 'nichTanya', 'university'
 		end
-	elseif $ARGS[1] = 'family':
-		cla
-		act 'Nicholas':
-			cla
-			'"How do you feel about Nicholas?"'
-			if nichNTRelation < 10:
-				!! they are together
-				'"He is a really great man. He gives me hold and strength. I can always come to him with my ... <i>emotional needs</i>."'
+	end
+	act 'Finish chatting':
+		if nichWork = 0:
+			if nichTanya['FuckLast'] = daystart:
+				gt 'nichTanya', 'repeat'
 			else
-				!! either one of them broke up
-				'"He is a really great man. He gives me hold and strength. He is a great father and I am glad having him."'
-			end
-
-			act 'His job':
-				'"Do you know exactly what Nicholas is doing as his job?"'
-				'"Of course. He is the chief executive officer of a big pharma company. He was a chemistrist before he climbed up the corporate ladder. Sometimes he says that he just wants to help people and that the shareholders and laws are hindering him."'
+				gt 'nichTanya', 'sexL'
 			end
+		gt $loc, 'return'
+	end
+end
 
-			act 'His marriage':
-				'"What do you think about his marriage to your mother?"'
-				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?"'
+if $ARGS[0] = 'university':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
+	'"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?"'
+	act 'You should take university seriously':
+		*clr & cla
+		'<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:
+			act 'I love you (relationship)':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
+				'"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."'
+				nichTanya['Uni'] = 100
+				nichTanya['UniStart'] = daystart
+				cla
+				act 'Another topic':
+					gt 'nichTanya', 'chat'
 				end
 			end
-
-			act 'His money':
-				'"Did Nicholas earned all of his money himself?"'
-				'"No, not all of it. His father also was a successful business man and Nicholas inherited his wealth. But for some reason he doesn''t want to spend money he didn''t earn himself."'
-			end
-			act 'Another topic':
-				gt 'nichTanya', 'chat'
-			end
 		end
-		act 'Another topic':
-			gt 'nichTanya', 'chat'
-		end
-	elseif $ARGS[1] = 'jobOffer':
-		'"About the job you offered me some time ago... you know, the one as your maid..."'
-		'Tanya looks excited "Yes? Did you change your mind? It is still available."'
-		act 'Yes':
-			xgt 'nichTanya','hire'
-		end
-		act 'No':
-			cla
-			'"Sorry, I still can''t do this right now."'
-			act 'Another topic':
-				gt 'nichTanya', 'chat'
+		gs 'willpower', 'chrsm_lvl', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Because I tell you to (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay'
+				nichTanya['Uni'] = 100
+				nichTanya['UniStart'] = daystart
+				cla
+				gs 'stat'
+				'"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."'
+				act 'Another topic':
+					gt 'nichTanya', 'chat'
+				end
 			end
-		end
-	elseif $ARGS[1] = 'room':
-		'"I''d like to talk about your room."'
-		if nichTanya['Room'] = 1:
-			'"Okay. I cleaned it just as you asked me to."'
 		else
-			'"Really? What about it?"'
-			act 'Have Tanya clean it':
+			act 'Because I tell you to (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		if  func('uniutil', 'student', 'enrolled'):
+			act 'I know what I am talking about (student)':
+				nichTanya['Uni'] = 100
+				nichTanya['UniStart'] = daystart
 				cla
-				'"I think you should clean it yourself from now on."'
-				if nichTanya['Dominance'] <= -30:
-					'"Well, I guess you are right. I will try to keep the room clean from now on."'
-					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."'
-				end
+				gs 'stat'
+				'"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."'
 				act 'Another topic':
 					gt 'nichTanya', 'chat'
 				end
 			end
-			act 'Never mind':
-				gt 'nichTanya', 'chat'
-			end
 		end
-	else
-		'"What would you like to talk about?"'
-		if nichTanya['Relationship'] = 1:
-			act 'Our relationship':
-				gt 'nichTanya','chat', 'relationship'
+		if persuas_lvl >= 50:
+			act 'Just trust me (persuasion)':
+				nichTanya['Uni'] = 100
+				nichTanya['UniStart'] = daystart
+				cla
+				gs 'stat'
+				'"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."'
+				act 'Another topic':
+					gt 'nichTanya', 'chat'
+				end
 			end
 		end
-
-		if nichJobRefused = 2:
-			act 'Job offer':
-				gt 'nichTanya','chat', 'jobOffer'
-			end
+		act 'Another topic':
+			gt 'nichTanya', 'chat'
+		end
+	end
+	act 'You should quit university':
+		cla
+		'"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."'
+		nichTanya['Uni'] = 50
+		act 'Another topic':
+			gt 'nichTanya', 'chat'
 		end
+	end
+end
 
-		if nichWork = 2:
-			act 'Tanyas room':
-				gt 'nichTanya','chat', 'room'
-			end
+if $ARGS[0] = 'general':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
+	'You and Tanya talk about the usual stuff from boys to clothes to current affairs. You are surprised by how informed and up to date on business affairs and politics she is, but it makes sense considering her parents.'
+
+	act 'Another topic':
+		gt 'nichTanya', 'chat'
+	end
+end
+
+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:
+		'"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:
+		'"You know I love you. Just spending time with you always makes me a bit happier."'
+	end
+
+	act 'What would your mother say?':
+		'"What do you think your mother would say if she found out about us?"'
+		'Tanya thinks about her answer for a few moments.'
+		'"I don''t think she would be very happy. She frequently mentions that she expects me to marry a rich boy just like she did. I guess she would view you as some kind of distraction from this goal."'
+	end
+
+	act 'What would Nicholas say?':
+		'"What do you think Nicholas would say if he found out about us?"'
+		'Tanya hesitates for a second.'
+		'"I guess he would understand. It surely would be difficult for him. But I think he would want me to be happy."'
+	end
+
+	act 'What would your friends say?':
+		'"What do you think your friends would say if they found out about us?"'
+		'"I don''t think they would mind. And if they did they wouldn''t be good friends anyways."'
+	end
+
+	act 'Another topic':
+		gt 'nichTanya', 'chat'
+	end
+end
+
+if $ARGS[0] = 'family':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
+	cla
+	act 'Nicholas':
+		cla
+		'"How do you feel about Nicholas?"'
+		if nichNTRelation < 10:
+			!! they are together
+			'"He is a really great man. He gives me hold and strength. I can always come to him with my ... <i>emotional needs</i>."'
+		else
+			!! either one of them broke up
+			'"He is a really great man. He gives me hold and strength. He is a great father and I am glad having him."'
 		end
 
-		act 'Tanyas family':
-			gt 'nichTanya','chat', 'family'
+		act 'His job':
+			'"Do you know exactly what Nicholas is doing as his job?"'
+			'"Of course. He is the chief executive officer of a big pharma company. He was a chemistrist before he climbed up the corporate ladder. Sometimes he says that he just wants to help people and that the shareholders and laws are hindering him."'
 		end
 
-		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?"'
-				cla
-				act 'You should take university seriously':
-					'"I think you should take university seriously."'
-					'"Really? And why would I listen to you?"'
-					cla
-					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."'
-							nichTanya['Uni'] = 100
-							nichTanya['UniStart'] = daystart
-							cla
-							act 'Another topic':
-								gt 'nichTanya', 'chat'
-							end
-						end
-					end
-					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."'
-							nichTanya['Uni'] = 100
-							nichTanya['UniStart'] = daystart
-							cla
-							act 'Another topic':
-								gt 'nichTanya', 'chat'
-							end
-						end
-					end
-					if  func('uniutil', 'student', 'enrolled'):
-						act 'I know what I am talking about (student)':
-							'"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."'
-							nichTanya['Uni'] = 100
-							nichTanya['UniStart'] = daystart
-							cla
-							act 'Another topic':
-								gt 'nichTanya', 'chat'
-							end
-						end
-					end
-					if persuas_lvl >= 50:
-						act 'Just trust me (persuasion)':
-							'"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."'
-							nichTanya['Uni'] = 100
-							nichTanya['UniStart'] = daystart
-							cla
-							act 'Another topic':
-								gt 'nichTanya', 'chat'
-							end
-						end
-					end
-					act 'Another topic':
-						gt 'nichTanya', 'chat'
-					end
-				end
-				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."'
-					nichTanya['Uni'] = 50
-					cla
-					act 'Another topic':
-						gt 'nichTanya', 'chat'
-					end
-				end
+		act 'His marriage':
+			'"What do you think about his marriage to your mother?"'
+			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?"'
 			end
 		end
 
+		act 'His money':
+			'"Did Nicholas earned all of his money himself?"'
+			'"No, not all of it. His father also was a successful business man and Nicholas inherited his wealth. But for some reason he doesn''t want to spend money he didn''t earn himself."'
+		end
+		act 'Another topic':
+			gt 'nichTanya', 'chat'
+		end
 	end
+	act 'Another topic':
+		gt 'nichTanya', 'chat'
+	end
+end
 
-	act 'Finish chatting':
-		if nichWork = 0: gt 'city_center'
-		gt $loc, 'return'
+if $ARGS[0] = 'jobOffer':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
+	'"About the job you offered me some time ago... you know, the one as your maid..."'
+	'Tanya looks excited "Yes? Did you change your mind? It is still available."'
+	act 'Yes':
+		xgt 'nichTanya','hire'
+	end
+	act 'No':
+		cla
+		'"Sorry, I still can''t do this right now."'
+		act 'Another topic':
+			gt 'nichTanya', 'chat'
+		end
+	end
+end
+
+if $ARGS[0] = 'room':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
+	'"I''d like to talk about your room."'
+	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 nichTanya['Dominance'] <= -30:
+				'"Well, I guess you are right. I will try to keep the room clean from now on."'
+				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."'
+			end
+			act 'Another topic':
+				gt 'nichTanya', 'chat'
+			end
+		end
+		act 'Never mind':
+			gt 'nichTanya', 'chat'
+		end
 	end
 end
 
@@ -1270,7 +1315,8 @@ if $ARGS[0] = 'cuddle':
 end
 
 if $ARGS[0] = 'hire':
-	cla
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/idle/idle'+rand(0,5)+'.jpg"></center>'
 	npc_rel['A218'] += 5
 	nichWork = 1
 	'Her offer sounds too good to be true: Living with her, here, in this huge luxury apartment, right in the city center? And big paycheck every month for basically doing nothing? You know your answer immediately: "Okay."'