Merge remote-tracking branch 'Kevin-upstream/master'

ignoremedialinks.txt

@@ -0,0 +1,119 @@
+images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/sex/sex<<$mid($temp2,1,1)>>.jpg
+images/pc/body/cum/<<$mid($temp2,4,val($mid($temp1,3,2))-3)>>.jpg
+<<$deckImg[dealerHand[0]]>>
+<<$deckImg[dealerHand[i]]>>
+<<$deckImg[playerHand[i * 16 + j]]>>
+images/system/phone/theme/' + $phonetheme_name[i] + '/icon_call.png
+images/characters/shared/headshots_generic/1[$boy]>>.jpg
+images/characters/shared/headshots_generic/2[$boy]>>.jpg
+images/characters/shared/headshots_generic/3[$boy]>>.jpg
+images/characters/shared/headshots_generic/4[$boy]>>.jpg
+images/characters/shared/headshots_generic/5[$boy]>>.jpg
+images/characters/shared/headshots_generic/6[$boy]>>.jpg
+images/characters/shared/headshots_generic/7[$boy]>>.jpg
+images/characters/shared/headshots_generic/8[$boy]>>.jpg
+images/characters/shared/headshots_generic/9[$boy]>>.jpg
+images/characters/shared/headshots_generic/10[$boy]>>.jpg
+images/characters/shared/headshots_generic/11[$boy]>>.jpg
+images/characters/shared/headshots_generic/12[$boy]>>.jpg
+images/characters/shared/headshots_generic/13[$boy]>>.jpg
+images/characters/shared/headshots_generic/14[$boy]>>.jpg
+images/characters/shared/headshots_generic/15[$boy]>>.jpg
+images/characters/shared/headshots_generic/16[$boy]>>.jpg
+images/characters/shared/headshots_generic/17[$boy]>>.jpg
+images/characters/shared/headshots_generic/18[$boy]>>.jpg
+images/characters/shared/headshots_generic/19[$boy]>>.jpg
+images/characters/shared/headshots_generic/20[$boy]>>.jpg
+images/characters/shared/headshots_generic/21[$boy]>>.jpg
+images/characters/shared/headshots_generic/22[$boy]>>.jpg
+images/characters/shared/headshots_generic/23[$boy]>>.jpg
+images/characters/shared/headshots_generic/24[$boy]>>.jpg
+images/characters/shared/headshots_generic/25[$boy]>>.jpg
+images/characters/shared/headshots_generic/26[$boy]>>.jpg
+images/characters/shared/headshots_generic/27[$boy]>>.jpg
+images/characters/shared/headshots_generic/28[$boy]>>.jpg
+images/characters/shared/headshots_generic/29[$boy]>>.jpg
+images/characters/shared/headshots_generic/30[$boy]>>.jpg
+<<$pcs_image[i]>>
+<<$opp_image[i]>>
+images/pc/activities/flashing/dress/inside/bra/' + rand(1,dress_ind_bra) + '.jpg
+images/pc/activities/flashing/dress/outside/bra/' + rand(1,dress_out_bra) + '.jpg
+images/pc/activities/flashing/pants/inside/bra/' + rand(1,pants_ind_bra) + '.jpg
+images/pc/activities/flashing/pants/outside/bra/' + rand(1,pants_out_bra) + '.jpg
+images/pc/activities/flashing/dress/inside/tits/' + rand(1,dress_ind_tits) + '.jpg
+images/pc/activities/flashing/dress/outside/tits/' + rand(1,dress_out_tits) + '.jpg
+images/pc/activities/flashing/pants/inside/tits/' + rand(1,pants_ind_tits) + '.jpg
+images/pc/activities/flashing/pants/outside/tits/' + rand(1,pants_out_tits) + '.jpg
+images/pc/activities/flashing/dress/inside/panty/' + rand(1,dress_ind_panties) + '.jpg
+images/pc/activities/flashing/dress/outside/panty/' + rand(1,dress_out_panties) + '.jpg
+images/pc/activities/flashing/pants/inside/panty/' + rand(1,pants_ind_panties) + '.jpg
+images/pc/activities/flashing/pants/outside/panty/' + rand(1,pants_out_panties) + '.jpg
+images/pc/activities/flashing/dress/inside/pussy/' + rand(1,dress_ind_pussy) + '.jpg
+images/pc/activities/flashing/dress/inside/pussy/hairy' + rand(1,dress_ind_pussy_hairy) + '.jpg
+images/pc/activities/flashing/dress/outside/pussy/' + rand(1,dress_out_pussy) + '.jpg
+images/pc/activities/flashing/dress/outside/pussy/hairy' + rand(1,dress_out_pussy_hairy) + '.jpg
+images/pc/activities/flashing/pants/inside/pussy/' + rand(1,pants_ind_pussy) + '.jpg
+images/pc/activities/flashing/pants/inside/pussy/hairy' + rand(1,pants_ind_pussy_hairy) + '.jpg
+images/pc/activities/flashing/pants/outside/pussy/' + rand(1,pants_out_pussy) + '.jpg
+images/pc/activities/flashing/pants/outside/pussy/hairy' + rand(1,pants_out_pussy_hairy) + '.jpg
+images/pc/activities/flashing/dress/inside/pussy/' + rand(1,pants_ind_pussy) + '.jpg
+images/pc/activities/flashing/dress/inside/pussy/hairy' + rand(1,pants_ind_pussy_hairy) + '.jpg
+images/pc/activities/flashing/dress/outside/pussy/' + rand(1,pants_out_pussy) + '.jpg
+images/pc/activities/flashing/dress/outside/pussy/hairy' + rand(1,pants_out_pussy_hairy) + '.jpg
+images/pc/activities/flashing/dress/inside/pantyrear/' + rand(1,dress_ind_pantyrear) + '.jpg
+images/pc/activities/flashing/dress/outside/pantyrear/' + rand(1,dress_out_pantyrear) + '.jpg
+images/pc/activities/flashing/pants/inside/pantyrear/' + rand(1,pants_ind_pantyrear) + '.jpg
+images/pc/activities/flashing/pants/outside/pantyrear/' + rand(1,pants_out_pantyrear) + '.jpg
+images/pc/activities/flashing/dress/inside/butt/' + rand(1,dress_ind_butt) + '.jpg
+images/pc/activities/flashing/dress/outside/butt_plug/' + rand(1,dress_out_butt_plug) + '.jpg
+images/pc/activities/flashing/dress/outside/butt/' + rand(1,dress_out_butt) + '.jpg
+images/pc/activities/flashing/pants/inside/butt/' + rand(1,pants_ind_butt) + '.jpg
+images/pc/activities/flashing/pants/outside/butt_plug/' + rand(1,pants_out_butt_plug) + '.jpg
+images/pc/activities/flashing/pants/outside/butt/' + rand(1,pants_out_butt) + '.jpg
+images/pc/activities/flashing/dress/inside/full/' + rand(1,dress_ind_full) + '.jpg
+images/pc/activities/flashing/dress/inside/full/hairy' + rand(1,dress_ind_full_hairy) + '.jpg
+images/pc/activities/flashing/dress/outside/full/' + rand(1,dress_out_full) + '.jpg
+images/pc/activities/flashing/dress/outside/full/hairy' + rand(1,dress_out_full_hairy) + '.jpg
+images/pc/activities/flashing/pants/inside/full/' + rand(1,pants_ind_full) + '.jpg
+images/pc/activities/flashing/pants/inside/full/hairy' + rand(1,pants_ind_full_hairy) + '.jpg
+images/pc/activities/flashing/pants/outside/full/' + rand(1,pants_out_full) + '.jpg
+images/pc/activities/flashing/pants/outside/full/hairy' + rand(1,pants_out_full_hairy) + '.jpg
+images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg
+images/locations/city/citycenter/mall/salon/work/sex/fuck<<masseuse[''position'']>>.mp4
+images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg
+images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bath.jpg
+images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg
+images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/kitchen.jpg
+images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg
+images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg
+images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/<<$npc_apt_spare[$npclastgenerated]>>.jpg
+images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg
+images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/kitchen.jpg
+images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg
+images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg
+images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg
+images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bath.jpg
+images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/living.jpg
+images/locations/highway/guy (<<ARGS[2]>>).jpg
+images/shared/sex/vag/cowgirl/hard<<sex_ev[''cowgirl_rand'']>>.mp4
+images/shared/sex/vag/<<$sex_ev[''position'']>>/slow2.mp4
+images/' + $epayments['banner'] +  '
+images/system/icons/menu/<<iif(telefon[''UnreadSMS'']=0,''icon_phone.png'',''icon_phone_sms.gif'')>>
+<<func(''$face_image'')>>
+<<$telefon[''ContactIcon'']>>
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_call.png
+<<$telefonIncC[
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_megafon.png
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_notebook.png
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_camera.png
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>
+<<$telefonCon[''Icon'']>>
+<<$SMSPicture1[telefon[''SMSid'']]>>
+<<$SMSPicture2[telefon[''SMSid'']]>>
+<<$SMSPicture3[telefon[''SMSid'']]>>
+<<$SMSPicture4[telefon[''SMSid'']]>>
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_weather.png
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_calendar.png
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_music.png
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_pictures.png
+images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_settings.png

locations/MeynoldHome.qsrc

@@ -890,37 +890,37 @@ if $ARGS[0] = 'Kat Bath':
 		act 'Continue':	
 			cla & *clr
 			gs'stat'
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath1.mp4"></video></center>'
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/1.mp4"></video></center>'
 			'Realizing your pain, Katja quickly stops then whispers in your ear, "Get in the tub." You do as she says and climb into the tub as Katja undresses herself and joins you. She begins soaping up the sponge then says, "Sit up." You do as she says and she begins lathering your body with the soft sponge while being very careful not to put too much pressure on your sore spots.'
 					
 			act 'Let Katja rinse you':	
 				cla & *clr
 				gs'stat'	
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath2.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/2.mp4"></video></center>'
 				'After Katja finishes rinsing off the soap she grabs onto the back of your head then pulls you forward toward her nipple and you obediently begin licking her nipple passionately while occasionally looking up to see her lightly bitting her lip, obviously pleased at your performance. She then lightly grips your neck, gently pushing you off her, before climbing on top of the side of the tub before spreading her legs and rubbing her pussy gently.'
 			
 				act 'Lick her pussy':	
 					cla & *clr
 					gs'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/3.mp4"></video></center>'
 					'You lean forward then begin lightly licking her pussy as Katja leans back against the wall. You continue licking her vagina gently at first then begin quickening your pace while occasionally looking up to see her tilting her head back and moaning. You can see her legs tensing up as you pleasure her.'
 					
 					act 'Continue':	
 						cla & *clr
 						gs'stat'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath4.mp4"></video></center>'
+						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/4.mp4"></video></center>'
 						'As you continue licking Katja''s pussy, you decide to slide one of your fingers into her vagina then do your best to please her with it. You run your finger inside of her, brushing her g-spot with the tip of your finger as Katja begins moaning louder. You look up to Katja to see her fidgeting as she moans out loud.'
 						
 						act 'Increase your pace':	
 							cla & *clr
 							gs'stat'
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath5.mp4"></video></center>'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/5.mp4"></video></center>'
 							'You increase your pace before Katja suddenly slams her head back. Katja''s body begins to spasm as she experiences a powerful orgasm. Her moaning is erratic and her hands tightly clench around the shelf. You look up at her and watch her writhing in pleasure. <font color=#FF00FF>Yes Katja. Feel what you mean to me. You deserve every second of pleasure I can give you. I want you to feel pure ecstasy.</font>'
 							
 							act 'Continue':	
 								cla & *clr
 								gs'stat'
-								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath6.mp4"></video></center>'
+								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/6.mp4"></video></center>'
 								'Katja finishes her orgasm then lays still for a few seconds, catching her breath before looking into your eyes and saying, "You did good <<$pcs_nickname>>... Real good." She then leans forward and places her hand on your cheek, "You''re such a good girl aren''t you?" She then shares a soft passionate kiss with you for what feels like an eternity, but an eternity that you welcome.'
 								
 								act 'Finish the kiss':	
@@ -1005,37 +1005,37 @@ if $ARGS[0] = 'Katja Bath':
 		act 'Continue':	
 			cla & *clr
 			gs'stat'
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath1.mp4"></video></center>'
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/1.mp4"></video></center>'
 			'Realizing your pain, Katja quickly stops then whispers in your ear, "I''m sorry I just... I forgot." You stroke her cheek then say, "Take off your clothes then get in." Katja quickly undresses herself and joins you. She begins soaping up the sponge then says, "Can you sit up please." You nod and she begins lathering your body with the soft sponge while being very careful not to put too much pressure on your sore spots.'
 					
 			act 'Let Katja rinse you off':	
 				cla & *clr
 				gs'stat'	
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath2.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/2.mp4"></video></center>'
 				'After Katja finishes rinsing off the soap you grab onto the back of her head then pull her forward toward your nipple and she obediently begins licking your nipple passionately while occasionally looking up to see if you approve. You give her a nod then lightly grip her neck, gently pushing her off of you, before climbing on top of the side of the tub before laying back and spreading your legs and rubbing your pussy gently.'
 			
 				act 'Let Katja lick your pussy':	
 					cla & *clr
 					gs'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/3.mp4"></video></center>'
 					'Katja leans forward then begin lightly licking your pussy as you lean back laying against the side of the tub. Katja continues licking your vagina gently at first then begins quickening her pace while occasionally looking up to see your reaction, obviously wanting to please you. You reach down then stroke her cheek as she continues licking your vagina.'
 					
 					act 'See what she does':	
 						cla & *clr
 						gs'stat'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath4.mp4"></video></center>'
+						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/4.mp4"></video></center>'
 						'Katja slowly begins to slide one of her fingers into your vagina then dooes her best to please her with it. She runs her finger inside of you, brushing against your g-spot with the tip of her finger as you begin moaning louder. Katja looks up to you as you feel the pleasure building to an almost unsustainable amount, as you begin moaning loudly, feeling like you will burst into an orgasm at any second.'
 						
 						act 'Orgasm':	
 							cla & *clr
 							gs'stat'
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath5.mp4"></video></center>'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/5.mp4"></video></center>'
 							'Katja notices your loud moaning then begins increasing her pace, causing you to suddenly slam your head back. You feel your breath stop as waves of pleasure begin pulsing throughout your body. You lose all control as your body is filled with perfect ecstasy. You can hear yourself moaning loudly and feel your body spasming wildly while Katja remains latched onto your vagina, licking vigorously. <font color=#FF00FF>Yes Katja. Please me. Show me what I mean to you. Make me feel pure ecstasy!</font>'
 							
 							act 'Continue':	
 								cla & *clr
 								gs'stat'
-								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath6.mp4"></video></center>'
+								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/6.mp4"></video></center>'
 								'You finish your orgasm then lay still for a few seconds, catching your breath before looking into Katja''s eyes and saying, "You did great Kat... Really good." You then lean forward and places your hand on her cheek, "You''re such a good girl aren''t you?" You both then share a soft passionate kiss for what feels like an eternity, but an eternity that you welcome.'
 								
 								act 'Meekly nod':	

locations/NikoEv2.qsrc

@@ -1248,7 +1248,7 @@ if $ARGS[0] = 'Niko Search':
 		*clr & cla
 		minut += 5
 		gs 'stat'	
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/school/restroom/1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/2.jpg"></center>'
 		'You lick the tip of Dan''s dick before taking it into your mouth and sucking it firmly. Vitek and Vasily take out their dicks and start lightly stroking them before you reach out and grab onto their dicks. "You''re doing well, <<$pcs_nickname>>. Can you suck me next?" Vasily asks and you nod before pulling away from Dan and wrapping your lips around Vasily''s dick, sucking it gently while Vitek paws at your breasts through your shirt. After a few seconds, Vitek grows impatient and pushes his dick against your lips.' 
 		if kotovloveQW < 0:	
 			'"What are you waiting for, slut? Start sucking my dick. You made a fool of me and you''ll make up for it." You can feel your heart rapidly beating as you start sucking on Vitek''s dick, fearful of angering him further.'

locations/albina_starlets_sex.qsrc

@@ -372,7 +372,7 @@ if $ARGS[0] = 'whore3':
 		act 'Get started':
 			*clr & cla
 			guy += 2
-			'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/tolietbj2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/toiletbj2.jpg"></center>'
 			'"Hurry up, bro!" the confident one says. "You don''t want to be a virgin anymore, so here''s a slut that will make you a man, but won''t give you a disease in the process."'
 			'He forces you to kneel in front of him and you unzip his pants. "See? This whore can''t wait to get started!" he laughs as you start sucking his dick. You hold in a giggle when you see that, even when hard, he''s a little on the smaller side.'
 			'As you continue sucking his dick, the shy boy''s confidence grows and he pulls out his much larger cock.'

locations/artem_date_events.qsrc

@@ -544,7 +544,7 @@ if $ARGS[0] = 'gang_rape':
 		gs 'stat'
 		act 'The nightmare begins':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape1.jpg"></center>'
 			'Two of them hold you down while one pulls his dick out, shoves it in your pussy and starts hammering away, not caring if you enjoy it or not. The more you struggle or cry out, the more they seem to enjoy it.'
 			gs 'pain', 2, 'wrists', 'bind'
 			gs 'boystat', $boy1
@@ -553,7 +553,7 @@ if $ARGS[0] = 'gang_rape':
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape2.jpg"></center>'
 				'The one watching takes his turn and forces his dick inside you while the first one just watches as he jerks off.'
 				gs 'pain', 2, 'wrists', 'bind'
 				gs 'boystat', $boy2
@@ -562,7 +562,7 @@ if $ARGS[0] = 'gang_rape':
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape3.jpg"></center>'
 					'"Alright, my turn," the leader says. "Roll her over onto her hands and knees." You''re roughly forced into a kneeling position on the nasty old mattress, with your face forced against it. You feel someone spit on your asshole before a dick is shoved inside, causing you to cry out in pain as he starts pounding you balls deep. "Much tighter than that gaping pussy after you guys ripped it up!" He laughs and the others join in.'
 					gs 'pain', 2, 'wrists', 'bind'
 					gs 'boystat', $boy3
@@ -571,7 +571,7 @@ if $ARGS[0] = 'gang_rape':
 					gs 'stat'
 					act 'Two at a time':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape4.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape4.jpg"></center>'
 						'The leader pulls out of your ass and lies in front of you on his side as someone else starts roughly fucking your ass. Once he''s next to your head, the leader shoves his dick in your mouth and makes you suck his dick as the other three take turns fucking your ass. You soon feel one of them cumming in your ass as another speaks up. "Come on, she has other holes! I''m tired of waiting!"'
 						gs 'pain', 2, 'wrists', 'bind'
 						gs 'pain', 6, 'jaw', 'ache'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'gang_rape':
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
 							'With that, one of them lies down on the mattress and they force you to straddle and mount him, his cock sliding into your battered pussy as another cock is shoved into your mouth and a third back in your ass. The ones who were on watch come over to take their turns as you feel one of them cumming in your pussy.'
 							gs 'pain', 2, 'wrists', 'bind'
 							gs 'pain', 6, 'jaw', 'ache'
@@ -599,7 +599,7 @@ if $ARGS[0] = 'gang_rape':
 							gs 'stat'
 							act 'Continue':
 								*clr & cla
-								'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rapecum1.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rapecum1.jpg"></center>'
 								'The remaining ones take turns fucking all three of your holes so much that you lose count as two of them cum inside you. When they pull out, you feel the cum leaking out of both of your holes as one of the other guys cums in your mouth.'
 								gs 'pain', 2, 'wrists', 'bind'
 								gs 'pain', 6, 'jaw', 'ache'
@@ -616,7 +616,7 @@ if $ARGS[0] = 'gang_rape':
 								gs 'stat'
 								act 'Last one':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rapecum2.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rapecum2.jpg"></center>'
 									'The last one starts fucking your throat. Before too long, he starts cumming as well, holding your mouth open with one hand as he jerks off with the other, milking every last drop of cum into your mouth.'
 									gs 'pain', 2, 'wrists', 'bind'
 									gs 'pain', 6, 'jaw', 'ache'

locations/bed2.qsrc

@@ -30,15 +30,15 @@ if $ARGS[0] = 'mod_sleeptriggers':
 	!!
 	!! This is NOT for events!!
 
-	gt 'bed2', 'end'
+	gt 'bed2', 'main'
 end
 
 
-if $ARGS[0] = 'end':
+if $ARGS[0] = 'main':
 	$menu_loc = 'bed2'
 	$alarmloc = 'bed2'
-	$menu_arg = 'end'
-	$alarmarg = 'end'
+	$menu_arg = 'main'
+	$alarmarg = 'main'
 	menu_off = 0
 
 	if pcs_makeup ! 1 and cosmetic_tattoo = 0: *nl '<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'end':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
 	*nl
-	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''bed2'', ''start''">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''bed2'', ''start''">ON</a>.')
+	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''bed2'', ''main''">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''bed2'', ''main''">ON</a>.')
 	*nl
 	gs 'bed2', 'wear_panties_decider'
 	*nl
@@ -84,11 +84,11 @@ end
 if $ARGS[0] = 'wear_panties_decider':
 	if hypnoPanty <= 0:
 		if sleepVars['bedPanty'] = 0:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 1 & gs ''stat'' & gt ''bed2'', ''end''">AS IS</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 1 & gs ''stat'' & gt ''bed2'', ''main''">AS IS</a>.'
 		elseif sleepVars['bedPanty'] = 1:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 2 & gs ''stat'' & gt ''bed2'', ''end''">YES</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 2 & gs ''stat'' & gt ''bed2'', ''main''">YES</a>.'
 		elseif sleepVars['bedPanty'] = 2:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 0 & gs ''stat'' & gt ''bed2'', ''end''">NO</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 0 & gs ''stat'' & gt ''bed2'', ''main''">NO</a>.'
 		end
 	end
 end
@@ -96,9 +96,9 @@ end
 if $ARGS[0] = 'wear_buttplug_decider':
 	if mc_inventory['buttplug'] = 1:
 		if sleepVars['bedAnal'] = 0:
-			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 1 & gs ''stat'' & gt ''bed2'', ''end''">NO</a>.'
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 1 & gs ''stat'' & gt ''bed2'', ''main''">NO</a>.'
 		elseif sleepVars['bedAnal'] = 1:
-			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 0 & gs ''stat'' & gt ''bed2'', ''end''">YES</a>.'
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 0 & gs ''stat'' & gt ''bed2'', ''main''">YES</a>.'
 		end
 	end
 end
@@ -106,9 +106,9 @@ end
 if $ARGS[0] = 'wear_vibe_decider':
 	if mc_inventory['vibe'] = 1 and sleepVars['cheatVib'] = 1:
 		if sleepVars['bedVibrator'] = 0:
-			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 1 & gs ''stat'' & gt ''bed2'', ''end''">NO</a>.'
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 1 & gs ''stat'' & gt ''bed2'', ''main''">NO</a>.'
 		elseif sleepVars['bedVibrator'] = 1:
-			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 0 & gs ''stat'' & gt ''bed2'', ''end''">YES</a>.'
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 0 & gs ''stat'' & gt ''bed2'', ''main''">YES</a>.'
 		end
 	end
 end

locations/komp_camgirl.qsrc

@@ -249,7 +249,7 @@ if $ARGS[0] = 'waitclients':
 				'Standing up you start dancing provocatively, your hands giving extra attention to your tits'
 			end
 			if topmfc = 0:
-				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/show10.mp4"></video></center>'
+				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/show5.mp4"></video></center>'
 				'Lowering your panties to emphasize your butt you shake it briefly to appease the crowd'
 			end
 			gs 'arousal', 'porn', 4, 'exhibitionism'
@@ -267,7 +267,7 @@ if $ARGS[0] = 'waitclients':
 			dynamic $donate
 			gs 'stat'
 
-			'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/show9.mp4"></video></center>'
+			'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/show1.mp4"></video></center>'
 			'You take off your panties and bend over to give a short preview of what''s to come before quickly covering up again and hoping it was enough to keep viewers interested.'
 
 			gs 'arousal', 'porn', 2, 'exhibitionism'

locations/model_mari.qsrc

@@ -1318,7 +1318,7 @@ if $ARGS[0] = 'pc_nude_debut_talk':
 				'"It... it wasn''t great," you admit. "During the shoot I just felt... <i>hollow</i>. Like I gave something up inside me. And then when it was over and I saw the photos of myself, everything bared to the world, I realized that this is going to be on the internet forever. I''ll never be able to get rid of them and anyone who looks up my name can find them and... I can never take it back. I don''t know that I''ve ever regretted anything as much as this..."'
 			end
 		elseif $modelfoto['nude_after_reaction'] = 'amazed' or $modelfoto['nude_after_reaction'] = 'proud':
-			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/face.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/face.jpg"></center>'
 			if $modelfoto['first_nude_during'] = 'sick':
 				'"It was... really great actually," you smile. "During the shoot I was so nervous I thought I was going to throw up. But when it was over and I saw the photos, I just remember thinking, ''Wow! This is me?'' I couldn''t believe it! I was so happy with how everything turned out."'
 			elseif $modelfoto['first_nude_during'] = 'aroused':

locations/mother_chats.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'rape_talk':
 			cla & *clr
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/residential/mom/mother.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 			'"I don''t know <<$npc_nickname[''A29'']>> it''s only recently happened and I just didn''t know what to do." You shrug sadly.'
 			'After a very brief pause your <<$npc_nickname[''A29'']>> adds her immediate thought. "Erm... <<$pcs_nickname>>, I take it you''ve taken the morning after pill? If not you need to do that as you don''t want to end up pregnant this way. I can get one for you."'
 			'You nod and say. "Okay <<$npc_nickname[''A29'']>>, thanks." You reply quietly.'
@@ -55,7 +55,7 @@ if $ARGS[0] = 'rape_talk':
 				end
 				minut += 10
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/residential/mom/mother.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 				'Realising what your <<$npc_nickname[''A29'']>> means you tell her "I reported it to the police at the time but don''t expect them to do anything, especially as I couldn''t give them a good description of him." Your body shakes involuntarily at the thought as you pause before continuing.'
 				'"I''ve also been to the clinic but it''s too soon to know anything definite so I''ll have to go back for a second check to make sure there''s nothing further."'
 				'Your <<$npc_nickname[''A29'']>> looks at you. "<<$pcs_nickname>>, If you want me to go with you please just let me know; you don''t have to do that alone."'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'rape_talk':
 				cla & *clr
 				minut += 5
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/residential/mom/prost10.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost10.jpg"></center>'
 				'"Is there any point in reporting it to the police? I didn''t get a clear look at the bastard and even if I did I doubt they''d do anything." You pause "Yes, the clinic would be a good idea, who knows what he''s got and what the consequence may be!?"'
 				'Your <<$npc_nickname[''A29'']>> looks as though she''s going to say something but clearly has second thoughts and just shakes her head sadly.'
 				'Tears well up in your eyes again and she pulls you back into her arms and cuddles you, holding you tight as you both let out all your pain and anger.'
@@ -101,7 +101,7 @@ if $ARGS[0] = 'rape_talk':
 						motherKnowSpravka = 1
 						minut += 10
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/residential/mom/prost9.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
 						'With that you both go back home.'
 						'Your <<$npc_nickname[''A29'']>> leads you into the kitchen, shuts the door and makes you both a cup of tea. As you drink it she spends some time focusing on and comforting you.'
 						'She concludes by saying, "If you want to talk about this or anything else I want you to feel that you can come to me. I love and support you. <i>Always</i>."'

locations/nichChore.qsrc

@@ -348,7 +348,7 @@ if $ARGS[0] = 'inspect':
 		menu_off = 1
 		gs 'stat'
 		*clr & cla
-		'<center><img <<$set_imgh>> src="<<$nichTempPic >>"></center>'
+		'<center><img <<$set_imgh>> src="<<$nichTempPic>>"></center>'
 		'<<$nichChoreDesc>>'
 		
 		if nichOutfitState = 0:

locations/nichTanya.qsrc

@@ -320,7 +320,7 @@ if $ARGS[0] = 'date_lake':
 		minut += 30
 		money -= 100
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/horse.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/horse.jpg"></center>'
 		'Tanya is back within a minute and you go to the beach. The journey is uneventful and you arrive there an hour later after chatting about various topics while on your way.'
 		'When you get there Tanya points out the horse riding and excitedly suggests you both take a leisurely ride on horseback.'
 		'"Sounds good Tanya, let''s go you respond." You both pay the 100 rubles and spend the next 30 minutes having a wonderful leisurely ride along the lakeside.'

locations/rape_events.qsrc

@@ -679,7 +679,7 @@ if $ARGS[0] = 'park_gangrape_fight_loss':
 		gs 'arousal', 'vaginal', 1, 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape1.jpg"></center>'
 		'Some modicum of control makes its way back into your muscles and you begin to struggle even as your attackers force your legs apart.'
 		*nl
 		if stat['think_virgin'] = 1:
@@ -705,7 +705,7 @@ if $ARGS[0] = 'park_gangrape_fight_surrender':
 		gs 'arousal', 'vaginal', 1, 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape1.jpg"></center>'
 		'Some modicum of control makes its way back into your muscles and you begin to struggle even as your attackers force your legs apart.'
 		*nl
 		if stat['think_virgin'] = 1:
@@ -724,7 +724,7 @@ if $ARGS[0] = 'park_gangrape_struggle1':
 		gs 'arousal', 'vaginal', 1, 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape1.jpg"></center>'
 		'Despite knowing escape is an impossibility, your fight or flight response refuses to let you give in and you continue to struggle beneath the hard grips of the men assaulting you. They force your legs apart and something hard is roughly shoved into your pussy.'
 		*nl
 		if stat['think_virgin'] = 1:
@@ -741,7 +741,7 @@ if $ARGS[0] = 'park_gangrape_struggle2':
 		gs 'arousal', 'vaginal', rand(3,5), 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape1.jpg"></center>'
 		if stat['think_virgin'] = 1:
 			'"Hey, I think this bitch is a virgin," the man giggles.'
 			'"<i>Was</i> a virgin," another voice snickers.'
@@ -764,7 +764,7 @@ if $ARGS[0] = 'park_gangrape_tp':
 		gs 'arousal', 'bj', -temp['rape_time'], 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
 		'The men violate you, roughly fucking you with no regard for your pain or your pleasure. With one cock choking your mouth, it''s all you can do to breathe, let alone make any noise other than the occasional groan as the others ravage your ass and pussy.'
 		*nl
 		'There''s nothing for you to do except hold on for dear life until it ends.'
@@ -806,7 +806,7 @@ if $ARGS[0] = 'park_gangrape_end1':
 	
 	act'Pass out':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
 		'In the end, it''s too much to bear.'
 		*nl
 		'With your body being pummelled in every hole and your mind overwhelmed, everything just shuts down, and unconsciousness takes you.'
@@ -834,7 +834,7 @@ if $ARGS[0] = 'park_gangrape_end2':
 	
 	act'Pass out':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
 		'In the end, it''s too much to bear.'
 		*nl
 		'You try to pull back from the cock that chokes you, but you''re unable to escape it. You panic, coughing even as your vision grows blurry, but your rapist refuses to let you go until you''ve swallowed every drop.'

locations/sex_ev_leave.qsrc

@@ -227,32 +227,58 @@ end
 
 if $ARGS[0] = 'leaving_action':
 	cla
-	act'Nonchalant':
+	act'Smile':
 		if $sex_ev['loc'] = 'house_party':
-			$sex_ev['leave_action'] = ' nonchalantly and head back out into the party'
+			$sex_ev['leave_action'] = ', flashing him a quick smile just before you head back out into the party'
 		else
-			$sex_ev['leave_action'] = ' nonchalantly and head out the door without a second glance'
+			$sex_ev['leave_action'] = ', flashing him a quick smile just before you close the door behind you'
 		end
 		gs'sex_ev_leave', 'leaving_end'
 	end
 	
 	act'Wave goodbye':
-		$sex_ev['leave_action'] = ', waggling your fingers at him and head back out into the party'
+		if $sex_ev['loc'] = 'house_party':
+			$sex_ev['leave_action'] = ', waggling your fingers at him and head back out into the party'
+		else
+			$sex_ev['leave_action'] = ', waggling your fingers at him just before you close the door behind you'
+		end
 		gs'sex_ev_leave', 'leaving_end'
 	end
 
 	act'Wink':
-		$sex_ev['leave_action'] = ' with a wink as you head back out into the party'
+		if $sex_ev['loc'] = 'house_party':
+			$sex_ev['leave_action'] = ' with a wink as you head back out into the party'
+		else
+			$sex_ev['leave_action'] = ' with a wink just before you close the door behind you'
+		end
+		
 		gs'sex_ev_leave', 'leaving_end'
 	end
 	
 	act'Blow him a kiss':
-		$sex_ev['leave_action'] = ', blowing him a kiss just before heading back out into the party'
+		if $sex_ev['loc'] = 'house_party':
+			$sex_ev['leave_action'] = ', blowing him a kiss just before heading back out into the party'
+		else
+			$sex_ev['leave_action'] = ', blowing him a kiss just before you close the door behind you'
+		end
 		gs'sex_ev_leave', 'leaving_end'
 	end
 	
 	act'Shake your ass':
-		$sex_ev['leave_action'] = ', giving him a teasing shake of your ass just before you head back out into the party'
+		if $sex_ev['loc'] = 'house_party':
+			$sex_ev['leave_action'] = ', giving him a teasing shake of your ass just before you head back out into the party'
+		else
+			$sex_ev['leave_action'] = ', giving him a teasing shake of your ass just before you close the door behind it'
+		end
+		gs'sex_ev_leave', 'leaving_end'
+	end
+	
+	act'Nonchalant':
+		if $sex_ev['loc'] = 'house_party':
+			$sex_ev['leave_action'] = ' nonchalantly and head back out into the party'
+		else
+			$sex_ev['leave_action'] = ' nonchalantly and head out the door without a second glance'
+		end
 		gs'sex_ev_leave', 'leaving_end'
 	end
 end

locations/sleep.qsrc

@@ -67,6 +67,7 @@ if $ARGS[0] = 'sleep_handler':
 	if sleepVars['minutes_to_wakeup'] > 0:
 		xgt 'sleep', 'sleep_loop'
 	else
+		killvar 'sleep_loop_loop'
 		xgt 'sleep', 'post_sleep'
 	end
 end

locations/themes.qsrc

@@ -19,8 +19,20 @@ if $ARGS[0] = 'outdoors':
 				bcolor = rgb(BColorBase-BColorBase/4, BColorBase-BColorBase/4, BColorBase)
 				lcolor = rgb(206, 90, 205)
 			!! original ----------------}
-			
-			$bcolor = '"#D2D2FF"'
+			!!$bcolor = '"#D2D2FF"'
+		elseif (DayStage = 3):
+			!!bcolor = rgb(BColorBase, BColorBase-BColorBase/4, BColorBase-BColorBase/4)
+			!!lcolor = rgb(56, 90, 205)
+			!!lcolor = rgb(56, 90, 205)
+			!! hornguy6''s new colors ----------------
+			bcolor = rgb(226, 169, 169)
+			lcolor = rgb(56, 90, 205)
+		elseif (DayStage = 4) :
+			bcolor = rgb(BColorBase, BColorBase-BColorBase/4, BColorBase-BColorBase/4)
+			!!lcolor = rgb(56, 90, 205)
+			!! hornguy6''s new colors ----------------
+			lcolor = rgb(110, 200, 200)
+			!! hornguy6''s new colors ----------------
 		elseif (DayStage = 3) or (DayStage = 4) :
 			bcolor = rgb(BColorBase, BColorBase-BColorBase/4, BColorBase-BColorBase/4)
 			lcolor = rgb(56, 90, 205)

tools/check_missing_media.py

@@ -7,12 +7,13 @@ from collections import defaultdict
 # Get the main directory path where the tools folder is located
 main_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 qsrc_dir = os.path.join(main_dir, "locations")
-# Set the text_path to the main directory
 text_path = main_dir
 
-# Get the game directory from the user
+
 image_directory = input('Enter the game directory: ')
 
+custom_keywords = input('Enter custom keywords to exclude (separated by comma), or press Enter to skip: ')
+
 # Ensure image_directory ends with a '/'
 if not image_directory.endswith('/'):
     image_directory += '/'
@@ -26,7 +27,20 @@ if os.path.basename(image_directory.rstrip('/')).lower() == 'images':
     image_directory = os.path.dirname(image_directory.rstrip('/'))
 
 # Define keywords to exclude from media paths
-keywords_to_exclude = ['$pcs_haircol', 'pharma_picrand', 'mitkapicrand', '<<sex_ev[', '$epayments', '<<npc_apt_number', 'lover_picture[lover_number]', '<<lover_picrand[$boy]>>', '$_color', '<<masseuse', 'dress_', 'FUNC(', 'pants_', '<<pirs', '<<$phonetheme_name[pcs_phonetheme]>>', '$ARGS', '+iif', '<<BDSMmeet>>', 'kamasutra_page', '<<$']
+keywords_to_exclude = ['$pcs_haircol', 'FUNC(', '<<pirs', '$ARGS', '+iif']
+
+if custom_keywords:
+    custom_keywords = custom_keywords.split(',')
+    keywords_to_exclude += [keyword.strip() for keyword in custom_keywords]
+
+ignore_file = os.path.join(main_dir, 'ignoremedialinks.txt')
+ignore_paths = []
+
+# Check if the ignore file exists
+if os.path.exists(ignore_file):
+    with open(ignore_file, 'r') as f:
+        ignore_paths = [line.strip() for line in f]
+
 
 # Create a list to store missing media (images and videos)
 missing_media = []
@@ -71,16 +85,17 @@ def evaluate_and_replace_random(expression):
 
     return media_paths
 
-
-# Function to evaluate and replace variables within a string
+#
 def evaluate_and_replace_variables(expression, variables):
-    variable_matches = re.findall(r'<<(\$?[a-zA-Z_][a-zAZ0-9_]*)>>', expression)
-    for variable_name in variable_matches:
-        if variable_name.startswith("$"):
-            variable_value = variables.get(variable_name[1:], None)
-        else:
-            variable_value = variables.get(variable_name, None)
-            # Check if the variable value is a 'rand' function
+    variable_matches = re.findall(r'\'\s*\+\s*(\$?[a-zA-Z_][a-zA-Z0-9_]*)\s*\+\s*\'|<<(\$?[a-zA-Z_][a-zA-Z0-9_]*)>>', expression)
+    for variable_match in variable_matches:
+        for variable_name in variable_match:
+            variable_value = None  # Initialize variable_value to None
+            if variable_name:  # Check if the group actually matched something
+                if variable_name.startswith("$"):
+                    variable_value = variables.get(variable_name[1:], None)
+                else:
+                    variable_value = variables.get(variable_name, None)
             if isinstance(variable_value, str) and 'rand(' in variable_value:
                 # Evaluate the 'rand' function
                 variable_value = evaluate_and_replace_random(variable_value)[0]
@@ -105,7 +120,7 @@ for file in os.listdir(qsrc_dir):
         rand_variables = {}
 
         # Define a regular expression pattern to find 'rand' variable assignments
-        rand_assignment_pattern = r'<<(\$?[a-zA-Z_][a-zAZ0-9_]*)>>\s*=\s*(rand\(\d+,\s*\d+\))'
+        rand_assignment_pattern = r'(\$?[a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(rand\(\d+,\s*\d+\))'
 
         # Iterate through the script content to find and store 'rand' variable assignments
         for line_number, line in enumerate(script_content, start=1):
@@ -145,8 +160,7 @@ for file in os.listdir(qsrc_dir):
                 media_reference = media_reference.replace("modelfoto[''debut_image'']+1", 'rand(1, 9)')
                 media_reference = media_reference.replace("modelfoto[''debut_image'']+2", 'rand(1, 9)')
                 media_reference = media_reference.replace("modelfoto[''debut_image'']", 'rand(1, 9)')
-                media_reference = media_reference.replace("zz_stage", 'rand(0, 7)')
-                media_reference = media_reference.replace("VKWoods", 'rand(0, 8)')
+                media_reference = media_reference.replace("VKWoods", 'rand(1, 8)')
                 media_reference = media_reference.replace("metrorand['rand']", 'rand(1, 2)')
                 media_reference = media_reference.replace("picpRand", 'rand(1, 20)')
                 media_reference = media_reference.replace("Doublerand", 'rand(14, 15)')
@@ -170,7 +184,7 @@ for file in os.listdir(qsrc_dir):
                 media_paths = evaluate_and_replace_random(media_reference)
 
                 for path in media_paths:
-                    if any(keyword in path for keyword in keywords_to_exclude):
+                    if any(keyword in path for keyword in keywords_to_exclude) or path in ignore_paths:
                         continue
                     absolute_path = os.path.join(image_directory, path)
 
@@ -181,6 +195,7 @@ for file in os.listdir(qsrc_dir):
                     elif not os.path.exists(absolute_path):
                         missing_media.append((os.path.basename(qsrc_file), path, line_number))
 
+
 # Specify the path to the "missing_media.txt" output file
 missing_media_file = os.path.join(text_path, "missing_media.txt")