Merge remote-tracking branch 'master/master'

locations/KatjaHomeTalk.qsrc

@@ -1409,6 +1409,30 @@ if $ARGS[0] = 'first_boy_sex_follow_up':
 	end
 end	
 
+if $ARGS[0] = 'first_boy_sex_Artem_follow_up':
+	*clr & cla
+	katjaQW['QWstage'] = 6
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'Katja gives you a big hug. "Thank you! The experience with Artem was great!" she says with a huge grin.'
+	if npc_vag['A14'] + 5 < npc_dick['A2']:
+		'"It didn''t hurt too much?" you ask.' 
+		'"It hurt, that was why I couldn''t take it any longer. But it was fun and I think it''ll hurt less the next time," she answers.' 
+		'"So you want to have sex with a boy again?" you reply.'
+	else
+		'"It did look like you had fun," you say.' 
+		'"I definitely had fun, I thought it would hurt, but I didn''t feel any pain," she answers.' 
+		'"Might be all the times I used my dildo on you," you reply.'
+	end
+	'"We should definitely do this again sometime," she finishes.' 
+	'"We''ll see if the opportunity comes up again," you answer.'
+	act 'Talk about something else': gt 'KatjaHomeTalk'
+	if katjaQW['birth_control_start_day'] = 0:
+		act 'Tell her that she should use birth control': gt 'KatjaHomeTalk', 'preventation_talk'
+	end
+end	
+
 if $ARGS[0] = 'anal_sex_with_boy_ask':
 	*clr & cla
 	minut += 5

locations/MagEncounterFairy.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 	knowsfairy = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/fae.jpg"></center>'
 	'You take a closer look at the floating glowing orb. What you mistook for a large firefly is actually a small woman with translucent wings on her back: A fairy!'
-	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?'
+	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?"'
 	'"It''s so nice to meet you! Finally someone who can see me!", she goes on before you have a chance to answer. "Finally someone to chat with!!! You have no idea how annoying it is to be here and nobody recognizes you. It''s sooo BORING!!!"'
 	act 'Chat with the fairy':
 		cla
@@ -44,9 +44,9 @@ if $ARGS[0] = 'fairy_chat_no1':
 		pcs_mood += 15
 		gs 'stat'
 		'You chat with the fairy. At first it feels strange to talk with a creature, you thought was a myth from children''s books. More so, since the small beautiful woman flutters in front of your face the whole time. But the fairy is so amicable that half hour has passed before you even notice.'
-		if fairyday['skin_increase'] <= 10:
+		if fairyQW['skin_increase'] <= 10:
 			pcs_skin += 10
-			fairyday['skin_increase'] += 1
+			fairyQW['skin_increase'] += 1
 			pcs_horny += 10
 			gs 'stat'
 			'The fairy bids you farewell. Just as she flies off, she returns fluttering in front of your face.'
@@ -104,12 +104,12 @@ if $ARGS[0] = 'fairy_chat':
 		pcs_mood += 15
 		gs 'stat'
 		gs 'MagEncounterFairy', 'fairychattopic'
-		if fairyday['skin_increase'] <= 10 and fairyday ! daystart and fairyshoo = 0:
+		if fairyQW['skin_increase'] <= 10 and fairyQW['day'] ! daystart and fairyshoo = 0:
 			cla
 			pcs_skin += 10
 			if pcs_skin > 1000: pcs_skin = 1000
-			fairyday['skin_increase'] += 1
-			fairyday = daystart
+			fairyQW['skin_increase'] += 1
+			fairyQW['day'] = daystart
 			gs 'stat'
 			'The fairy bids you farewell.'
 			wait 725
@@ -118,12 +118,12 @@ if $ARGS[0] = 'fairy_chat':
 			'"You know, you could still look lovelier.", she says. "Don''t move."'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel your skin start tingling, again, as if brushed by a feather.'
 			act 'Go on your way': gt $loc, $loc_arg
-		elseif fairyday['skin_increase'] > 10 and fairyday < daystart and fairyshoo = 0 and pcs_magik >= 8 and fairychat > 9 and succubusQW < 1:
+		elseif fairyQW['skin_increase'] > 10 and fairyQW['day'] < daystart and fairyshoo = 0 and pcs_magik >= 8 and fairychat > 9 and succubusQW < 1:
 			!Sets the Succubus setup dream
 			cla
 			succubusQW = 1
 			pcs_horny = 100
-			fairyday = daystart
+			fairyQW['day'] = daystart
 			gs 'stat'
 			'The fairy bids you farewell.'
 			wait 725
@@ -132,8 +132,8 @@ if $ARGS[0] = 'fairy_chat':
 			'"You know, you''re almost a magical creature now.", she says. "Don''t move."'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel a much more intense tingling, this time seeming to go all the way through you.'
 			act 'Go on your way': gt $loc, $loc_arg
-		elseif fairyday ! daystart and (pcs_nips < 80 or clit_size < 80):
-			fairyday = daystart
+		elseif fairyQW['day'] ! daystart and (pcs_nips < 80 or clit_size < 80):
+			fairyQW['day'] = daystart
 			'The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you''ve been a little nice to me, maybe I could be a little nice to you."'
 			act 'Huh?':
 				cla

locations/artem_katja_sex.qsrc

@@ -413,7 +413,7 @@ if $ARGS[0] = 'first_time_pussy':
 							'This makes Katja feel some pain which Artem quickly notice. "I''m sorry Katja. I will be more careful" he says and slows down. This makes Katja''s pain seem to go away, and by the end she is moaning quietly.'
 						else
 							katjaQW['horny'] += rand(5,10)
-							'AS he goes faster Katja''s moans becomes large, and the makes Artem pick up more speed. By the end he is pounding her hard  and she moan very loudly.'
+							'As he goes faster Katja''s moans becomes large, and the makes Artem pick up more speed. By the end he is pounding her hard  and she moan very loudly.'
 						end
 					end
 				end
@@ -593,7 +593,7 @@ if $ARGS[0] = 'first_time_next':
 		if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 			gt 'artem_katja_sex', 'first_time_katja_titjob'
 		else
-			gt 'artem_katja_sex', 'first_time_cowgirl'
+			gt 'artem_katja_sex', 'first_time_ride'
 		end
 	else
 		gt 'artem_katja_sex', 'first_time_on_table'
@@ -621,7 +621,7 @@ if $ARGS[0] = 'first_time_on_table':
 			if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 				gt 'artem_katja_sex', 'first_time_katja_titjob'
 			else
-				gt 'artem_katja_sex', 'first_time_cowgirl'
+				gt 'artem_katja_sex', 'first_time_ride'
 			end
 		end
 	end