Merge remote-tracking branch 'kevin/master'

locations/anush_bedroom_city.qsrc

@@ -237,8 +237,6 @@ if $ARGS[0] = 'night_stand':
 			'You blush slightly and shake your head before closing the drawer, which just causes her to smirk in amusement.'
 			act 'Close the drawer':gt 'anush_bedroom_city','anushroom'
 		end
-!!this goes to anushkaev1 can you do what ever code is needed so both here and her pav apartment lead to it and then they go back to the correct location afterwards? That will save us from making a new sex folder with just a lot of repeat of the same content.
-!HM: done
 		act 'Strap-on': $returnLoc = '_city' & gt 'anushkaev1', 'strapon1'
 		act 'Butt plug': $returnLoc = '_city' & gt 'anushkaev1', 'buttplug'
 		act 'Joint':
@@ -691,7 +689,7 @@ if $ARGS[0] = 'nush_guitar':
 			'She reaches over and grabs the acoustic guitar. "Sure, I''ll play you something else. This one I learned shortly after seeing the uncensored music video for it." She strums the guitar and checks to ensure it''s still in tune. "It''s ''Heaven Knows'' by The Pretty Reckless."'
 			'She starts playing and singing the new song, playing and singing just as well as before. When she ends her piece, you clap your hands and praise her. "Another great song. You really are good at this."'
 			*nl
-			'Thanks. I still remember the first time I watch the music video for this." She bites her lower lip, clearly getting a little turned on thinking about it. "When Taylor pulled off her robe and flashed her naked body... Oh man, that was so fucking hot. I can''t lie; I''ve rubbed one out more times than I care to remember thinking about that scene while staring at that poster," she says while indicating The Pretty Reckless poster on her wall.'
+			'"Thanks. I still remember the first time I watch the music video for this." She bites her lower lip, clearly getting a little turned on thinking about it. "When Taylor pulled off her robe and flashed her naked body... Oh man, that was so fucking hot. I can''t lie; I''ve rubbed one out more times than I care to remember thinking about that scene while staring at that poster," she says while indicating The Pretty Reckless poster on her wall.'
 			'You giggle and glance at the poster. You could see Anushka rubbing one out while looking at the poster. Thinking about her rubbing one out, laying on the bed she''s now on, is starting to make you a little horny. You shake your head to banish the thought and change the subject while she puts the guitar back in its place, talking about her future music career.'
 			act 'Continue':gt 'anush_bedroom_city','anushroom'
 		elseif anushkaQW['guitar_play'] = 5:

locations/anushapt_city.qsrc

@@ -910,7 +910,7 @@ if $ARGS[0] = 'nushlivroom':
 		'"Shit, they''re home already. Come on, let''s go," she says as she gets up and heads to her room.'
 		act 'Follow Anushka to her room': locat['A144'] = 2 & gt 'anush_bedroom_city','anushroom'
 	end
-	if strapnumber > 0:
+	if strapnumber > 0 and npc_sex['A144'] > 0:
 		act 'Pull out your strap-on':
 			*clr & cla
 			gs 'stat'

locations/anushkachat_city.qsrc

@@ -167,7 +167,7 @@ if $ARGS[0] = 'chat':
 			act 'Tell her about Djibril': gt 'anushkachat_city', 'tell_about_djibril1'
 		end
 	end
-	if DjibrilQW['tell'] = 1 and DjibrilQW['nush_inv'] = 0:
+	if DjibrilQW['tell'] = 1 and DjibrilQW['nush_inv'] = 0 and npc_sex['A144'] > 0:
 		act 'Invite to see Djibril': gt 'anushkachat_city', 'invite_djibril'
 	end
 	if DjibrilQW['nush_inv'] = 1 and DjibrilQW['tell'] = 1 and DjibrilQW['african_gangbang'] = 1:
@@ -329,8 +329,9 @@ if $ARGS[0] = 'chat':
 		'The way she says it makes you blush. She leaves no doubt about what she means and she makes it sound so dirty while being exciting at the same time.'
 		act 'Maybe':
 			*clr & cla
-			minut += 5
-			anushkaQW['sveta_love'] += 1
+			minut += 4
+			if anushkaQW['kiss_day'] ! daystart: anushkaQW['kiss_day'] = daystart & anushkaQW['kiss'] += 1
+			gs 'arousal', 'kiss', 1, 'lesbian'
 			gs 'npc_relationship', 'modify', 'A144', 'like'
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/brtkiss.jpg"></center>'
@@ -390,7 +391,7 @@ if $ARGS[0] = 'chat':
 		end
 	end
 	gs 'willpower', 'misc', 'self', 'easy'
-	if will_cost <= pcs_willpwr:
+	if will_cost <= pcs_willpwr and anushkaQW['kiss_day'] ! daystart:
 		act 'Kiss her (<<will_cost>> Willpower)':
 			*clr & cla
 			gs 'willpower', 'pay', 'self'
@@ -401,6 +402,7 @@ if $ARGS[0] = 'chat':
 			else
 				anushkaQW['kiss'] += 1
 			end
+			anushkaQW['kiss_day'] = daystart
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/brtkiss.jpg"></center>'
 			if pcs_hotcat >= 6:
@@ -646,7 +648,7 @@ if $ARGS[0] = 'boyfriend_chat':
 				act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 				act 'Keep talking': gt 'anushkachat_city', 'chat'
 			else
-				if pcs_hotcat >= 6:
+				if pcs_hotcat >= 6 and npc_sex['A144'] > 0:
 					'"Fedor," you tell her.'
 					'She arches a slender brow. "Fedor? Really? Come on now, if you were going to date a jock why not go for one of the better athletes like Lazar or Ivan? I mean <b>Fedor</b>? He''s like an Ivan-lite," she says with a giggle.'
 					'You''re mad at her for talking smack about your boyfriend, but she can''t keep a straight face and you realize that she''s just yanking your chain. "Yeah, I like him. He''s sweet."'
@@ -705,7 +707,7 @@ if $ARGS[0] = 'boyfriend_chat':
 	if artemQW['bf'] = 1:
 		act 'Artem':
 			cla
-			if pcs_hotcat >= 6:
+			if pcs_hotcat >= 6 and npc_sex['A144'] > 0:
 				'"Artem," you tell her.'
 				'She arches a slender brow. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute and I bet you have him totally pussy whipped to do whatever you want. Yeah okay, I can see the appeal," she says with a giggle.'
 				'You shake your head at her comment. "He''s sweet and really nice to me."'
@@ -936,7 +938,7 @@ if $ARGS[0] = 'tell_about_djibril':
 				'You get into some pretty graphic details as you tell your story and are feeling more than a little turned on; by the looks of things, she is as well. Maybe you could invite her to come with you to his dorm room one time?'
 				act 'Hang out in her room': gt 'anush_bedroom_city','anushroom'
 				act 'Talk about something else': gt 'anushkachat_city', 'chat'
-				if DjibrilQW['nush_inv'] = 0:
+				if DjibrilQW['nush_inv'] = 0 and npc_sex['A144'] > 0:
 					act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril'
 				end
 			end
@@ -996,7 +998,7 @@ if $ARGS[0] = 'tell_about_djibril1':
 				'You get into some pretty graphic details as you tell your story and are feeling more than a little turned on; by the looks of things, she is as well. Maybe you could invite her to come with you to his dorm room one time?'
 				act 'Hang out in her room': gt 'anush_bedroom_city','anushroom'
 				act 'Talk about something else': gt 'anushkachat_city', 'chat'
-				if DjibrilQW['nush_inv'] = 0:
+				if DjibrilQW['nush_inv'] = 0 and npc_sex['A144'] > 0:
 					act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril'
 				end
 			end
@@ -1062,7 +1064,7 @@ if $ARGS[0] = 'tell_about_djibril_gangbang':
 		'You get into some pretty graphic details as you tell your story and are feeling more than a little turned on; by the looks of things, she is as well. Maybe you could invite her to join in next time?'
 		act 'Hang out in her room': gt 'anush_bedroom_city','anushroom'
 		act 'Talk about something else': gt 'anushkachat_city', 'chat'
-		act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril_gangbang'
+		if and npc_sex['A144'] > 0: act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril_gangbang'
 	end
 end
 

locations/gschool_lessonsev1.qsrc

@@ -40,15 +40,18 @@ if $ARGS[0] = 'fiz_rand':
 			'You''re training with some free weights today. As you do your routine, you notice that the class has grown awfully quiet and glance over to see most of them gawking at Albina, who has bent over while also working out with weights and is showing off her toned bubble butt to everyone watching. She soon straightens back up and gives all of them a dirty look.'
 		end
 	elseif fizperand = 6:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/gymfight.jpg"></center>'
 		'You hear a commotion from the other side of the room and look over to see Dan and Roman shoving each other. Roman shoves Dan again and it quickly starts escalating. A few punches are thrown and the two of them are soon down on the ground fighting. The coach rushes over and quickly pulls them apart before sending them to the principal.'
 	elseif fizperand = 7:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/tinydick.jpg"></center>'
 		'During a break in gym class, you and several other girls are talking when Igor wanders over and tries to chat you all up. You find his efforts amusing at best and you can tell they aren''t working on the other girls either, yet he seems to think he''s oozing cool and keeps chatting up the lot of you before Vitek suddenly rushes up behind him, grabs his shorts and yanks them down to his ankles.'
 		'Unfortunately for Igor, his underwear went with the shorts and now he''s standing half naked in front of a bunch of girls. What''s worse is that now everyone can see how tiny his dick is, making you and the others gasp and giggle, several girls even pointing and laughing loudly. The whole class is soon in stitches as Igor desperately tries to pull up his shorts and fails, all while cursing at Vitek and calling him all kinds of names. You almost feel sorry for him; not only is he a terrible flirt, but the whole class has seen his tiny dick.'
 	elseif fizperand = 8 and $pantyworntype ! 'none':
 		gt 'gschool_lessonsev1', 'fiz8'
 	elseif fizperand = 9:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'
 		'During class, Albina gives you a tap on the shoulder, giggling and pointing at Vitek. You look over and see the tip of his dick hanging out the leg of his shorts. You giggle as well, but you are also quite impressed and maybe just a little turned on at the sight; he''s certainly very well endowed.'
 		'It takes him a while to notice the girls giggling at him and even longer to figure out why. Once he does, he makes a show of tucking his dick away by adjusting his shorts, all with a huge smile on his face.'
@@ -57,21 +60,27 @@ if $ARGS[0] = 'fiz_rand':
 	elseif fizperand = 10 and pcs_hotcat >= 5 and fame['pav_slut'] >= 150:
 		gt 'gschool_lessonsev1', 'fiz10'
 	elseif fizperand = 11:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bendoverff.jpg"></center>'
 		'During class, Lina notices Ivan watching Lariska and moves up behind her before pushing her forward at the shoulders, making her bend over. She proceeds to pretend to hump Lariska, obviously trying to mimic Ivan''s voice and speech. "Oh Lariska, I want to fuck your ass!" This causes several of the other students to laugh, even Ivan, but it''s quickly broken up by Mr. Nikolaevich.'
 	elseif fizperand = 12:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/doublebutt.jpg"></center>'
 		'During class, Lina and Lariska are whispering and giggling about something. After some time, they pull down the back of their shorts to flash their panty-clad asses at several of the more popular jock boys.'
 	elseif fizperand = 13:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/dry3some.jpg"></center>'
 		'Near the end of class, some girls are chatting when they notice some boys looking their way and start horsing around. One buries her face in her friend''s breasts as the third pretends to hump her. After a few seconds, once several guys are watching, they stop and laugh as they move away.'
 	elseif fizperand = 14:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hardon.jpg"></center>'
 		'At the end of class, everyone is allowed to do their own thing so long as they''re doing something physical. You see Fedor using the bench press and notice that he''s sporting a serious hardon, with several of the other girls having noticed as well and giggling about it.'
 	elseif fizperand = 15:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/stretchhump.jpg"></center>'
 		'Lina is on the floor doing the splits when Lariska comes up behind her and lays on top of her, pretending to hump her. Lina laughs before they break it up.'
 	elseif fizperand = 16:
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/teaseboys' + rand(1,2) + '.jpg"></center>'
 		'Lena and Lera notice several of the boys watching them and start teasing them by pretending to make out in front of them. Knowing them, they''re likely doing it for more than the laughs.'
 	else
@@ -2006,4 +2015,3 @@ if $ARGS[0] = 'russian':
 end
 
 --- gschool_lessonsev1 ---------------------------------
-

locations/vasilyhome.qsrc

@@ -31,11 +31,13 @@ if $ARGS[0] = 'home':
 			'You knock on the door, but no one comes to answer. It seems like nobody is home.'
 			if npc_rel['A112'] >= 70: 'You could still enter with the key that Sergey gave you.' & act 'Unlock the door and enter':gt 'vasilyhome', 'hallway'
 		elseif hour >= 16 and hour <= 19:
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big112.jpg"></center>'
 			'When you knock on the door, <<$serg_obr>> Sergey answers it.'
 			'"Oh, hello <<$pcs_nickname>>," he shrugs. "If you''re looking for Vasily, he''s not here, and I don''t know when he''ll be back."'
 			if npc_rel['A112'] >= 50: '"You can come in and wait for him if you want," he offers.' & act 'Enter':gt 'vasilyhome', 'hallway'
 		elseif (week = 5 or week = 6) and hour >= 20:
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big112.jpg"></center>'
 			'When you knock on the door, <<$serg_obr>> Sergey answers it.'
 			'"Oh, hello <<$pcs_nickname>>," he shrugs. "If you''re looking for Vasily, he''s not here. He''s probably at the disco with everyone else."'
@@ -1371,4 +1373,3 @@ if $ARGS[0] = 'vasily_asleep2':
 end
 
 --- vasilyhome ---------------------------------
-