Explorar o código

[changed] Tanya sex more neutral witout the old sub/Dom mechanic and changes to formatting to bring things more in line with the rest of the game code

Kevin_Smarts hai 1 ano
pai
achega
ba763d1af8

+ 117 - 100
locations/nichApartment.qsrc

@@ -202,9 +202,10 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		act 'Debug Menu':
 			gt 'nichUtil', 'debug'
 		end
-	end
-		
-elseif $ARGS[0] = 'jobInterview':
+	end	
+end
+
+if $ARGS[0] = 'jobInterview':
 	*clr & cla
 	$location_type = 'event'
 	menu_off = 1
@@ -239,7 +240,9 @@ elseif $ARGS[0] = 'jobInterview':
 			act 'Follow her': gt 'nichApartment', 'hiring'
 		end
 	end
-elseif $ARGS[0] = 'hiring':
+end
+
+if $ARGS[0] = 'hiring':
 	$location_type = 'event'
 	menu_off = 1
 	
@@ -414,117 +417,131 @@ elseif $ARGS[0] = 'hiring':
 		
 		act 'Leave now before you can do anymore damage':gt 'city_center'
 	end
-	
-elseif $ARGS[0] = 'visitTanya':
+end
+
+if $ARGS[0] = 'visitTanya':
 	!! Visiting Tanya is only possible if PC is not employed by Nicholas. If she is she can find Tanya by going to her room.
-	
 	$location_type = 'event'
 	menu_off = 1
 	
 	if nichWork = 1:
-		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 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':
-				'"<<$pcs_nickname>>, I really enjoy this. But I kind of promised to my parents that you will apply for the maid job. I really need you to quit your current job."'
-				'You promise her to do it as soon as possible before putting your uniform back on.'
-			else
-				'"<<$pcs_nickname>>, I really enjoy this. But I kind of promised to my parents that you will apply for the maid job. I really need you to wear a maid uniform the next time you come over."'
-				'You promise her to do so before putting your clothes back on.'
-			end
-			act 'Leave the apartment':gt 'city_center'
-		elseif (work = 0 or cheatWork = 0) and $clothingworntype = 'gm_maid':
-			'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. How does it feel?"'
-			act 'Great':
-				cla
-				'"Good, I guess. I think I could really get used to wearing it."'
-				'Tanya smiles brightly. That''s great, because you will need to wear it a lot.'
-				'"Come on now. My parents are waiting in the living room."'
-				act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
-			end
-			act 'Embarrassing':
-				cla
-				'"I don''t know. It felt a little bit embarrassing walking through the streets dressed like this."'
-				'Tanya smiles comfortingly. "Don''t worry. You will get used to it."'
-				'"Come on now. My parents are waiting in the living room."'
-				act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
-			end
-		elseif $clothingworntype = 'gm_maid':
-			'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. Are you ready to have your interview with my parents?"'
-			'"Not yet. I still have to quit my current job."'
-			'Tanya looks a little bit disappointed but then she smirks at you. "Oh, I understand. You are wearing this outfit for me and not for my parents."'
-			'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'
-		elseif (work = 0 or cheatWork = 0):
-			'When Tanya opens the door she looks a little be disappointed.'
-			'"<<$pcs_nickname>>, I told you that you need to wear a maid uniform when you meet my parents. Remember?"'
-			'She bites down on her lip. "But since you are here we could have some fun as well."'
-			'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
+		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:
 		!! 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.'
-		'"<<$pcs_nickname>>, it''s so good you are here. I have the best idea ever! Our maid left us recently, and my stepfather is looking for a replacement. I could suggest <b>you</b> to him! He pays really well, and all you gotta do is tidy up a bit, but you would be able to live right here with us!"'
-		'Tanya is so giddy that you almost don''t dare to voice your concerns: "And where do you get the idea that your stepfather would employ me? I''ve never worked as a maid before and I''m sure that, with his kind of money, he could get a much better one."'
-		!!TODO: check whether PC has worked as maid in hotel. If so she will mention or think it.
-		'"Believe me, if I ask him <i>nicely</i>, he will hire you", Tanya smiles lasciviously.'
-		
-		act 'Refuse':
-			cla
-			npc_rel['A218'] = 25
-			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-"'
-			'She cuts you off: "Then why are you telling me this shit?! You could live with me, with us, and you''d be getting free money for dusting off a table or something!"'
-			'You realize you can''t really reach her with logic while she''s in this mood, so you try to appease her. "Look, I... It''s just really sudden, and I need time to think about it. It sounds great, but if I offered you something that would change your life, you would want to have some time to think too, right?"'
-			'Tanya still doesn''t look happy about your refusal, but her anger seems to dissipate somewhat and she looks away. "Yeah, sure, whatever." You think you can see tears in her eyes when she turns her back on you and says: "I''ve gotta go do something now."'
-			'You understand immediately: "Yeah, okay, I had to leave anyway. Talk to you soon?"'
-			'"Sure", is the last thing you hear from her that day.'
-			nichJobRefused = 1
-			act 'Leave the apartment':gt 'city_center'
-		end
-		
-		act 'Agree':
-			xgt 'nichTanya','hire'
+		gt 'nichApartment', 'job_offer'
+	else
+		gt 'nichApartment', 'casual_visit'
+	end
+end
+
+if $ARGS[0] = 'agreed_to_job':
+	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 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':
+			'"<<$pcs_nickname>>, I really enjoy this. But I kind of promised to my parents that you will apply for the maid job. I really need you to quit your current job."'
+			'You promise her to do it as soon as possible before putting your uniform back on.'
+		else
+			'"<<$pcs_nickname>>, I really enjoy this. But I kind of promised to my parents that you will apply for the maid job. I really need you to wear a maid uniform the next time you come over."'
+			'You promise her to do so before putting your clothes back on.'
 		end
-		
-		act 'Maybe later':
+		act 'Leave the apartment':gt 'city_center'
+	elseif (work = 0 or cheatWork = 0) and $clothingworntype = 'gm_maid':
+		'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. How does it feel?"'
+		act 'Great':
 			cla
-			nichJobRefused = 2
-			'"Sorry Tanya, this sounds like a great opportunity, but I just don''t have time for this."'
-			'She looks a little bit disappointed.'
-			'"So maybe in the future? When you have settled whatever is holding you back? Just talk to me when you can start working here."'
-			
-			'Without saying another word she takes your hand and leads you to her room.'
-		act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
+			'"Good, I guess. I think I could really get used to wearing it."'
+			'Tanya smiles brightly. That''s great, because you will need to wear it a lot.'
+			'"Come on now. My parents are waiting in the living room."'
+			act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
 		end
-	else
-		'<center><img <<$set_imgh>> src="images/characters/city/tanya/door_01.jpg"></center>'
-		if nichJobRefusedTReact = 1:
-			'Tanya opens the door looking angrily at you. "You got some nerve showing up like nothing happened, <<$pcs_nickname>>! Do you even realize how I felt after you changed your mind about working for us in the very last second?!"'
-			'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 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 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 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."'
+		act 'Embarrassing':
+			cla
+			'"I don''t know. It felt a little bit embarrassing walking through the streets dressed like this."'
+			'Tanya smiles comfortingly. "Don''t worry. You will get used to it."'
+			'"Come on now. My parents are waiting in the living room."'
+			act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
 		end
+	elseif $clothingworntype = 'gm_maid':
+		'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. Are you ready to have your interview with my parents?"'
+		'"Not yet. I still have to quit my current job."'
+		'Tanya looks a little bit disappointed but then she smirks at you. "Oh, I understand. You are wearing this outfit for me and not for my parents."'
+		'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'
+	elseif (work = 0 or cheatWork = 0):
+		'When Tanya opens the door she looks a little be disappointed.'
+		'"<<$pcs_nickname>>, I told you that you need to wear a maid uniform when you meet my parents. Remember?"'
+		'She bites down on her lip. "But since you are here we could have some fun as well."'
+		'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
+end
+
+if $ARGS[0] = 'job_offer':
+	'<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.'
+	'"<<$pcs_nickname>>, it''s so good you are here. I have the best idea ever! Our maid left us recently, and my stepfather is looking for a replacement. I could suggest <b>you</b> to him! He pays really well, and all you gotta do is tidy up a bit, but you would be able to live right here with us!"'
+	'Tanya is so giddy that you almost don''t dare to voice your concerns: "And where do you get the idea that your stepfather would employ me? I''ve never worked as a maid before and I''m sure that, with his kind of money, he could get a much better one."'
+	!!TODO: check whether PC has worked as maid in hotel. If so she will mention or think it.
+	'"Believe me, if I ask him <i>nicely</i>, he will hire you", Tanya smiles lasciviously.'
+	
+	act 'Refuse':
+		cla
+		npc_rel['A218'] = 25
+		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-"'
+		'She cuts you off: "Then why are you telling me this shit?! You could live with me, with us, and you''d be getting free money for dusting off a table or something!"'
+		'You realize you can''t really reach her with logic while she''s in this mood, so you try to appease her. "Look, I... It''s just really sudden, and I need time to think about it. It sounds great, but if I offered you something that would change your life, you would want to have some time to think too, right?"'
+		'Tanya still doesn''t look happy about your refusal, but her anger seems to dissipate somewhat and she looks away. "Yeah, sure, whatever." You think you can see tears in her eyes when she turns her back on you and says: "I''ve gotta go do something now."'
+		'You understand immediately: "Yeah, okay, I had to leave anyway. Talk to you soon?"'
+		'"Sure", is the last thing you hear from her that day.'
+		nichJobRefused = 1
+		act 'Leave the apartment':gt 'city_center'
+	end
+	
+	act 'Agree':
+		xgt 'nichTanya','hire'
+	end
+	
+	act 'Maybe later':
+		cla
+		nichJobRefused = 2
+		'"Sorry Tanya, this sounds like a great opportunity, but I just don''t have time for this."'
+		'She looks a little bit disappointed.'
+		'"So maybe in the future? When you have settled whatever is holding you back? Just talk to me when you can start working here."'
 		
 		'Without saying another word she takes your hand and leads you to her room.'
 		act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
 	end
-elseif $ARGS[0] = 'removeNote':
+end
+
+if $ARGS[0] = 'casual_visit':
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/door_01.jpg"></center>'
+	if nichJobRefusedTReact = 1:
+		'Tanya opens the door looking angrily at you. "You got some nerve showing up like nothing happened, <<$pcs_nickname>>! Do you even realize how I felt after you changed your mind about working for us in the very last second?!"'
+		'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 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 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 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."'
+	end
+	
+	'Without saying another word she takes your hand and leads you to her room.'
+	act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
+end
+
+if $ARGS[0] = 'removeNote':
 	nichNote = 0
 	gt $loc,'return'
 end

+ 14 - 14
locations/nichBedroomServant.qsrc

@@ -243,7 +243,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			killvar 'nichTarSauna'
 			killvar 'nichTarSaunaPay'
 			!!TODO: CONT
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichTarSaunaPay > 10000:
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/chat.jpg"></center>'
 			'You wake up to the feeling of something heavy resting on you. A little bit sleepy you open your eyes and see the face of Taras directly in front of yours.'
@@ -251,7 +251,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			'"Don''t slack off now! I need 20000 <b>₽</b> in total from you. I am sure you can easily earn them for me. You are already more than half-way there."'
 			'He gives you a light smack on your face, then he stands up and leaves your room.'
 			nichGalaContractTarasCount += 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichGalaContractTarasCount = 10:
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/chat.jpg"></center>'
 			'You wake up to the feeling of something heavy resting on you. A little bit sleepy you open your eyes and see the face of Taras directly in front of yours.'
@@ -271,7 +271,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			nichTarSauna = 1
 			nichTarSaunaPay = 0
 			SaunaWhore = 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichGalaContractTarasCount = 0 or nichRand = 0:
 			
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed7.jpg"></center>'
@@ -287,7 +287,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			'"I know you prefer the real deal. Don''t worry, it won''t take long before you can experience it again."'
 			'He unties you and leaves your room.'
 			nichGalaContractTarasCount += 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichGalaContractTarasCount = 1 or nichRand = 1:	
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed9.jpg"></center>'
 			'You have an erotic dream of being tied up tightly.'
@@ -304,7 +304,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			gs 'cum_call', 'mouth_swallow', 'A513', 1
 			gs 'stat'
 			nichGalaContractTarasCount += 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichGalaContractTarasCount = 2 or nichRand = 2:	
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed3.jpg"></center>'
 			'Just as you are falling asleep, you feel yourself being lifted out of bed. You are immediately wide awake.'
@@ -322,7 +322,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			gs 'cum_call', 'anus', 'A513', 1
 			gs 'stat'
 			nichGalaContractTarasCount += 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichGalaContractTarasCount = 3 or nichRand = 3:	
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed6.jpg"></center>'
 			'You wake up to a painful hit on your butt. Instinctively you try to reach down there, but your wrists and ankles are tied to the opposite corners of your bed. There is nothing you can do besides lie on your stomach.'
@@ -337,7 +337,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			'You are just too exhausted to stay awake for much longer. During another pause of the vibrator you fall asleep. You have some erotic dreams about being fucked by various guys and girls with the ongoing vibrations of the vibrator being a part of it.'
 			'You don''t know how long Taras left the vibrator inside of you, but when you wake up next, you are untied and the vibrator is gone.'
 			nichGalaContractTarasCount += 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 			!! TODO: CONT
 		elseif nichGalaContractTarasCount = 4 or nichRand = 4:	
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed4x1.jpg"></center>'
@@ -367,7 +367,7 @@ elseif $ARGS[0] = 'sleepEvents':
 				'"I am sure you will enjoy this."'
 				'He unties your right wrist, allowing you to remove the other restraints, before he leaves your room again.'
 				nichGalaContractTarasCount += 1
-				act 'Back to sleep': gt 'bed2','dream'
+				act 'Back to sleep': gt 'sleep', 'dream'
 			end
 		elseif nichGalaContractTarasCount = 5 or nichRand = 5:	
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed2.jpg"></center>'
@@ -382,7 +382,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			'"Well done, slut. If you haven''t struggled that much, I wouldn''t have had so much fun."'
 			'It was Taras all along. He picks up his rope and leaves your room.'
 			nichGalaContractTarasCount += 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichGalaContractTarasCount = 6 or nichRand = 6:
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed10.jpg"></center>'
 			'Suddenly you wake up. Your butt hurts. You realize that you are tied to your bed and that somebody is sitting next to you, spanking your ass.'
@@ -395,7 +395,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			'He gives you three last hits, then he stands up and unties you.'
 			'"At least you have a nice ass, slave."'
 			nichGalaContractTarasCount += 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichGalaContractTarasCount = 7 or nichRand = 7:	
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed1x1.jpg"></center>'
 			'You get woken up by a slap to your breast. You want to shriek, but once again you are tied to your bed. A ball gag in your mouth prevents you from making any sound.'
@@ -423,7 +423,7 @@ elseif $ARGS[0] = 'sleepEvents':
 					'"I knew you would enjoy it. While normal people like me sleep at night, sluts like you want to get fucked all night long, and I am nothing but supportive in this regard."'
 					'He leaves you with a grin on his face.'
 					nichGalaContractTarasCount += 1
-					act 'Back to sleep': gt 'bed2','dream'
+					act 'Back to sleep': gt 'sleep', 'dream'
 				end
 			end
 		elseif nichGalaContractTarasCount = 8 or nichRand = 8:	
@@ -437,7 +437,7 @@ elseif $ARGS[0] = 'sleepEvents':
 			'"Damn. My services are required. I am sorry, but I am afraid we will have to continue our little fun another time."'
 			'He unties you and leaves your room without saying another word.'
 			nichGalaContractTarasCount += 1
-			act 'Back to sleep': gt 'bed2','dream'
+			act 'Back to sleep': gt 'sleep', 'dream'
 		elseif nichGalaContractTarasCount = 9 or nichRand = 9:	
 			'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/taras/bed5.jpg"></center>'
 			'No air...'
@@ -464,7 +464,7 @@ elseif $ARGS[0] = 'sleepEvents':
 						'As you wake up this time, Taras is gone and you are untied.'
 						'One horrific thought comes to your mind and makes you shiver: this man shows utter neglect for your safety. What if one day he kills you by accident?'
 						nichGalaContractTarasCount += 1
-						act 'Back to sleep': gt 'bed2','dream'
+						act 'Back to sleep': gt 'sleep', 'dream'
 					end
 				end
 			end
@@ -501,7 +501,7 @@ elseif $ARGS[0] = 'sleepEvents':
 						gs 'stat'
 						'He unties you and leaves your room again.'
 						nichGalaContractTarasCount += 1
-						act 'Back to sleep': gt 'bed2','dream'
+						act 'Back to sleep': gt 'sleep', 'dream'
 					end
 				end
 			end

+ 250 - 294
locations/nichTanya.qsrc

@@ -15,13 +15,7 @@
 !!					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.
-!! nichTanyaOpinion (deprecated!): 
-!!					0= she doesn't know you
-!!					1= you are her lover
-!!					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
-!! 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['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
 !! nichTanya['DateCounter']
@@ -32,8 +26,6 @@
 !! 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
 
 !! nichTanya['Strapon']: >0: Tanya owns a strapon and might use it sometimes (the value is the size of the strapon)
 
@@ -55,8 +47,8 @@ if $ARGS[0] = 'bedroomTanya':
 	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
 	nichTanya['PropDate'] = 0
 	nichTanya['PropSex'] = 0
-	
-	
+
+
 	if nichGalaKnowsPT = 10:
 		!! Galas order to break up
 		if nichTanya['Relationship'] = 0:
@@ -64,13 +56,13 @@ if $ARGS[0] = 'bedroomTanya':
 			nichGalaKnowsPT = 11
 			gt 'nichTanya', 'bedroomTanya'
 		else
-			'Gala ordered you to break up with Tanya. Maybe you should talk with her. But if you do so you risk losing her.' 
+			'Gala ordered you to break up with Tanya. Maybe you should talk with her. But if you do so you risk losing her.'
 			cla
 			act 'Talk with her':
 				'"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 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."'
@@ -178,7 +170,7 @@ if $ARGS[0] = 'bedroomTanya':
 					'"You will meet Grigory shortly. I''m sure you will like him. You two have much in common."'
 					nichTanya['BF'] = 2
 				end
-				
+
 				act 'Stand up':
 					gt $loc
 				end
@@ -242,9 +234,9 @@ if $ARGS[0] = 'bedroomTanya':
 		end
 		nichTanya['PropSex'] = 1
 		nichTanya['PropDate'] = 1
-	
+
 	end
-	
+
 	if nichTanya['PropSex'] = 1:
 		act 'Propose having sex':
 			cla
@@ -266,10 +258,10 @@ if $ARGS[0] = 'bedroomTanya':
 					gt 'nichTanya', 'sexL'
 				end
 			end
-			
+
 		end
 	end
-	
+
 	if nichTanya['PropDate'] = 1 and (nichTanya['DateLast'] ! daystart or nichDebug = 1):
 		act 'Propose going on a date':
 			npc_rel['A218'] += rand(1,2)
@@ -286,7 +278,7 @@ if $ARGS[0] = 'bedroomTanya':
 				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."'
 					nichTanya['Date'] = 100
-				else	
+				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."'
@@ -320,19 +312,21 @@ if $ARGS[0] = 'bedroomTanya':
 			end
 		end
 	end
-	
+
 	nichTanya['PropDate'] = 0
 	nichTanya['PropSex'] = 0
-	
+
 	act 'Talk with her':
 		gt 'nichTanya', 'chat'
 	end
-	
-	
+
+
 	act 'Move away':
 		gt $loc
 	end
-elseif $ARGS[0] = 'bathroom':
+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:
@@ -342,11 +336,11 @@ elseif $ARGS[0] = 'bathroom':
 			*clr
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower_mol0.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 'clothing', 'strip_all'
 			gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
 			gs 'stat'
-			
+
 			'"Hey <<$pcs_nickname>>."'
 			'She kisses you and start stroking your hair. Then she stops abruptly.'
 			'"We shouldn''t be doing this here. Lets meet in my room later. We have more privacy there."'
@@ -359,23 +353,23 @@ elseif $ARGS[0] = 'bathroom':
 			*clr
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower_mol0.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 'clothing', 'strip_all'
 			gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
 			gs 'stat'
-		
+
 			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!"'	
+				'"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:
 				'Tanya pushes you off.'
-				'"What the hell are you doing, <<$pcs_nickname>>?! I told you it''s over! Get lost!"'	
+				'"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'
 			elseif pcs_apprnc < 80:
 				npc_rel['A218'] -= rand(1,2)
 				'Tanya pushes you off.'
-				'"What the hell are you doing, <<$pcs_nickname>>?! Get lost!"'	
+				'"What the hell are you doing, <<$pcs_nickname>>?! Get lost!"'
 				act 'Leave': gs 'underwear', 'wear' & gs 'clothing', 'wear_last_worn' & 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 grabbed her. Did she expect somebody else?.'
@@ -384,7 +378,7 @@ elseif $ARGS[0] = 'bathroom':
 					npc_rel['A218'] += rand(1,2)
 					cla
 					*clr
-					
+
 					'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower_mol1.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.'
 
@@ -422,7 +416,9 @@ elseif $ARGS[0] = 'bathroom':
 		end
 	end
 	act 'Leave': gt 'nichBathMaster','return'
-elseif $ARGS[0] = 'bathroomMolestSuccess':
+end
+
+if $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."'
@@ -435,18 +431,20 @@ elseif $ARGS[0] = 'bathroomMolestSuccess':
 	gs 'clothing', 'wear_last_worn'
 	gs 'stat'
 	act 'Back': gt 'nichApartment'
-elseif $ARGS[0] = 'date':
+end
+
+if $ARGS[0] = 'date':
 	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.'
 			'Tanya pays for the tickets and you settle down in your seats. You are alone in the last row.'
-			
+
 			act 'Watch the movie':
 				nichDateState = 10
 				gt 'nichTanya','date'
 			end
-			
+
 			act 'Kiss Tanya':
 				npc_rel['A218'] += rand(1,2)
 				nichDateState = 20
@@ -463,7 +461,7 @@ elseif $ARGS[0] = 'date':
 				gt 'nichTanya','date'
 			end
 		elseif nichDateState = 20:
-			*clr & cla 
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/sex/kinoKissLesbian1.jpg"></center>'
 			'The light goes dark and the movie starts. You lean over to Tanya and the two of you share a deep kiss.'
 			act 'Go down on her':
@@ -595,7 +593,7 @@ elseif $ARGS[0] = 'date':
 				gt 'nichBedroomTanja'
 			end
 		end
-	
+
 	elseif nichTanya['Date'] = 100:
 		!! Tanya wants to buy a dildo
 		if nichDateState = 0:
@@ -625,7 +623,7 @@ elseif $ARGS[0] = 'date':
 						nichDateState = 10
 						gt 'nichTanya','date'
 					end
-				end			
+				end
 				act 'Igor (25 cm)':
 					nichTanya['Strapon'] = 25
 					'"I think I like Igor best."'
@@ -686,7 +684,7 @@ elseif $ARGS[0] = 'date':
 				nichDateState = 40
 				gt 'nichTanya','date'
 			end
-		elseif nichDateState = 40:	
+		elseif nichDateState = 40:
 			'<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.'
@@ -695,7 +693,7 @@ elseif $ARGS[0] = 'date':
 			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.'
 			'She doens''t untie you for another ten minutes. You feel her lying on your back, her breasts resting on your shoulders. Finally she unties one of your wrists so you are able to untie the other knots.'
-			
+
 			minut += 15
 			act 'Finish':
 				gs 'arousal', 'end'
@@ -713,24 +711,24 @@ elseif $ARGS[0] = 'date':
 			gt 'nichBedroomTanja'
 		end
 	end
-	
-elseif $ARGS[0] = 'desc':
+end
+
+if $ARGS[0] = 'desc':
 	'<center><img <<$set_imgh>> src="images/characters/city/tanya/0'+rand(1,3)+'.jpg"></center>'
 	'Tanya is the daughter of Gala and the step-daughter of Nicholas.'
-	
-	
+
 	nichTanyaBdD = 22
 	nichTanyaBdM = 6
 	nichTanyaBdY = 1998
-	
+
 	if month > nichTanyaBdM or (month = nichTanyaBdM and day > nichTanyaBdD):
 		'She is ' + (year - nichTanyaBdY) + ' years old.'
 	elseif month = nichTanyaBdM and day = nichTanyaBdD:
 		if mid(year - nichTanyaBdY,4,1) = 1:
 			'Today is her ' + (year - nichTanyaBdY) + 'st birthday.'
-		if mid(year - nichTanyaBdY,4,1) = 2:
+		elseif mid(year - nichTanyaBdY,4,1) = 2:
 			'Today is her ' + (year - nichTanyaBdY) + 'nd birthday.'
-		if mid(year - nichTanyaBdY,4,1) = 3:
+		elseif mid(year - nichTanyaBdY,4,1) = 3:
 			'Today is her ' + (year - nichTanyaBdY) + 'rd birthday.'
 		else
 			'Today is her ' + (year - nichTanyaBdY) + 'th birthday.'
@@ -738,7 +736,7 @@ elseif $ARGS[0] = 'desc':
 	else
 		'She is ' + (year - nichTanyaBdY-1) + ' years old.'
 	end
-	
+
 	if nichTanya['Relationship'] = 0:
 		if nichTanya['RelationshipState'] = 0:
 			'She seems to be pretty indifferent about you.'
@@ -758,7 +756,7 @@ elseif $ARGS[0] = 'desc':
 			'She is your girlfriend. She expects you to be faithful. Likewise you can expect the same from her.'
 		end
 	end
-	
+
 	if nichTanya['Relationship'] = 1:
 		if nichTanya['Dominance'] >= 70:
 			'She acts very dominantly around you (<<nichTanya[''Dominance'']>>)'
@@ -772,11 +770,11 @@ elseif $ARGS[0] = 'desc':
 			'Her behaviour around you is neither remarkably dominant nor submissive (<<nichTanya[''Dominance'']>>)'
 		end
 	end
-	
+
 	'Friendship with Tanya:' & gs 'journal', 'relindex', 'A218'
-	
+
 	$nichTemp = func('nichUtil','npcActivity','tanya')
-	
+
 	if $nichTemp = 'sleep':
 		'Usually Tanya is sleeping at this time.'
 	elseif $nichTemp = 'bathMorning':
@@ -806,232 +804,185 @@ elseif $ARGS[0] = 'desc':
 	else
 		'You have no idea where Tanya is at the moment.'
 	end
-	
+
 	killvar '$nichTemp'
-	
-	
+
+
 	act 'Back': gt $loc
+end
 
-elseif $ARGS[0] = 'sexL':
+if $ARGS[0] = 'sexL':
 	!! lesbian sex between Tanya and PC
-	nichTempArousal = 5
-	minut += nichTempArousal
-	
-	if $ARGS[1] = '' or $ARGS[1] = 'start':
-		!! the encounter starts here
-		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
-		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.'
-	elseif $ARGS[1] = 'kiss':
-		$nichTempPic = func('nichUtil','tanyaPic','sexL','kiss')
-		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
-		!!TODO:description
-	elseif $ARGS[1] = 'aeatout':
-		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':
-		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':
-		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':
-		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':
-		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 = nichTanya['Strapon']
-		gs 'arousal', 'vaginal_strap', -nichTempArousal, 'lesbian', 'sub'
-	elseif $ARGS[1] = 'asovaginal':
-		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.'
-		gs 'arousal', 'vaginal_strap_give', -nichTempArousal, 'lesbian', 'dom'
-	end
-	
-	killvar 'nichTempArousal'
-	
-	nichTanyaChanceDom = 20
-	nichTanyaChanceSub = 20
-		
+	!! the encounter starts here
+	nichTanya['FuckLast'] = daystart
+	if nichTanya['FuckToday'] = 0: nichTanya['FuckCounter'] += 1
+	nichTanya['FuckToday'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sex/undress'+rand(0,3)+'.jpg"></center>'
+	'Tanya slowly undresses and poses seductively for you. "Now you."'
+	'You make a show or striping out of your clothes, it takes some effort not to rush but the anticipation already has you turned on and the rewards are greater if you take your time.'
+	gs 'nichTanya','sex_matrix'
+end
+
+if $ARGS[0] = 'repeat':
+	minut += 5
+	!! PC wants another round. Very similar to start but Tanya is already naked
+	nichTanya['FuckToday'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sex/pose'+rand(0,1)+'.jpg"></center>'
+	'Tanya smiles at you and poses seductively and purrs, "Ready to go for another round?"'
+	'She hasn''t mastered the sultry act but the flawed effort is both sexy and cute so you are not about to complain.'
+	gs 'nichTanya','sex_matrix'
+end
+
+if $ARGS[0] = 'kiss':
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/kiss/kiss'+rand(0,5)+'.jpg"></center>'
+	'Tanya and you kiss passionately pushing your naked bodies together. The pleasure of just kissing has you melting in her arms and her yours, you have no idea how long this continues but finally you break the kiss as one of you will have to decide what to do next.'
+	gs 'arousal', 'kiss', 5, 'lesbian'
+	gs 'nichTanya','sex_matrix'
+end
+
+if $ARGS[0] = 'aeatout':
+	nichTanya['FuckPositions'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/aeatout/aeatout'+rand(0,3)+'.jpg"></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', 5, 'lesbian'
+	gs 'arousal', 'vaginal_finger_give', -5, 'lesbian'
+	gs 'nichTanya','sex_matrix'
+end
+
+if $ARGS[0] = 'peatout':
+	nichTanya['FuckPositions'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/peatout/peatout'+rand(0,6)+'.jpg"></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', 5, 'lesbian'
+	gs 'nichTanya','sex_matrix'
+end
+
+if $ARGS[0] = 'arimjob':
+	nichTanya['FuckPositions'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/arimjob/arimjob'+rand(0,3)+'.jpg"></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', 5, 'lesbian'
+	gs 'nichTanya','sex_matrix'
+end
+
+if $ARGS[0] = 'primjob':
+	nichTanya['FuckPositions'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/primjob/primjob'+rand(0,2)+'.jpg"></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', 5, 'lesbian'
+	gs 'nichTanya','sex_matrix'
+end
+
+if $ARGS[0] = 'psovaginal':
+	nichTanya['FuckPositions'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/pstrapon/pstrapon'+rand(0,3)+'.jpg"></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 = nichTanya['Strapon']
+	gs 'arousal', 'vaginal_strap', 5, 'lesbian'
+	gs 'nichTanya','sex_matrix'
+end
+
+if $ARGS[0] = 'asovaginal':
+	nichTanya['FuckPositions'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/astrapon/astrapon'+rand(0,5)+'.jpg"></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.'
+	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
+	gs 'nichTanya','sex_matrix'
+end
+
+
+if $ARGS[0] = 'sex_matrix':
 	gs 'stat'
-	
-	if nichTanya['Dominance'] >= 70:
-		nichTanyaChanceDom = 40
-		nichTanyaChanceSub = 5
-	elseif nichTanya['Dominance'] >= 20:
-		nichTanyaChanceDom = 20
-	elseif nichTanya['Dominance'] <= -70:
-		nichTanyaChanceDom = 5
-		nichTanyaChanceSub = 40
-	elseif nichTanya['Dominance'] <= -30:
-		nichTanyaChanceSub = 20
-	end
-	
-	nichRand = rand(1,100)
-	
-	if nichRand <= nichTanyaChanceDom:
-		!! Tanya is dominant
-		nichRand = rand(0,2)
-		if nichRand = 0 and nichTanya['Strapon'] > 0:
-			!!Tanya wants to use her strapon
-			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.'
-			end
-			act 'Distract her':
-				gt 'nichTanya','sexL','kiss'
-			end
-			act 'Get fucked':
-				nichTanya['FuckDom'] += 2
-				gt 'nichTanya','sexL','psovaginal'
-			end
-		elseif nichRand <= 1:
-			!! Tanya wants her pussy to be eaten
-			if nichTanya['Dominance'] >= 70:
-				'Tanya pushes your head in the direction of her vagina. Apparently she expects you to service her with your tongue.'
+
+	if rand(0,1) = 0:
+	!! Tanya initiates action
+		*nl
+		if rand(0,1) = 0:
+			!! Tanya is assertive
+			nichRand = rand(0,2)
+			if nichRand = 0 and nichTanya['Strapon'] > 0:
+				!!Tanya wants to use her strapon
+				'Tanya takes out the strap-on the two of you bought together and waves it. "I want to take you."'
+				act 'Distract her':
+					gt 'nichTanya','kiss'
+				end
+				act 'Get fucked':
+					gt 'nichTanya','psovaginal'
+				end
+			elseif nichRand <= 1:
+				!! Tanya wants her pussy to be eaten
+				'Tanya softly pushes your head down her body, you kiss between her breasts and she asks, "Keep going."'
+				act 'Eat her pussy':
+					gt 'nichTanya','aeatout'
+				end
 			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':
-				nichTanya['FuckDom'] += 1
-				gt 'nichTanya','sexL','aeatout'
-			end
-			act 'Have her lick you instead':
-				nichTanya['FuckSub'] += 1
-				gt 'nichTanya','sexL','peatout'
+				'Tanya kisses you seductively, as she breaks the kiss and with a sly smile she states, "I want that tongue on my butt hole."'
+				act 'Rim her':
+					gt 'nichTanya','arimjob'
+				end
+				act 'Eat her pussy instead':
+					gt 'nichTanya','aeatout'
+				end
 			end
 		else
-			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':
-				nichTanya['FuckDom'] += 1
-				gt 'nichTanya','sexL','arimjob'
-			end
-			act 'Have her lick you instead':
-				nichTanya['FuckSub'] += 1
-				gt 'nichTanya','sexL','primjob'
-			end
-		end
-	elseif nichRand >= 100-nichTanyaChanceSub:
-		!! Tanya is submissive
-		nichRand = rand(0,1)
-		if nichRand = 0:
-			!! Tanya wants to eat your pussy
+			!! Tanya is submissive
+			nichRand = rand(0,1)
+			if nichRand = 0:
+				!! Tanya wants to eat your pussy
 
-			'Tanya smiles at you while she approaches your vagina with her head. Apparently she wants to eat your pussy.'
+				'Tanya kisses your breasts and abs slowly moving towards your pussy.'
+				act 'Get eaten out':
+					gt 'nichTanya','peatout'
+				end
+			!!elseif nichRand = 1:
+			else
+				'Tanya approaches you from behind, her hands stroking your back and planting kisses from your shoulders down to your butt cheeks. "Your butt is irresistible <<$pcs_nickname>>, I want it."'
 
-			act 'Lick her instead':
-				nichTanya['FuckDom'] += 1
-				gt 'nichTanya','sexL','aeatout'
-			end
-			act 'Have her lick you':
-				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':
-				nichTanya['FuckDom'] += 1
-				gt 'nichTanya','sexL','arimjob'
-			end
-			act 'Have her lick you':
-				nichTanya['FuckSub'] += 1
-				gt 'nichTanya','sexL','primjob'
+				act 'Let her rim you':
+					gt 'nichTanya','primjob'
+				end
+				act 'Get her to eat you out instead':
+					gt 'nichTanya','peatout'
+				end
 			end
 		end
-		
 	else
-		!! no special event
+		!! PC takes initiative
 		act 'Kiss her':
-			gt 'nichTanya','sexL','kiss'
+			gt 'nichTanya','kiss'
 		end
-		act 'Lick her':
-			nichTanya['FuckDom'] += 1
-			gt 'nichTanya','sexL','aeatout'
+		act 'Eat her pussy':
+			gt 'nichTanya','aeatout'
 		end
-		act 'Have her lick you':
-			nichTanya['FuckSub'] += 1
-			gt 'nichTanya','sexL','peatout'
+		act 'Have her eat you out':
+			gt 'nichTanya','peatout'
 		end
-		act 'Give rimjob':
-			nichTanya['FuckDom'] += 1
-			gt 'nichTanya','sexL','arimjob'
+		act 'Rim her':
+			gt 'nichTanya','arimjob'
 		end
-		act 'Receive rimjob':
-			nichTanya['FuckSub'] += 1
-			gt 'nichTanya','sexL','primjob'
+		act 'Have her rim you':
+			gt 'nichTanya','primjob'
 		end
 		if nichTanya['Strapon'] > 0:
-			act 'Get fucked (her strapon)':
-				nichTanya['FuckDom'] += 1
-				gt 'nichTanya','sexL','psovaginal'
+			act 'Get fucked by her (strapon)':
+				gt 'nichTanya','psovaginal'
 			end
 		end
 		if strapon > 0:
-			act 'Fuck her (your strapon)':
-				nichTanya['FuckSub'] += 1
-				gt 'nichTanya','sexL','asovaginal'
+			act 'Fuck her (strapon)':
+				gt 'nichTanya','asovaginal'
 			end
 		end
 		if nichTanya['FuckPositions'] >= 3:
 			act 'Finish':
-				if nichTanya['FuckSub'] >= nichTanya['FuckDom'] * 3:
-					nichTanya['Dominance'] -= 2
-				elseif nichTanya['FuckDom'] >= nichTanya['FuckSub'] * 3:
-					nichTanya['Dominance'] += 2
-				end
-				
-				nichTanya['Dominance'] = min(100,max(nichTanya['Dominance'],-100))
-				
-				killvar 'nichTanya['FuckPositions']'
-				killvar 'nichTanya['FuckDom']'
-				killvar 'nichTanya['FuckSub']'
-				
 				gs 'arousal','end'
-				
 				gt 'nichTanya', 'sexLAfter'
 			end
 		end
 	end
+end
 
-
-elseif $ARGS[0] = 'sexLAfter':
+if $ARGS[0] = 'sexLAfter':
 	!! Tanya will have a special after-sex-event if PC promised to take Nicholas job
 	if nichWork = 1: gt 'nichApartment', 'visitTanya'
 	if nichWork = 2 and nichGalaKnowsPT = 0:
@@ -1066,9 +1017,8 @@ elseif $ARGS[0] = 'sexLAfter':
 		end
 	end
 	!! 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
-	$nichTanyaPic = func('nichUtil','tanyaPic','sexL','after')
-	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/tanya/sex/relax'+rand(0,5)+'.jpg"></center>'
+	'Tanya lies on the bed basking in a post sex glow looking hotter than ever. Its very tempting to jump her again but you could also take a break to chat or just cuddle for a bit. Of course you could also leave if you have things to do.'
 	act 'Chat':
 		gt 'nichTanya','chat'
 	end
@@ -1080,15 +1030,16 @@ elseif $ARGS[0] = 'sexLAfter':
 			'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
-			gt 'nichTanya','sexL','repeat'
+			gt 'nichTanya','repeat'
 		end
 	end
 	act 'Dress and leave':
 		if nichWork ! 2: gt 'city_center'
 		gt $loc, 'return'
 	end
-	
-elseif $ARGS[0] = 'chat':
+end
+
+if $ARGS[0] = 'chat':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
 	if $ARGS[1] = 'relationship':
@@ -1098,24 +1049,24 @@ elseif $ARGS[0] = 'chat':
 		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
@@ -1131,12 +1082,12 @@ elseif $ARGS[0] = 'chat':
 				!! 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."'
 			end
-			
+
 			act 'His marriage':
 				'"What do you think about his marriage to your mother?"'
 				if nichTanya['Relationship'] = 0:
@@ -1145,7 +1096,7 @@ elseif $ARGS[0] = 'chat':
 					'"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."'
@@ -1193,7 +1144,7 @@ elseif $ARGS[0] = 'chat':
 			act 'Never mind':
 				gt 'nichTanya', 'chat'
 			end
-		end	
+		end
 	else
 		'"What would you like to talk about?"'
 		if nichTanya['Relationship'] = 1:
@@ -1201,23 +1152,23 @@ elseif $ARGS[0] = 'chat':
 				gt 'nichTanya','chat', 'relationship'
 			end
 		end
-		
+
 		if nichJobRefused = 2:
 			act 'Job offer':
 				gt 'nichTanya','chat', 'jobOffer'
 			end
 		end
-		
+
 		if nichWork = 2:
 			act 'Tanyas room':
 				gt 'nichTanya','chat', 'room'
 			end
 		end
-		
+
 		act 'Tanyas family':
 			gt 'nichTanya','chat', 'family'
 		end
-		
+
 		if nichTanya['Uni'] = 11:
 			act 'University':
 				'"I talked with Nicholas. And he really would like you to attend your courses at university."'
@@ -1294,16 +1245,16 @@ elseif $ARGS[0] = 'chat':
 				end
 			end
 		end
-		
+
 	end
-	
-	
-	
+
 	act 'Finish chatting':
 		if nichWork = 0: gt 'city_center'
 		gt $loc, 'return'
 	end
-elseif $ARGS[0] = 'cuddle':
+end
+
+if $ARGS[0] = 'cuddle':
 	*clr & cla
 	$nichTanyaPic = func('nichUtil','tanyaPic','cuddle')
 	'<center><img <<$set_imgh>> src="<<$nichTanyaPic>>"></center>'
@@ -1316,7 +1267,9 @@ elseif $ARGS[0] = 'cuddle':
 	act 'Leave and get dressed':
 		gt 'city_center'
 	end
-elseif $ARGS[0] = 'hire':
+end
+
+if $ARGS[0] = 'hire':
 	cla
 	npc_rel['A218'] += 5
 	nichWork = 1
@@ -1327,16 +1280,16 @@ elseif $ARGS[0] = 'hire':
 	else
 		'"Yes, I''ll take your offer. If your stepfather wants to hire m-" You are cut off by Tanya''s fierce hug and kiss.'
 	end
-	
+
 	'"That''s great, I''m so happy right now. Of course you will need to pass the interview of my parents."'
 	'You look at her with a questioning look.'
 	'"Don''t worry. Since I will vouch for you this will be nothing but a formality. The only thing important is that you look presentable. And that includes wearing a maid uniform."'
 	'"Where would I get a maid uniform?"'
 	'"I think they sell them at G&M. One of their shops is at the mall nearby. But make sure you don''t buy an outfit that''s too skimpy. Nicholas wouldn''t mind but my mother surely would."'
-	
+
 	if hour <= 21 and (work = 0 or cheatWork = 1):
 		'"Actually we could go shopping for a uniform right now. The mall is still open and we would even make it back in time to present you to my parents. What do you say?"'
-		
+
 		act 'Go shopping together':
 			'"Ok, that sounds like a great idea."'
 			'Tanya beams and takes her purse. "Great, lets go then."'
@@ -1354,7 +1307,7 @@ elseif $ARGS[0] = 'hire':
 			act 'Leave the apartment':gt 'city_center'
 		end
 	else
-	
+
 		act 'Understood':
 			cla
 			'She hugs you again.'
@@ -1362,8 +1315,9 @@ elseif $ARGS[0] = 'hire':
 			act 'Leave the apartment':gt 'city_center'
 		end
 	end
-	
-elseif $ARGS[0] = 'shoppingUniform':
+end
+
+if $ARGS[0] = 'shoppingUniform':
 	*clr & cla
 	if $ARGS[1] = '':
 		minut += 10
@@ -1372,28 +1326,28 @@ elseif $ARGS[0] = 'shoppingUniform':
 	else
 		minut += 1
 	end
-	
+
 	gs 'stat'
-	
+
 	:nichTanyaShopUniLoop
 	nichRand = rand(1,49)
 	if gm_maid[nichRand] = 1 and nichLoopAttempt < 100: nichLoopAttempt += 1 & jump 'nichTanyaShopUniLoop'
-	
+
 	gs 'clothing_attributes', 'uniform', nichRand
-	
+
 	price = (20 * ((5 * CloQuality) + 100)) * 3 / 2
 	price = price / 50 * 50
 	'<center><img <<$set_imgh>> src="images/pc/items/gm/maid/<<nichRand>>.jpg"></center>'
 	if CloInhibit = 20:
 		'After a minute Tanya returns with an uniform. "What do you think about this one? My mother wouldn''t mind it but you would still look sexy."'
-	elseif CloInhibit > 20:	
+	elseif CloInhibit > 20:
 		'After a minute Tanya returns with an uniform. "What do you think about this one? I think you would look delicious wearing it. But my mother would surely think that you''re a slut."'
 	else
 		'After a minute Tanya returns with an uniform. "What do you think about this one? I think it''s too much cloth. But I guess you can put it off when we want to have fun."'
 	end
-	
+
 	'She takes a look at the pricetag. "It only costs <<price>>."'
-	
+
 	if CloInhibit > pcs_inhib:
 		act 'Too revealing':
 			'"I think I won''t be comfortable showing this much skin."'
@@ -1411,7 +1365,7 @@ elseif $ARGS[0] = 'shoppingUniform':
 			act 'Accept':
 				'"Thank you, Tanya. That would be great."'
 				'Tanya smiles and hugs you. She heads to the cashier and pays your new uniform with her credit card.'
-				
+
 				gm_maid[nichRand] = 1
 				gm_maid_h[nichRand] = 50
 				gm_maid_b[nichRand] = pcs_hips
@@ -1437,9 +1391,9 @@ elseif $ARGS[0] = 'shoppingUniform':
 			gm_maid[nichRand] = 1
 			gm_maid_h[nichRand] = 50
 			gm_maid_b[nichRand] = pcs_hips
-			
+
 			gs 'stat'
-			
+
 			cla
 			act 'Return to her apartment':
 				gt 'nichTanya','prepareInterview'
@@ -1449,9 +1403,9 @@ elseif $ARGS[0] = 'shoppingUniform':
 			*clr & cla
 			gt 'nichTanya','shoppingUniform','return'
 		end
-		
+
 	end
-	
+
 	act 'Stop looking':
 		cla
 		'"I don''t think we will find something suitable today, Tanya."'
@@ -1460,32 +1414,34 @@ elseif $ARGS[0] = 'shoppingUniform':
 			gt 'city_center'
 		end
 	end
-elseif $ARGS[0] = 'prepareInterview':
+end
+
+if $ARGS[0] = 'prepareInterview':
 	$clothingworntype = 'gm_maid'
 	clothingwornnumber = nichRand
 	'The both of you return to Tanyas apartment. You change into your new uniform before Tanya starts to inspect you carefully.'
-	
+
 	if spdirty > 0 or (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or cumloc[1] = 1 or cumloc[2] = 1 or cumloc[4] = 1 or cumloc[5] = 1 or cumloc[6] = 1 or cumloc[7] = 1 or cumloc[14] = 1 or cumloc[12] = 1:
 		'"How did you manage to smell like cum? You can''t meet my parents like this."'
 		'She leads you to her bathroom where you take a quick shower.'
 		gs 'cum_cleanup'
 		minut += 5
 	end
-	
+
 	if lashair ! 1 and pcs_pubes > 3 or pcs_leghair > 3:
 		'"Your body hair is too long. But you can fix that later, that won''t be a reason not to hire you."'
 	end
-	
+
 	if pcs_hairbsh = 0:
 		'"You should brush your hair."'
 		'She hands you a brush and watches you while you do as you are told.'
 		pcs_hairbsh = 1
 	end
-	
+
 	if ShoHeels < 4:
 		'"Nicholas might tell you to wear other shoes for work. But I think he won''t expect you to wear them right now."'
 	end
-	
+
 	'Taking a final look she finally gives you a nod. "I think you look fine. Come on now. My parents are waiting in the living room."'
 	act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
 end

+ 1 - 31
locations/nichUtil.qsrc

@@ -502,7 +502,6 @@ end
 !! 2 (required for sex): Specific activity (prefix a: Tanya acts, prefix p: Tanya gets acted upon; "")
 !! 3 (optional): Partner for sex-options (0 or unset: PC, 1: PC and ignore PC appearance)
 if $ARGS[0] = 'tanyaPic':
-	gs 'nichUtil','updatePcHair'
 
 	$nichTempFolder = 'images/characters/city/tanya/'
 	
@@ -514,36 +513,7 @@ if $ARGS[0] = 'tanyaPic':
 		$RESULT = $nichTempFolder + 'sex/cuddle'+rand(0,4)+'.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
-			$RESULT = $nichTempFolder + 'sex/relax'+rand(0,5)+'.jpg'
-		elseif $ARGS[2] = 'pose':
-			$RESULT = $nichTempFolder + 'sex/pose'+rand(0,1)+'.jpg'
-		elseif $ARGS[2] = 'undress':
-			$RESULT = $nichTempFolder + 'sex/undress'+rand(0,3)+'.jpg'
-		end
-	end
-	if $ARGS[1] = 'sexL':
-		if $ARGS[2] = 'kiss':
-			$RESULT = $nichTempFolder + 'sexL/kiss/kiss'+rand(0,5)+'.jpg'
-		elseif $ARGS[2] = 'aeatout':
-			$RESULT = $nichTempFolder + 'sexL/aeatout/aeatout'+rand(0,3)+'.jpg'
-		elseif $ARGS[2] = 'peatout':
-			$RESULT = $nichTempFolder + 'sexL/peatout/peatout'+rand(0,6)+'.jpg'
-		elseif $ARGS[2] = 'arimjob':
-			$RESULT = $nichTempFolder + 'sexL/arimjob/arimjob'+rand(0,3)+'.jpg'
-		elseif $ARGS[2] = 'primjob':
-			$RESULT = $nichTempFolder + 'sexL/primjob/primjob'+rand(0,2)+'.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'
-		elseif $ARGS[2] = 'psovaginal':
-			$RESULT = $nichTempFolder + 'sexL/pstrapon/pstrapon'+rand(0,3)+'.jpg'
-		end
-	elseif $ARGS[1] = 'sexH':
+	if $ARGS[1] = 'sexH':
 		if $ARGS[2] = 'spy':
 			if $ARGS[3] = '' or $ARGS[3] = 'nicholas':
 				$RESULT = $nichTempFolder + 'sexNich/nich'+rand(0,5)+'.jpg'

+ 0 - 2
locations/saveupdater.qsrc

@@ -1519,8 +1519,6 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 		nichTanya['FuckLast'] = nichTanyaFuckLast
 		nichTanya['FuckToday'] = nichTanyaFuckToday
 		nichTanya['FuckPositions'] = nichTanyaFuckPositions
-		nichTanya['FuckDom'] = nichTanyaFuckDom
-		nichTanya['FuckSub'] = nichTanyaFuckSub
 		nichTanya['Strapon'] = nichTanyaStrapon
 		nichTanya['Dominance'] = nichTanyaDominance
 		nichTanya['Uni'] = nichTanyaUni