Merge remote-tracking branch 'Lusticon/master'

locations/foto_events.qsrc

@@ -1456,7 +1456,6 @@ if $ARGS[0] = 'independent_art':
 		act'Do the shoot':
 			hpingripw = 1
 			minut += 120
-			minut += 120
 			gs'stat'
 			modelpayfin = 1600 + (modelpay) + (35*rand(0,5))
 			if $model['pay_method'] = 'direct_deposit':

locations/mother.qsrc

@@ -288,9 +288,8 @@ if $ARGS[0] = '':
 		end
       
 		!!Tell mother that you were raped and skip mother being angry at you for being sexualy active event
-		if rape_count > motherKnowRaped:
+		if rape_day+7 > daystart:
 			act 'Tell her about your rape':
-				motherKnowRaped = rape_count
 				gt 'mother_chats', 'rape_talk'
 			end
 		end

locations/pav_park_meet_kol_event.qsrc

@@ -30,7 +30,15 @@ if $pav_park_meet_kol_event_type = 'meet_start':
             act 'Finish your walk':gt 'pav_park', 'start'
         end
     else
-        '<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
+        if (daystage = 2 or daystage = 3) and (month = 1 or month = 2 or month = 12):
+            '<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_winter_day.jpg"></center>'
+        elseif (month = 1 or month = 2 or month = 12):
+            '<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
+        elseif daystage = 2 or daystage = 3:
+            '<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_day.jpg"></center>'
+        else
+            '<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_night.jpg"></center>'
+        end
         'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
     end
 elseif $pav_park_meet_kol_event_type = 'meet_start_1':

locations/pav_station.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'reception':
 		act 'Walk away from the clerk': minut += 2 & gt 'pav_station', 'station_inside'
 	end
 
-	act 'Report a rape': gt 'pav_station', 'rape_report'
+	if rape_day+2 > daystart: act 'Report a rape': gt 'pav_station', 'rape_report'
 end
 
 temp_tot_booked_pav = policeQW['shoplift_booked_pav'] + policeQW['prostitution_booked_pav']
@@ -1102,26 +1102,28 @@ if $ARGS[0] = 'rape_report':
 					act'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 
-				act'Can I get a rape kit?':
-					cla & *clr
-					minut += rand(2,5)
-					gs'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation2.jpg"></center>'
-					'Suddenly, a spark of hope alights in your brain.'
-					'"What about a rape kit?" you ask desperately. "He... finished inside of me. I could-"'
-					'Before you can finish, you see the officer shaking his head.'
-					'"I''m sorry ma''am, but we are a small town police department. We simply don''t have enough funding to afford rape kits. Even if we did, we don''t have a lab that could examine it. I''m sorry."'
-					'As quickly as your hope flared, it is extinguished and you slump in your chair, feeling defeated.'
-
-					act'Finish the interview':
+				if cumsumvag+cumsumass > 0:
+					act'Can I get a rape kit?':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg"></center>'
-						'With that, you conclude the interview and are led to the front door.'
-						'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.' 
-						'Leaving you alone with your thoughts and memories of your rape...'
-
-						act'Leave': minut += 3 & gt 'pav_train_hall'
+						minut += rand(2,5)
+						gs'stat'
+
+						'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation2.jpg"></center>'
+						'Suddenly, a spark of hope alights in your brain.'
+						'"What about a rape kit?" you ask desperately. "He... finished inside of me. I could-"'
+						'Before you can finish, you see the officer shaking his head.'
+						'"I''m sorry ma''am, but we are a small town police department. We simply don''t have enough funding to afford rape kits. Even if we did, we don''t have a lab that could examine it. I''m sorry."'
+						'As quickly as your hope flared, it is extinguished and you slump in your chair, feeling defeated.'
+
+						act'Finish the interview':
+							cla & *clr
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg"></center>'
+							'With that, you conclude the interview and are led to the front door.'
+							'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.' 
+							'Leaving you alone with your thoughts and memories of your rape...'
+
+							act'Leave': minut += 3 & gt 'pav_train_hall'
+						end
 					end
 				end
 			end

locations/police_station.qsrc

@@ -22,6 +22,8 @@ if $ARGS[0] = 'reception':
 	'<center><h1><font color="maroon">Reception area</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityrec.jpg"></center>'
 	'Upon entering the station you''re welcomed by a reception desk. The officers sitting here are protected by thick glass and you see several monitors and computers keeping an eye on everything that''s happening inside and outside the building.'
+	
+	if rape_day+2 > daystart: act 'Report a rape': gt'police_station','rape_report'
 	act 'Return to the center': gt 'city_center'
 end
 
@@ -1418,37 +1420,39 @@ if $ARGS[0] = 'rape_report':
 					act'Leave': gt 'city_center'
 				end
 
-				act 'Can I get a rape kit?':
-					cla & *clr
-					minut += 2
-					gs'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cubicle.jpg"></center>'
-					'"C-can I get a... a rape kit...?" you mumble.'
-					'The officer nods at you and pulls a small box out of a drawer in his desk.'
-					'"If you just come this way ma''am." The two of you get up and he leads you through the office area to the bathroom where he hands you the box. Looking down at it, you read the label on it.'
-					*nl
-					'<i><b>SEXUAL ASSAULT EVIDENCE COLLECTION KIT</b></i>'
-					*nl
-					'You take it from him, cradling it in your hands.'
-					'"This will let you catch him right?" The officer shrugs in return.'
-					'"It depends. DNA evidence is only useful if we can match it to the person it came from."'
-					'"So you''re saying this might not do anything?"'
-					'He shrugs again. "It''s better than nothing."'
-
-					act 'Use the rape kit':
+				if cumsumvag+cumsumass > 0:
+					act 'Can I get a rape kit?':
 						cla & *clr
-						minut += 20
+						minut += 2
 						gs'stat'
 
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
-						'Closing the bathroom door, you open the kit and you swab your insides, feeling humiliated and disgusted when it comes back covered in semen. Packaging it up, you re-open the door and hand the evidence to the officer.'
-						'With that, you conclude the interview and are led to the front door.'
-						'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.' 
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cubicle.jpg"></center>'
+						'"C-can I get a... a rape kit...?" you mumble.'
+						'The officer nods at you and pulls a small box out of a drawer in his desk.'
+						'"If you just come this way ma''am." The two of you get up and he leads you through the office area to the bathroom where he hands you the box. Looking down at it, you read the label on it.'
 						*nl
-						'Leaving you alone with your thoughts and memories of your rape...'
-
-						act 'Leave': gt 'city_center'
+						'<i><b>SEXUAL ASSAULT EVIDENCE COLLECTION KIT</b></i>'
+						*nl
+						'You take it from him, cradling it in your hands.'
+						'"This will let you catch him right?" The officer shrugs in return.'
+						'"It depends. DNA evidence is only useful if we can match it to the person it came from."'
+						'"So you''re saying this might not do anything?"'
+						'He shrugs again. "It''s better than nothing."'
+
+						act 'Use the rape kit':
+							cla & *clr
+							minut += 20
+							gs'stat'
+
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
+							'Closing the bathroom door, you open the kit and you swab your insides, feeling humiliated and disgusted when it comes back covered in semen. Packaging it up, you re-open the door and hand the evidence to the officer.'
+							'With that, you conclude the interview and are led to the front door.'
+							'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.' 
+							*nl
+							'Leaving you alone with your thoughts and memories of your rape...'
+
+							act 'Leave': gt 'city_center'
+						end
 					end
 				end
 			end

locations/stat.qsrc

@@ -763,6 +763,7 @@ end
 if rape > 0 and rape ! rape_count and orgasm = orgasm_count:
 	pcs_mood = 10
 	rape_count = rape
+	rape_day = daystart
 elseif orgasm > 0 and orgasm ! orgasm_count:
 	pcs_mood = 100
 	orgasm_count = orgasm
@@ -770,6 +771,7 @@ elseif rape > 0 and rape ! rape_count and orgasm > 0 and orgasm ! orgasm_count:
 	pcs_mood = 100
 	orgasm_count = orgasm
 	rape_count = rape
+	rape_day = daystart
 end
 
 !! Drug stats

locations/taxi.qsrc

@@ -244,7 +244,7 @@ if $ARGS[0] = 'anal':
 	taxioffer = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/taxi/sex/taxi3,'+rand(0,5)+'.jpg"></center>'
 	'He turns off the taxi and gets out, walking around to the back door. He already has his cock out, rubbing some hand lotion on it for lubrication as he strokes it.'
-	'He half pulls you out of the taxi and pulls your clothes aside and your panties down just enough to completely bare your ass, which he gives a hard slap. He rubs the tip of his <<dick>>cm <<$dick_girth>> cock against your anus while you stroke your clit with your hand as you bite your lower lip, trying to prepare yourself mentally for what is about to come.'
+	'He half pulls you out of the taxi and pulls your clothes aside '+iif($pantyworntype <> 'none' or PCloPanties > 0,'and your panties down ','')+'just enough to completely bare your ass, which he gives a hard slap. He rubs the tip of his <<dick>>cm <<$dick_girth>> cock against your anus while you stroke your clit with your hand as you bite your lower lip, trying to prepare yourself mentally for what is about to come.'
 	'With a grunt, he shoves his <<dick>>cm <<$dick_girth>> cock up your ass, pushing it balls deep. You grunt in pain and bite your lip nearly hard enough to draw blood as he begins to furiously fuck you, obviously not caring whether or not you are enjoying it.'
 	'As your asshole begins to loosen up and the ministrations of your fingers on your clit turn you on, it begins to hurt less and feel better. A slight moan of pleasure escapes your lips. For several minutes, he pounds your ass until he finally stops, cock buried balls deep. He grunts as you feel the spurts of cum shooting deep into you.'
 	'With a final moan and spurt, he stands up. Pushing you back inside, he slams the door and returns to the driver''s seat, starting the taxi and then asking you where you need to go.'