Merge remote-tracking branch 'Anya/master'

locations/dinfather.qsrc

@@ -429,7 +429,7 @@ end
 if $ARGS[0] =  'watchtv4':
     !good relations and Messrs attractive
     talkrand=rand(1,100)
-    if talkrand>=80:
+    if talkrand>=80 and kolloc['athome'] = 1:
         gs 'dinfather', 'watchtv3'
     else
         'You relax and talk about the show you''re watching with your stepfather, cuddling up snugly against him.'

locations/father.qsrc

@@ -352,7 +352,7 @@ if (hour > 10 and week < 6) or week >= 6:
             if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80:FatherMolest = rand(1,4)
             if npc_rel['A28'] >= 80:FatherMolest = rand(1,2)
 
-            if FatherMolest=1:
+            if FatherMolest=1 and kolloc['athome'] = 0:
                 pcs_horny += rand(1,5)
                 gs 'stat'
                 'He seems happy to oblige, and asks you to twirl your body so he can look at your outfit from all angles. The approving nod and hungry look in his eyes that follow, show that he would like to do more than just watch.'
@@ -581,26 +581,19 @@ if $clothingworntype = 'nude':
     end
 
     'Your stepfather stares at your naked body, you can''t help but notice the admiring look on his face mixed with the torment of him knowing that he should know better. "<<$pcs_nickname>>, have you no shame? You shouldn''t be flaunting your naked body like that, you have no idea what kind of effect it has on men!"'
-    if npc_sex['A28']=0:
-        if npc_rel['A28'] >= 40:
-            'He reluctantly turned his face away from you, and added: "Your body does look fantastic... but you really should go put some clothes on, your mother is around the house somewhere. Who knows what she''ll do when she sees you walking around like this!"'
-            npc_rel['A28'] += 1
-            act 'Move away':gt 'bedrPar'
-            exit
+	if momloc['athome'] = 1:$mother_go_text = '"You really should go put some clothes on though, your mother is home. Who knows what she''ll do when she sees you walking around like this!"'
+	if npc_sex['A28']=0:
+        if npc_rel['A28'] >= 40 or hotcat > 5:
+            '"You look fantastic," he says, reluctantly turning his face away from you. <<$mother_go_text>>'
+			npc_rel['A28'] += 1
         else
             'He decisively turns his face away from you, avoiding the looks of your naked body. "Don''t be such a whore <<$pcs_nickname>>, go put some clothes on right now."'
             npc_rel['A28'] -= 1
-            act 'Move away':gt 'bedrPar'
-            exit
         end
     else
-        if momloc['athome'] = 1:$mother_go_text = '"You really should go put some clothes on though, your mother is home."'
-            'His eyes never stop looking at your naked body, you can tell he''s very much impressed by your beauty as you walk around the room.<<$mother_go_text>>"'
-        if momloc['athome'] = 1:
-            act 'Move away':gt 'bedrPar'
-            exit
-        end
-    end
+        'His eyes never stop looking at your naked body, you can tell he''s very much impressed by your beauty as you walk around the room. <<$mother_go_text>>'
+	end
+	act 'Move away':gt 'bedrPar'
 end
 
 if npc_sex['A28']!0 and pirsG > 0 and pirsG < 10000 and PutsawpirsG = 0 and (hour <= 18 or hour > 21):