Merge remote-tracking branch 'Hornguy6/master'

locations/albina_chat.qsrc

@@ -33,42 +33,7 @@ if $ARGS[0] = 'small_talk2':
 		!! Albina takes the lead
 		AlbinaQW['chat_rand'] = rand(1,2)
 		if AlbinaQW['chat_rand'] = 1:
-			'"What do you do for money <<$pcs_nickname>>?" Albina asks. "I used to get money for things from Starlets. Whatever my dad didn''t steal from me anyways. But that''s dried up now and I can''t rely on mama forever. Don''t tell me that everything you had came from Starlets?"'
-			act 'My mom':
-				cla & *nl
-				'"I get most of my money from my mom too," you say reluctantly. "Starlets was all the extra money I made too."'
-				'"Fuuuuck," Albina groans, flipping over to stare at the ceiling in frustration. "What else can I do? I''m <i>so</i> over getting fucked for money."'
-				gs 'albina_chat','small_talk'
-			end
-			act 'Odd jobs':
-				cla & *nl
-				'"Odd jobs here and there," you shrug. "There''s a lot of things to do around town. They don''t pay very much, but it gives me some spending money. You could try doing that?" Albina wrinkles her nose in disgust.'
-				'"I don''t want to <i>work</i> for a living," she says, sending both of you into giggles.'
-				gs 'albina_chat','small_talk'
-			end
-			
-			gs 'albina_chat2','first_model_talk1'
-			
-			if film > 0:
-				act 'Tell her you''ve shot porn': cla & gs 'albina_chat','pornstar_talk1'
-			end
-			
-				
-			!!{if masseuse['jobtype'] ! 0:
-				act 'I work as a masseuse':
-					cla & *nl
-					
-					gs 'albina_chat','small_talk'
-				end
-			end}
-			
-			if stripdancesum > 0:
-				act 'I''m a stripper':
-					cla & *nl
-					gs 'albina_chat','stripper_talk1'
-				end
-			end
-
+			gs 'albina_chat','job_talk1'
 		elseif AlbinaQW['chat_rand'] = 2:
 			if AlbinaQW['commando_know'] = 0:
 				gs 'albina_chat','underwear_talk'
@@ -84,12 +49,50 @@ if $ARGS[0] = 'small_talk2':
 	end
 end
 
+if $ARGS[0] = 'job_talk1':
+	'"What do you do for money <<$pcs_nickname>>?" Albina asks. "I used to get money for things from Starlets. Whatever my dad didn''t steal from me anyways. But that''s dried up now and I can''t rely on Mama forever. Don''t tell me that everything you had came from Starlets?"'
+	act 'My mom':
+		cla & *nl
+		'"I get most of my money from my mom too," you say reluctantly. "Starlets was all the extra money I made too."'
+		'"<i>Fuuuuck</i>," Albina groans, flipping over to stare at the ceiling in frustration. "What else can I do? I''m <i>so</i> over getting fucked for money."'
+		gs 'albina_chat','small_talk'
+	end
+	act 'Odd jobs':
+		cla & *nl
+		'"Odd jobs here and there," you shrug. "There''s a lot of things to do around town. They don''t pay very much, but it gives me some spending money. You could try doing that?" Albina wrinkles her nose in disgust.'
+		'"I don''t want to <i>work</i> for a living," she says, sending both of you into giggles.'
+		gs 'albina_chat','small_talk'
+	end
+	
+	gs 'albina_chat2','first_model_talk1'
+	
+	if film > 0:
+		act 'Tell her you''ve shot porn': cla & gs 'albina_chat','pornstar_talk1'
+	end
+	
+		
+	!!{if masseuse['jobtype'] ! 0:
+		act 'I work as a masseuse':
+			cla & *nl
+			
+			gs 'albina_chat','small_talk'
+		end
+	end}
+	
+	if stripdancesum > 0:
+		act 'I''m a stripper':
+			cla & *nl
+			gs 'albina_chat','stripper_talk1'
+		end
+	end
+end
+
 if $ARGS[0] = 'stripper_talk1':
 	act 'Embarrassed':
 		cla & *nl
 		'"I... do some strip dancing in the city," you admit, blushing hard.'
 		if age < 18:
-			'"You''re a stripper?" Albina exclaims, her jaw dropping. "How? You''re underage!"'
+			'"You''re a stripper?" Albina''s jaw drops. "How? You''re underage!"'
 			if alterstrtimg = 18 or alterstrtimg = 19 or alterstrtimg = 20 or alterstrtimg = 21:
 				'"I''ve had a fake passport for years, Albina," you shrug uncomfortably. "Easiest way to get booze. Now it helps me with other things too."'
 			else
@@ -100,7 +103,7 @@ if $ARGS[0] = 'stripper_talk1':
 				gs 'albina_chat','small_talk'
 			end
 		else
-			'"You''re a stripper?" Albina exclaims and you laugh nervously.'
+			'"You''re a stripper?" Albina''s jaw drops and you laugh nervously.'
 			'"Y-Yeah. I needed money and it''s... an easy job," you reply.'
 			'"Say no more. I''ve always thought about doing it myself, I just don''t know what Mama would say about it..."'
 			gs 'albina_chat','small_talk'
@@ -333,7 +336,7 @@ if $ARGS[0] = 'pornstar_talk3.2':
 end
 
 if $ARGS[0] = 'underwear_talk':
-	'"Hey <<$pcs_nickname>>, where do you buy your panties? Albina asks."'
+	'"Hey <<$pcs_nickname>>, where do you buy your panties?" Albina asks.'
 	act'I buy from G&M':
 		cla & *nl
 		'"I get most of mine from G&M," you admit.'
@@ -341,7 +344,7 @@ if $ARGS[0] = 'underwear_talk':
 		act'They''re cheap':
 			cla & *nl
 			'"They''re cheap and affordable," you shrug. "Not everybody''s a rich princess like you."'
-			'"I''ll have you know I get all my thongs from a seedy sex shop in the red light district for 500 <b>₽</b> a pop," Albina says, turning her nose up at you. "I''m no princess. I''m a dirty little girl who likes her panties cheap and easily snapped off."'
+			'"I''ll have you know I get all my thongs from a seedy sex shop in the red light district for 500 <b>₽</b> a pop," Albina says, turning her nose up at you. "I''m no princess. I''m a dirty little girl who likes her panties cheap and snappable."'
 			*nl
 			'You both laugh at that.'
 			gs'albina_chat','small_talk'
@@ -538,14 +541,14 @@ if $ARGS[0] = 'pube_talk':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"I can''t help but notice when we''re in the locker room that you keep your pussy clean," you say. "Do you shave every day or something?"'
 		if AlbinaQW['shower_caught'] = 0:
-			'"You spying on me or something?" Albina asks with a raised eyebrow. She''s giving you a "glare" but you can also see a smirk tugging at the corner of her lips. When the full smile finally breaks out, she laughs and says, "I wax all my pussy and leg hair. I used to use a razor but I hate stubble. Prickly, pokey, ick!"'
+			'"You spying on me or something?" Albina asks with a raised eyebrow. She''s giving you a "glare" but you can also see a smirk tugging at the corner of her lips. When the full smile finally breaks out, she laughs and says, "I wax all my pussy and leg hair. I used to use a razor but I can''t stand the feeling of stubble. Prickly, pokey, ick!"'
 		elseif AlbinaQW['shower_caught'] = 1:
-			'"Is that what you were looking at when I caught you staring?" Albina says with a smug smirk. She holds the look for a few seconds before laughing. "I wax all my pussy and leg hair. I used to use a razor but I hate stubble. Prickly, pokey, ick!"'
+			'"Is that what you were looking at when I caught you staring?" Albina says with a smug smirk. She holds the look for a few seconds before laughing. "I wax all my pussy and leg hair. I used to use a razor but I can''t stand the feeling of stubble. Prickly, pokey, ick!"'
 		else
 			'"How often are you peeping on me in there?" Albina laughs. "I wax all my pussy and leg hair. I used to use a razor but I hate stubble. Prickly, pokey, ick!"'
 		end
 		'She shivers with a grimace of disgust and annoyance.'
-		'"Waxing takes care of the problem for weeks at a time. Which is great cause shaving sucks too!"'
+		'"Waxing takes care of the problem for weeks at a time. Which is great cause shaving hurt my neck too!"'
 		*nl
 		if rand(1,100) < pcs_prcptn:
 			AlbinaQW['pube_hint'] = 1

locations/albina_house_events.qsrc

@@ -192,13 +192,13 @@ if $ARGS[0] = 'first_sex':
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/sex/lesbian/kiss1.mp4"></video></center>'
 	'The moment you get into her room, you start tearing each other''s clothes off and tossing them aside without a care. Her thong is drenched and comes away with a trail of juices as she wiggles out of it. As soon as you''re completely naked, she pushes you back onto the bed and climbs on top of you. You wrap your legs around her back and you go right back to passionately making out again. But it isn''t enough. You can feel Albina''s juices smearing against your thigh and you''re pretty sure she can feel the same from you.'
-	gs 'arousal', 'kiss', 2, 'no_orgasm_msg'
-	gs 'arousal', 'massage', -2, 'no_orgasm_msg'
+	gs 'arousal', 'kiss', 2, 'no_orgasm_msg', 'lesbian'
+	gs 'arousal', 'massage', -2, 'no_orgasm_msg', 'lesbian'
 	gs 'stat'
 
 	act 'Take it further':
-		gs 'arousal', 'rimming', 5, 'no_orgasm_msg'
-		gs 'arousal', 'vaginal_finger', -5, 'no_orgasm_msg'
+		gs 'arousal', 'rimming', 5, 'no_orgasm_msg', 'lesbian'
+		gs 'arousal', 'vaginal_finger', -5, 'no_orgasm_msg', 'lesbian'
 		gs 'stat'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/uanuli22.jpg"></center>'
@@ -207,11 +207,10 @@ if $ARGS[0] = 'first_sex':
 		act '69':
 			*clr & cla
 			if npc_sex['A23'] = 0: npc_sex['A23'] = 1 & girl += 1
-			lesbian += 1
 			$orgasm_or = 'yes'
-			gs 'arousal', 'cuni', 10, 'no_orgasm_msg'
-			gs 'arousal', 'cuni_give', -10, 'no_orgasm_msg'
-			gs 'arousal', 'rimming', 5, 'no_orgasm_msg'
+			gs 'arousal', 'cuni', 10, 'no_orgasm_msg', 'lesbian'
+			gs 'arousal', 'cuni_give', -10, 'no_orgasm_msg', 'lesbian'
+			gs 'arousal', 'rimming', 5, 'no_orgasm_msg', 'lesbian'
 			gs 'stat'
 			'<center><video autoplay loop src="images/shared/sex/lesbian/69_1.mp4"></video></center>'
 			'You turn, forcing her tongue away from your ass and towards your other hole instead, wrapping your thighs around her torso. In the same motion, you dive between her legs and run your tongue across her pussy. It''s absolutely <i>soaked</i>. The two of you eat each other out with mutually reckless abandon as you relentlessly tease each other''s clits. Albina''s tongue occasionally slides up and rims your ass before moving back down to your pussy, which grows wetter and wetter.'
@@ -220,9 +219,9 @@ if $ARGS[0] = 'first_sex':
 			*nl
 			'Finally, the tension gives out and both of you are left panting. You can feel Albina''s breath between your legs.'
 			act'Continue':
-				pcs_hairbsh = 0
+				pcs_hairbsh = -1
 				if pcs_makeup > 1: pcs_makeup = 0
-				gs 'arousal', 'kiss', 1, 'no_orgasm_msg'
+				gs 'arousal', 'kiss', 1, 'no_orgasm_msg', 'lesbian'
 				gs 'arousal', 'end'
 				gs 'stat'
 				cla & *clr