Maid: Have Tanya clean her own room

locations/nichChore.qsrc

@@ -438,7 +438,7 @@ elseif $ARGS[0] = 'work':
 		end
 	elseif nichChoreID = 2:
 		if ARGS[1] = 1:
-			$nichChoreDesc = 'You clean the room as quickly as possible.'
+			$nichChoreDesc = 'You clean your room as quickly as possible.'
 			$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'Once you are finished you realize that you didn''t improve the condition of the room at all. It is still as dirty as before.' & nichChoreResult = nichChoreState[nichChoreID]"
 			nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 30
 			if nichChoreState[nichChoreID] > 10:
@@ -446,7 +446,7 @@ elseif $ARGS[0] = 'work':
 				nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 30
 			end
 		elseif ARGS[1] = 2:
-			$nichChoreDesc = 'DESC 2.2.'
+			$nichChoreDesc = 'Your carefully clean your room.'
 		end
 	elseif nichChoreID = 3:
 		if ARGS[1] = 1:
@@ -458,7 +458,7 @@ elseif $ARGS[0] = 'work':
 				nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 30
 			end
 		elseif ARGS[1] = 2:
-			$nichChoreDesc = 'DESC 3.2.'
+			$nichChoreDesc = 'Your carefully clean the room.'
 		end
 	elseif nichChoreID = 4:
 		if ARGS[1] = 1:

locations/nichTanya.qsrc

@@ -14,12 +14,16 @@
 
 !! 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, 100+: Tanya goes to university
+
+!! nichTanyaRoom: 0= Tanya doesnt clean her room herself, 1= Tanya cleans her room herself
+
 if nichTanyaFuckLast ! daystart:
 	nichTanyaFuckToday = 0
 end
 
 if $ARGS[0] = 'bedroomTanya':
-
+	$nichTanyaPic = func('nichUtil','tanyaPic','idle','apartment')
+	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
 	nichTanyaPropSex = 0
 	
 	if nichGalaKnowsPT = 10:
@@ -209,15 +213,15 @@ if $ARGS[0] = 'bedroomTanya':
 	end
 	killvar 'nichTanyaPropSex'
 	
-	!! TODO: chat
-	act 'Move away':
-		gt $loc
+	act 'Talk with her':
+		gt 'nichTanya', 'chat'
 	end
 	
 	
+	act 'Move away':
+		gt $loc
+	end
 	
-
-
 elseif $ARGS[0] = 'desc':
 	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/tanya/01.jpg"></center>'
 	'Tanya is the daughter of Gala and the step-daughter of Nicholas.'
@@ -345,15 +349,15 @@ elseif $ARGS[0] = 'sexL':
 	gs 'stat'
 	
 	if nichTanyaDominance >= 70:
-		nichTanyaChanceDom = 80
+		nichTanyaChanceDom = 40
 		nichTanyaChanceSub = 5
 	elseif nichTanyaDominance >= 20:
-		nichTanyaChanceDom = 50
+		nichTanyaChanceDom = 20
 	elseif nichTanyaDominance <= -70:
 		nichTanyaChanceDom = 5
-		nichTanyaChanceSub = 80
+		nichTanyaChanceSub = 40
 	elseif nichTanyaDominance <= -30:
-		nichTanyaChanceSub = 50
+		nichTanyaChanceSub = 20
 	end
 	
 	nichRand = rand(1,100)
@@ -371,16 +375,16 @@ elseif $ARGS[0] = 'sexL':
 			if sub >= 50:
 				act 'Lick her':
 					nichTanyaFuckDom += 1
-					gt 'nichTanya','sexL','peatout'
+					gt 'nichTanya','sexL','aeatout'
 				end
 			else
 				act 'Lick her':
 					nichTanyaFuckDom += 1
-					gt 'nichTanya','sexL','peatout'
+					gt 'nichTanya','sexL','aeatout'
 				end
 				act 'Have her lick you instead':
 					nichTanyaFuckSub += 1
-					gt 'nichTanya','sexL','aeatout'
+					gt 'nichTanya','sexL','peatout'
 				end
 			end
 		!!elseif nichRand = 1:
@@ -393,16 +397,16 @@ elseif $ARGS[0] = 'sexL':
 			if sub >= 50:
 				act 'Lick her':
 					nichTanyaFuckDom += 1
-					gt 'nichTanya','sexL','primjob'
+					gt 'nichTanya','sexL','arimjob'
 				end
 			else
 				act 'Lick her':
 					nichTanyaFuckDom += 1
-					gt 'nichTanya','sexL','primjob'
+					gt 'nichTanya','sexL','arimjob'
 				end
 				act 'Have her lick you instead':
 					nichTanyaFuckSub += 1
-					gt 'nichTanya','sexL','arimjob'
+					gt 'nichTanya','sexL','primjob'
 				end
 			end
 		end
@@ -417,22 +421,22 @@ elseif $ARGS[0] = 'sexL':
 
 			act 'Lick her instead':
 				nichTanyaFuckDom += 1
-				gt 'nichTanya','sexL','peatout'
+				gt 'nichTanya','sexL','aeatout'
 			end
 			act 'Have her lick you':
 				nichTanyaFuckSub += 1
-				gt 'nichTanya','sexL','aeatout'
+				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
-				gt 'nichTanya','sexL','primjob'
+				gt 'nichTanya','sexL','arimjob'
 			end
 			act 'Have her lick you':
 				nichTanyaFuckSub += 1
-				gt 'nichTanya','sexL','arimjob'
+				gt 'nichTanya','sexL','primjob'
 			end
 		end
 		
@@ -443,19 +447,19 @@ elseif $ARGS[0] = 'sexL':
 		end
 		act 'Lick her':
 			nichTanyaFuckDom += 1
-			gt 'nichTanya','sexL','peatout'
+			gt 'nichTanya','sexL','aeatout'
 		end
 		act 'Have her lick you':
 			nichTanyaFuckSub += 1
-			gt 'nichTanya','sexL','aeatout'
+			gt 'nichTanya','sexL','peatout'
 		end
 		act 'Give rimjob':
 			nichTanyaFuckDom += 1
-			gt 'nichTanya','sexL','primjob'
+			gt 'nichTanya','sexL','arimjob'
 		end
 		act 'Receive rimjob':
 			nichTanyaFuckSub += 1
-			gt 'nichTanya','sexL','arimjob'
+			gt 'nichTanya','sexL','primjob'
 		end
 		if nichTanyaFuckPositions >= 3:
 			act 'Finish':
@@ -502,8 +506,8 @@ elseif $ARGS[0] = 'sexLAfter':
 	
 	!! after sex is finished Tanya will stay in bed for a short time and one can chat with her or go for another round
 	!! TODO: more description
-	$nichTempPic = func('nichUtil','tanyaPic','sexL','after')
-	'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
+	$nichTanyaPic = func('nichUtil','tanyaPic','sexL','after')
+	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
 	act 'Chat':
 		gt 'nichTanya','chat'
 	end
@@ -526,6 +530,7 @@ elseif $ARGS[0] = 'sexLAfter':
 	
 elseif $ARGS[0] = 'chat':
 	*clr & cla
+	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
 	if $ARGS[1] = 'relationship':
 		'"How do you feel about us, Tanya?"'
 		if nichTanyaOpinion = 1 or nichTanyaOpinion = 20:
@@ -540,19 +545,46 @@ elseif $ARGS[0] = 'chat':
 		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 makes it clear that she expects me to marry a rich boy just like she did. I guess she would blame you for seducing me."'
+			'"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 to understand. But I think he would want me to be happy."'
+			'"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
+	elseif $ARGS[1] = 'room':
+		'"I''d like to talk about your room."'
+		if nichTanyaRoom = 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:
+					'"Well, I guess you are right. I will try to keep the room clean from now on."'
+					nichTanyaRoom = 1
+				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	
 	else
 		'"What would you like to talk about?"'
 		if nichTanyaOpinion >= 1 and nichTanyaOpinion < 30:
@@ -560,7 +592,15 @@ elseif $ARGS[0] = 'chat':
 				gt 'nichTanya','chat', 'relationship'
 			end
 		end
+		
+		act 'Tanyas room':
+			gt 'nichTanya','chat', 'room'
+		end
+		
 	end
+	
+	
+	
 	act 'Finish chatting':
 		if nichWork = 0: gt 'down'
 		gt $loc, 'return'

locations/nichUtil.qsrc

@@ -158,7 +158,9 @@ elseif $ARGS[0] = 'startWorkday':
 	!! 4: laundry
 	nichChoreState[4] += 5
 	!! 5: tanya bedroom
-	nichChoreState[5] += 5
+	if nichTanyaRoom = 0:
+		nichChoreState[5] += 5
+	end
 	!! 6: master bathroom
 	nichChoreState[6] += 5
 	!! 7: master bedroom
@@ -405,120 +407,50 @@ end
 if $ARGS[0] = 'tanyaPic':
 	gs 'nichUtil','updatePcHair'
 
+	$nichTempFolder = 'images/characters/city/nicholas/tanya/'
+	
+	if $ARGS[1] = 'idle':
+		$RESULT = $nichTempFolder + 'idle/idle('+rand(0,5)+').jpg'
+	end
+	
 	if $ARGS[1] = 'sexL' or $ARGS[1] = 'sexH':
 		!! Pictures which work for both lesbian and heterosexual sex
 		if $ARGS[2] = 'after':
 			!! pictures of Tanya relaxing after sex
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_sex(0).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_sex(1).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_sex(2).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_sex(3).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_sex(4).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_sex(5).jpg'
+			$RESULT = $nichTempFolder + 'sex/relax('+rand(0,5)+').jpg'
 		elseif $ARGS[2] = 'pose':
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_pose(0).jpg'
+			$RESULT = $nichTempFolder + 'sex/pose('+rand(0,1)+').jpg'
 		elseif $ARGS[2] = 'undress':
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_undressing(0).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_undressing(1).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_undressing(2).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sex/tanya_undressing(3).jpg'
+			$RESULT = $nichTempFolder + 'sex/undress('+rand(0,3)+').jpg'
 		end
 	end
 	if $ARGS[1] = 'sexL':
 		if $ARGS[2] = 'kiss':
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 0):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(9).jpg'
-			end
-			if $ARGS[3] = 1 or ($ARGS[3] = 0 and nichPCHair = 1):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(1).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(2).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(4).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(16).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(17).jpg'
-			end
-			
+			$RESULT = $nichTempFolder + 'sexL/kiss/kiss('+rand(0,5)+').jpg'
 		elseif $ARGS[2] = 'aeatout':
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(3).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(5).jpg'
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(7).jpg'
-			if $ARGS[3] = 1 or ($ARGS[3] = 0 and nichPCHair = 0):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(10).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(11).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(24).jpg'
-			end
-			if $ARGS[3] = 1 or ($ARGS[3] = 0 and nichPCHair = 1):
-			
-			end
+			$RESULT = $nichTempFolder + 'sexL/aeatout/aeatout('+rand(0,3)+').jpg'
 		elseif $ARGS[2] = 'peatout':
-			
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(14).jpg'
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 0):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(13).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(22).jpg'
-			end
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 1):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(6).jpg'
-			end
-		elseif $ARGS[2] = 'alickbreast':
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 0):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(8).jpg'
-			end
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 1):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(19).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(25).jpg'
-			end
-		elseif $ARGS[2] = 'plickbreast':
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 0):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(23).jpg'
-			end
-		elseif $ARGS[2] = 'alickbutt':
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 1):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(18).jpg'
-			end
-		elseif $ARGS[2] = 'aride':
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 1):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(12).jpg'
-			end
+			$RESULT = $nichTempFolder + 'sexL/peatout/peatout('+rand(0,6)+').jpg'
 		elseif $ARGS[2] = 'arimjob':
-			$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(15).jpg'
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 0):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(27).jpg'
-			end
-		elseif $ARGS[2] = 'avibrator':
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 0):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(20).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(28).jpg'
-			end
-		elseif $ARGS[2] = 'pvibrator':
-			if ARGS[3] = 1 or (ARGS[3] = 0 and nichPCHair = 0):
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexL/tanya_sex(26).jpg'
-			end
+			$RESULT = $nichTempFolder + 'sexL/arimjob/arimjob('+rand(0,3)+').jpg'
+		elseif $ARGS[2] = 'primjob':
+			$RESULT = $nichTempFolder + 'sexL/primjob/primjob('+rand(0,1)+').jpg'
+		elseif $ARGS[2] = 'astrapon':
+			$RESULT = $nichTempFolder + 'sexL/astrapon/astrapon('+rand(0,5)+').jpg'
+		elseif $ARGS[2] = 'pstrapon':
+			$RESULT = $nichTempFolder + 'sexL/pstrapon/pstrapon('+rand(0,3)+').jpg'
 		end
 	elseif $ARGS[1] = 'sexH':
 		if $ARGS[2] = 'spy':
 			if $ARGS[3] = '' or $ARGS[3] = 'nicholas':
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexNich/tanya_nich(0).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexNich/tanya_nich(1).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexNich/tanya_nich(2).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexNich/tanya_nich(3).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexNich/tanya_nich(4).jpg'
-				$nichTempPicArr[ARRSIZE('$nichTempPicArr')] = 'sexNich/tanya_nich(5).jpg'
+				$RESULT = $nichTempFolder + 'sexNich/nich('+rand(0,5)+').jpg'
 			end
 		end
 	end
-	!!TODO: 20,
 	
-	
-	if ARRSIZE('$nichTempPicArr') = 0:
-		!!TODO: better default
-		$RESULT = 'images/characters/city/nicholas/tanya/01.jpg'
-	else
-		$RESULT = 'images/characters/city/nicholas/tanya/'+$nichTempPicArr[rand(0,ARRSIZE('$nichTempPicArr')-1)]
-	end
-	
-	'DEBUG: '+$RESULT
-	
-	killvar '$nichTempPicArr'
+	'<<$RESULT>>'
+
+	killvar '$nichTempFolder'
 end
 
 !! sets nichPCHair to: