Merge remote-tracking branch 'hornguy6/master'

locations/albina_chat.qsrc

@@ -40,19 +40,11 @@ if $ARGS[0] = 'small_talk2':
 			'"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
-		!! variable for being a model here
-		!!act 'I do modelling':
-			!!cla & *nl
-			
-			!!gs 'albina_chat','model_talk1'
-		!!end
-		!! {
+		
+		gs 'albina_chat2','first_model_talk1'
+		
 		if film > 0:
-			act 'I do porn':
-				cla & *nl
-			
-				gs 'albina_chat','pornstar_talk1'
-			end
+			act 'Tell her you''ve shot porn': cla & gs 'albina_chat','pornstar_talk1'
 		end
 			
 		!!if masseuse['jobtype'] ! 0:

locations/booty_call_shower.qsrc

@@ -1355,14 +1355,15 @@ if $ARGS[0] = 'morning_together1':
 						'Your hand creeps up behind your ass and grabs hold of <<$npc_firstname[$boy]>>''s shaft. He''s already rock hard and you begin to work it sensuously with long hard pulls.'
 						act'Jerk him off':gt'booty_call_shower', 'morning_jerkoff1'
 					end
-					
-					act'Well...':
-						cla & *nl
-						gs'arousal', 'massage',5,'no_orgasm_msg'
-						gs'stat'
-						'"Well..." Your breath hitches as he gives your nipples a light squeeze. You feel warm and wet and it''s <i>not</i> just the shower. "I suppose..."'
-!!						if stat['think_virgin'] = 0 and booty_call['virgin'] ! 1:
-						act'Bend over':gt'booty_call_shower', 'morning_shower_fuck1'
+					if stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0:
+						act'Well...':
+							cla & *nl
+							gs'arousal', 'massage',5,'no_orgasm_msg'
+							gs'stat'
+							'"Well..." Your breath hitches as he gives your nipples a light squeeze. You feel warm and wet and it''s <i>not</i> just the shower. "I suppose..."'
+	!!						if stat['think_virgin'] = 0 and booty_call['virgin'] ! 1:
+							act'Bend over':gt'booty_call_shower', 'morning_shower_fuck1'
+						end
 					end
 					
 !!{						if booty_call['condom'] > 0: