1
0
Kaynağa Gözat

Merge remote-tracking branch 'hornguy6/master'

Kevin_Smarts 3 yıl önce
ebeveyn
işleme
d716916292

+ 8 - 1
locations/bedrPar.qsrc

@@ -131,6 +131,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		elseif prezik + prezikcount + preziksabo > 0:
 			'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
 		end
+		
+		if StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and SchoolAtestat = 0 and detention_warning ! daystart:
+			detention_warning = daystart
+			msg 'You have detention this morning and must be at school before 09:00.'
+		end
 
 
 		if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
@@ -161,6 +166,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					sisterHere = 1
 					'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
 				elseif anyaloc = 15:
+					if anyaQW['bathroom_dildos'] > 0:gt'sister_chat','bathroom_dildos_talk'
 					sisterHere = 1
 					'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
 				elseif anyaloc = 26:
@@ -175,6 +181,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			if (anyaloc = 4 or anyaloc = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
 			gt 'korrPar'
 		end
+		
+		act 'Relax on your bed': gt 'bed', 'start'
 
 		gs 'unicoursework', 'start', $curloc
 
@@ -420,7 +428,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gs 'subkid'
 		'</td></tr></table>'
 		
-		act 'Relax on your bed': gt 'bed', 'start'
 	end
 end
 

+ 17 - 20
locations/brother_voyeur.qsrc

@@ -718,7 +718,7 @@ if $ARGS[0] = 'brother_shower_together':
 		end
 	end
 	if pcs_inhib >= 50 or npc_rel['A34'] >= 80:
-	act'Suggest you wash each other (0:10)':gt'brother_voyeur','brother_wash_first'
+		act'Suggest you wash each other (0:10)':gt'brother_voyeur','brother_wash_first'
 	end
 
 	if brother_shower_times > 2:
@@ -911,7 +911,7 @@ if $ARGS[0] = 'showerfun':
 			'"Tsk!" you chide him and slap his hands away. "Down boy!"'
 			'His hands snap back, somewhat surprised at your denial.'
 			act'I''m not in the mood':
-				*nl
+				cla & *nl
 				'"I''m not in the mood to take care of you right now Kolka. Bother me some other time."'
 				'Suitably chagrined, the rest of your shower together elapses in only the sound of splashing water and frothing suds.'
 				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
@@ -919,7 +919,7 @@ if $ARGS[0] = 'showerfun':
 			end
 
 			act'I don''t have time (angry)':
-				*nl
+				cla & *nl
 				'"Fuck, Kolka! I don''t have time for this today! Can''t you keep your hands to yourself for five minutes?"'
 				'Suitably chagrined, the rest of your shower together elapses in only the sound of splashing water and frothing suds.'
 				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
@@ -927,7 +927,7 @@ if $ARGS[0] = 'showerfun':
 			end
 
 			act'I don''t have time (apologetic)':
-				*nl
+				cla & *nl
 				'"I''m afraid I don''t have time to fool around today Kolka," you say, giving him an apologetic smile over your shoulder. "Maybe some other time, okay?"'
 				'He nods, obviously disappointed and you finish up your shower together chatting and washing as normal.'
 				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
@@ -935,7 +935,7 @@ if $ARGS[0] = 'showerfun':
 			end
 
 			act'Only when I say so':
-				*nl
+				cla & *nl
 				'"I know it''s tempting to get handsy but you can only touch when I say so." You give him a sly smile over your shoulder. "I''m still your big sister Kolka. Show some respect for her, eh?"'
 				'He looks at you wistfully but nods and you finish up your shower together chatting and washing as normal.'
 				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
@@ -954,8 +954,7 @@ if $ARGS[0] = 'showerfun':
 			act'Suggest you wash each other':gt'brother_voyeur','brother_wash'
 		end
 		act'Get into it':
-			cla & *clr
-			*nl
+			cla & *nl
 			gs 'arousal','breasts', 2
 			pcs_horny += 10
 			gs 'stat'
@@ -1017,8 +1016,7 @@ if $ARGS[0] = 'brother_shower_shave':
 						act'Finish showering together':gt'brother_voyeur','brother_shower_end'
 
 						act'Lean into it':
-							cla
-							*nl
+							cla & *nl
 							gs 'arousal','vaginal_finger', 5
 							gs 'stat'
 							'Unable to help yourself, you grab his wrist and lean into it, letting his fingers work you even harder.'
@@ -1068,9 +1066,8 @@ if $ARGS[0] = 'brother_shower_shave':
 						if kolka_shave_ask = daystart:
 							kolka_shave_ask2 = daystart
 							'Kolka frowns. "I thought you said you were going to do what I asked?"'
-							*nl
 							act'That''s not what I said':
-								cla
+								cla & *nl
 								'"That''s not what I said. I said I''d shave just because you asked. I didn''t say what exactly I''d be shaving or that I''d do everything you tell me to."'
 								'"Hrmph." Kolka seems disappointed. Once you''re finished you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
 								
@@ -2061,10 +2058,12 @@ if $ARGS[0] = 'shower_swallow':
 		'<center><video autoplay loop src="images/shared/home/bathroom/showerbj.mp4"></center>'
 		'"Yeeeech..."'
 		'Opening your mouth, you drool and let his cum drip down off your tongue before wadding up what''s left and spitting it onto the bottom of the bathtub.'
-		if brotherbjcomment = 1:
-			'"A little warning next time maybe?"'
-			'"Sorry sis. Your mouth just felt so good and your blowjobs are so great and... Sorry... I just couldn''t hold it."'
-			'"It''s okay Kolka," you smile up at him. "It''s not like I can be mad at you for saying I''m good at giving head." You give him a quick kiss on the tip of his cock before standing up.'
+		if broshowerfuck = daystart:
+			'"Thanks for the warning Kolka," you say, smiling as you standing up.'
+		elseif brotherbjcomment = 1:
+			'"Sorry sis," he says looking somewhat ashamed. "I just couldn''t hold it any longer. I tried, I really did!"'
+			'"It''s okay Kolka," you smile up at him. "It happens sometimes. Just try to warn me a little sooner next time, okay?" He nods promisingly.'
+			if brotherbj > 5:'You suppress a grin when he promises to do better in the future. You''ve given him enough blowjobs to suspect that he doesn''t give any warning because he wants to cum in your mouth. He never seems to have this problem when he asks to give you a facial. <i>Oh well,</i> you mentally shrug to yourself. <i>What''s a girl to do?</i>'
 			'"Now come on, let''s finish up before someone wonders where we are."'
 			if broshowerfuck = daystart:
 				act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
@@ -2072,17 +2071,15 @@ if $ARGS[0] = 'shower_swallow':
 				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
 			end
 		elseif brotherbjcomment = 2:
-			'"Sorry sis," he says looking somewhat ashamed. "I just couldn''t hold it any longer. I tried, I really did!"'
-			'"It''s okay Kolka," you smile up at him. "It happens sometimes. Just try to warn me a little sooner next time, okay?" He nods promisingly.'
-			if brotherbj > 5:'You suppress a grin when he promises to do better in the future. You''ve given him enough blowjobs to suspect that he doesn''t give any warning because he wants to cum in your mouth. He never seems to have this problem when he asks to give you a facial. <i>Oh well,</i> you mentally shrug to yourself. <i>What''s a girl to do?</i>'
+			'"A little warning next time maybe?"'
+			'"Sorry sis. Your mouth just felt so good and your blowjobs are so great and... Sorry... I just couldn''t hold it."'
+			'"It''s okay Kolka," you smile up at him. "It''s not like I can be mad at you for saying I''m good at giving head." You give him a quick kiss on the tip of his cock before standing up.'
 			'"Now come on, let''s finish up before someone wonders where we are."'
 			if broshowerfuck = daystart:
 				act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 			else
 				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
 			end
-		elseif brotherbjcomment = 3:
-			'"Thanks for the warning Kolka," you say, smiling as you standing up.'
 			act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 		end
 	end

+ 17 - 2
locations/din_van.qsrc

@@ -137,8 +137,23 @@ $shower = {
 		end
 
 		dynamic $dryOff
-
-		if pcs_horny >= 40:
+		if rapeday = daystart and rape_shower ! daystart:
+			act'Cry (react to rape)':
+				cla & *clr
+				rape_shower = daystart
+				minut += rand(10,40)
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/cry.jpg"></center>'
+				'The last of the suds run off of you, but you can still <i>feel it</i>.'
+				*nl
+				'Your rapist''s cock <i>inside</i> you.'
+				*nl
+				'His cum <i>leaking</i> out of you.'
+				*nl
+				'You grab the soap again and scrub yourself again, but it still feels like something is there, coating your skin. You scrub and scrub and scrub but it just won''t go away until you finally cry out, throwing it into the corner. Tremors begin coursing through your body and you slowly sink down onto the shower floor, where you remain, sobbing while the water continues raining down on you.'
+				
+				dynamic $dryOff
+			end
+		elseif pcs_horny >= 40:
 			act 'Use the shower head on your pussy':
 				menu_off = 1
 				*clr & cla

+ 136 - 19
locations/ender.qsrc

@@ -137,25 +137,142 @@ if $ARGS[0] = 'loss':
 		gs 'cum_manage'
 		if pcs_mood > 20: pcs_mood -= 20
 		rape += 1
-
-		picrand = rand(1, 6)
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/gopslut<<picrand>>.jpg"></center>'
-
+		'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
 		horand = RAND(1,100)
-
-		'"Please, you don''t have to do this." you try to reason with him. "I''m begging you."'
-		'But your words are in vain. You put up a pathetic attempt to fend him off, but you lost, and now all you can do is stare at the stars while your body is used for someone''s filthiest fantasies.'
-		'Your clothes are ripped off as you shout in helpless frustration as his cold hands touch you in your most intimate places. You close your eyes, not willing to look at your torturer, nor his hard cock hanging above you.'
-		'A second later you feel your attackers noxious breath on your face, his stench is almost worse than what he''s doing between your legs.'
-		*nl
-		'You open your eyes, swollen from crying, to look at your rapist''s face, but you can''t see it. You only see an animal, or worse, a great darkness.'
-		'The silence of the night is only broken by the slapping flesh and his curses, until you begin to falsely moan in excitement, trying to make your rapist to finish quicker and end the torment.'
-		'Even though the pain is intense, your trick works, and before you know it the attacker cums, shooting his seed all over your pussy and belly. He quickly wipes his dick on you, puts it away, and leaves.'
-		'As you lie there broken and humiliated, you see a single shooting star burning a fiery trail through the night sky, and wordlessly make a wish.'
-
-		gs 'arousal', 'vaginal', 20, 'rough', 'sub'
-		gs 'arousal', 'end'
-		gs 'stat'
+		'Try as you might, you just can''t win and you''re violently knocked to the ground, breath driven from your body as your back slams into the concrete. Your vision swims and you roll over onto your stomach, trying to get your hands and feet underneath you, simultaneously trying to crawl away.'
+		'"Fucking bitch! You''re going to pay for that!" A muted clinking rings in the alley and some part of your brain registers that it sounds like a belt buckle.'
+		act'Continue':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape8.jpg"></center>'
+			if $pantyworntype ! 'none':
+				if PCloSkirt > 0:
+					'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. Below your skirt, you feel your panties get pulled aside.'
+				else
+					'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass. You think you hear the sound of the elastic in your panties snapping.'
+				end
+				'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"'
+			else
+				if PCloSkirt > 0:
+					'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth.'
+					'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"  You feel your skirt pulled up and something between your legs. "No panties! You fucking <i>whore!</i>"'
+				else
+					'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. '
+					'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!" You feel your pants violently yanked down over your ass. "No panties! You fucking <i>whore!</i>"'
+				end
+			end
+			
+			if rand(0,1) = 1:
+				!! vaginal rape
+				act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+					cla & *clr
+					'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
+					'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
+					if pcs_vag = 0:
+						'You try to scream again when something stabs into your vagina, tearing straight through your hymen, but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut and your insides feel like they''re on fire as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, while your virginity is violently robbed from you by a stranger.'
+					else
+						'You try to scream again when you feel something stab into your vagina but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your most intimate place being thoroughly violated by a stranger.'
+					end
+					gs 'arousal', 'vaginal', rand(5,10), 'rough', 'rape'
+					gs 'stat'
+					act'The end...':
+						cla & *clr
+						gs 'cum_call','', 'rapist'
+						gs'stat'
+						'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
+						'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
+						'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from inside you, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something leak from your pussy.'
+						'"You''re a pretty good fuck girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
+						act'Cry':
+							cla & *clr
+							gs'stat'
+							minut += 3
+							'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after.mp4"></video></center>'
+							if $pantyworntype ! 'none':
+								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through your panties.'
+							else
+								if PCloSkirt > 0:
+									'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel dribbling down your leg.'
+								else
+									'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
+								end
+							end
+							act'Go to the police station':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+								if $loc = 'pav_commercial' or $loc = 'pav_residential':
+									'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
+								else
+									'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
+								end
+								act'Continue':gt'police_station','rape_report'
+							end
+							
+							act'Don''t go':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+								'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
+								*nl
+								'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
+								act'Leave':gt $loc
+							end
+						end
+					end
+				end
+			else
+				!! anal rape
+				act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+					cla & *clr
+					'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
+					gs 'arousal', 'anal', rand(5,10), 'rough', 'rape'
+					gs 'stat'
+					'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
+					'You try to scream again when you feel something stab into your anus but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your ass being violently stretched out by a stranger.'
+					act'The end...':
+						cla & *clr
+						gs 'cum_call','anus', 'rapist'
+						gs'stat'
+						'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
+						'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
+						'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from your ass, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something trickle out of your ruined asshole.'
+						'"You''re a real buttslut, girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
+						act'Cry':
+							cla & *clr
+							gs'stat'
+							minut += 3
+							'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after.mp4"></video></center>'
+							if $pantyworntype ! 'none':
+								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through the back of your panties.'
+							else
+								if PCloSkirt > 0:
+									'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel leaking from between your cheeks and dribbling down your leg.'
+								else
+									'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
+								end
+							end
+							act'Go to the police station':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+								if $loc = 'pav_commercial' or $loc = 'pav_residential':
+									'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
+								else
+									'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
+								end
+								act'Continue':gt'police_station','rape_report'
+							end
+							
+							act'Don''t go':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+								'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
+								*nl
+								'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
+								act'Leave':gt $loc
+							end
+						end
+					end
+				end
+			end
+		end
 
 		act 'Cry': gt $loc, $loc_arg
 
@@ -661,7 +778,7 @@ if $ARGS[0] = 'surrender':
 		'Even though the pain is intense, your trick works, and before you know it the attacker cums, shooting his seed all over your pussy and belly. He quickly wipes his dick on you, puts it away, and leaves.'
 		'As you lie there broken and humiliated, you see a single shooting star burning a fiery trail through the night sky, and wordlessly make a wish.'
 
-		gs 'arousal', 'vaginal', 20, 'rough', 'sub'
+		gs 'arousal', 'vaginal', 20, 'rough', 'rape'
 		gs 'arousal', 'end'
 		gs 'stat'
 

+ 3 - 3
locations/foto.qsrc

@@ -395,13 +395,13 @@ if $ARGS[0] = 'studio':
 			elseif mesec > 0 and isprok = 0:
 				'"What the hell <<$pcs_lastname>>!"'
 				'You follow his gaze to see the blood running down your legs.'
-				'"Go wash that off and switch to tampons already! There''s a dispenser in the shower room."'
+				'"Go wash that off and put a tampon in already! There''s a dispenser in the shower room."'
 				act'Go to the showers':gt'foto','showers'
 			elseif pcs_makeup = 0:
 				'"Your makeup is smeared all over your face <<$pcs_lastname>>. Go clean up and see the makeup artists first."'
 				act'Go to the showers':gt'foto','showers'
 			else
-				if model_week = (daystart - week) / 7 and model_job_week >= 2:
+				if model_job_week >= 2:
 					gt 'foto', 'practicemodel'
 				else
 					gt 'foto_shoot','model'
@@ -1220,7 +1220,7 @@ if $ARGS[0] = 'practicemodel':
 	gs 'stat'
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-	if model_week = (daystart - week) / 7 and model_job_week >= 2:
+	if model_job_week >= 2:
 		'"Hello <<$pcs_firstname>>. We''ve already done a paid shoot with you this week, so we can''t do another one. But would you like to get some practice in?"'
 	else
 		'"Oh, you want to practice today?"'

+ 2 - 3
locations/foto_shoot.qsrc

@@ -50,11 +50,11 @@ if $ARGS[0] = 'model':
 			modelfoto += 1
 			modelfoto_catalog += 1
 			model_job_week += 1
-			cla & *clr
 			mdlng_exp += rand(2,5)
 			minut += 120
 			money += 450
 			modelfotomoney += 450
+			cla & *clr
 			if rand(1,2) = 1:
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/catalog/1.mp4"></video></center>'
 				'You spend two hours modelling various tights with tops for the online catalogs of retail clothing stores. You change clothes probably 30 times over the shoot, but always wear the same expression. It''s boring but it still gets you paid.'
@@ -71,11 +71,11 @@ if $ARGS[0] = 'model':
 			modelfoto += 1
 			modelfoto_catalog += 1
 			model_job_week += 1
-			cla & *clr
 			mdlng_exp += rand(2,5)
 			minut += 120
 			money += 450
 			modelfotomoney += 450
+			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,3)>>.mp4"></video></center>'
 			bikinicatalog += 1
 			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
@@ -90,7 +90,6 @@ if $ARGS[0] = 'model':
 			msg'"Sorry, but you aren''t a skilled enough model to do this kind of publication yet. Maybe get some practice in on your off days."'
 		else
 			cla & *clr
-			
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Alright, what kind of shoot would you like to do? Fashion, bikini, or lingerie?"'
 			act 'Fashion':

+ 47 - 45
locations/hookup.qsrc

@@ -181,6 +181,7 @@ if $ARGS[0] = 'bj':
 					'You continue to dutifully blow <<$npc_firstname>> until he finally taps you on the head, causing you to pull off.'
 					'"You''re doing great babe, but I want to fuck you before I cum," he grins.'
 					$OpenInnerThought + 'Finally...' + $CloseInnerThought
+					gs'hookup','condoms'
 					gs'hookup','position_choose'
 				end
 			end
@@ -191,6 +192,7 @@ if $ARGS[0] = 'bj':
 				'"Hey," you mumble around his cock, pulling your lips off for a moment. "I''m getting kind of tired down here, can we do something else?"'
 				'"Oh," he says, a little put off by your sudden reaction. "Uhh, yeah. Let''s fuck then."'
 				$OpenInnerThought + 'Finally...' + $CloseInnerThought
+				gs'hookup','condoms'
 				gs'hookup','position_choose'
 			end
 		end
@@ -528,7 +530,7 @@ if $ARGS[0] = 'bj_react3':
 			'"Seriously?" you ask, wiping your mouth with your hand. "You came already?"'
 		end
 
-		if insecure = 1:
+		if npc_insecure = 1:
 			'"Well maybe if you didn''t suck so much dick you wouldn''t be so good at it!" he huffs, pulling back from him. Seems you might have touched a nerve there.'
 			!! (basically calling you a slut/whore)
 			act'Play it off':
@@ -776,7 +778,7 @@ if $ARGS[0] = 'bj2':
 			'<center><b><font color="maroon"><<$npc_firstname>>''s Bedroom</font></b></center>'
 			$npc_apt_bedroom
 			'"So..." you lick your lips seductively at him. "I think I gave your pipe a good cleaning there... Want to return the favor?" You lay back, opening your legs and spreading your cunt, grinning expectantly.'
-			if selfish_lover = 1:
+			if npc_selfish = 1:
 				'"Nah, I''m good here," <<$npc_firstname>> yawns, stretching back. "The blowjob was enough for me."'
 				act'Ugh, whatever':
 					cla & *nl
@@ -861,7 +863,7 @@ if $ARGS[0] = 'bj2':
 			'<center><b><font color="maroon"><<$npc_firstname>>''s Bedroom</font></b></center>'
 			$npc_apt_bedroom
 			'"Mind if we call it here?" you ask. "I think I''m done for tonight."'
-			if generous_lover = 1:
+			if npc_generous = 1:
 				'"Really?" <<$npc_firstname>> raises an eyebrow at you. "But you didn''t get to cum. You only blew me."'
 				if pcs_vag > 0:
 					act'I''m saving myself for marriage':
@@ -928,7 +930,7 @@ if $ARGS[0] = 'lick_pussy':
 					$npc_apt_bedroom
 					'Tiredly, you roll your head to the side to smile at <<$npc_firstname>>.'
 					'"Thanks for returning the favor."'
-					if generous_lover = 1:
+					if npc_generous = 1:
 						'"My pleasure," he smiles back.'
 					else
 						'"You''re welcome," he grins back.'
@@ -1380,6 +1382,7 @@ end
 if $ARGS[0] = 'no_condom1':
 	act'Then I don''t wanna fuck!':
 		cla & *clr
+		$npc_apt_bedroom
 		'"If you don''t want a condom, then I don''t want to fuck!"'
 		'You push him off of you, jumping off the bed and throwing your clothes on.'
 		if hookup_rape_chance > 0:
@@ -1445,6 +1448,8 @@ if $ARGS[0] = 'no_condom2':
 	end
 	
 	act'Then we''re done here':
+		cla & *clr
+		$npc_apt_bedroom
 		'"You''re out of condoms? Then we''re done here." You push him away from you, climbing off the bed and begin reaching for your clothes.'
 		'"Wait, where are you going?"'
 		'"I just told you, if you don''t have any condoms, then I don''t want to have sex'
@@ -1471,6 +1476,7 @@ if $ARGS[0] = 'no_condom2':
 				
 				act'Right':
 					cla & *clr
+					$npc_apt_bedroom
 					'"Well, since you have one..."'
 					'You drop your clothes and move back towards the bed while he opens the packaging and rolls the rubber onto his cock.'
 					gs'hookup','position_choose'
@@ -2371,7 +2377,6 @@ if $ARGS[0] = 'cowgirl_norm1':
 	else
 		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/med1.mp4"></video></center>'
 	end
-
 	'You start bouncing up and down on his cock, enjoying the feeling of it slide in and out of you, hitting the angles in your pussy that can only be hit when you''re on top.'
 	if hookup['orgasm'] < orgasm:
 		*nl
@@ -3272,47 +3277,44 @@ end
 
 
 if $ARGS[0] = 'cum_condom':
-	cla & *clr
-	$hookup['cum_choice'] = 'condom'
-	if $hookup['position'] = 'miss':
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
-		if pcs_horny >= 90 and hookup['orgasm'] = orgasm:
-			hookup['no_cum'] = 1
-			'"Nngh~! Ahhh~! Don''t stop!" you moan. "Don''t stop! Don''t stop! Don-"'
-			*nl
-		end
-		'<<$npc_firstname>> suddenly thrusts into you one more time and stops, tensing up and shuddering as he does so. A few moments later, he withdraws his cock from your pussy and you can see the condom around it sagging, filled with a white liquid.'
-		act'Continue':
-			cla & *clr
-			gs'cum_call','stomach',$boy,1
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/condom1.jpg"></center>'
-			'<<$npc_firstname>> pulls the condom from his dick with a wet slapping sound, and semen flies from the open end, spattering across your skin. He ties it off and tosses it onto your stomach, landing next to his cum.'
-			gs'hookup_after','gross_condom'
-		end
-	elseif $hookup['position'] = 'doggy':
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum71.jpg"></center>'
-		if pcs_horny >= 90 and hookup['orgasm'] = orgasm:
-			hookup['no_cum'] = 1
-			'"Nngh~! Ahhh~! Don''t stop!" you moan. "Don''t stop! Don''t stop! Don-"'
-			*nl
-		end
-		'<<$npc_firstname>> suddenly thrusts hard into you and stops moving, holding his cock as deep inside you as it can go. You feel him shudder inside you, his cock flexing inside your pussy before his body relaxes and pulls his dick from your pussy. Based on that, you assume he must''ve cum and as you glance backwards you confirm your suspicions, watching him peel the condom from his cock, a white viscous liquid filling the rubber sleeve. He ties it off and tosses it aside.'
-		!!gs'hookup_after','good_for_you'
-		gs'hookup_after','pre'
-		
-	elseif $hookup['position'] = 'cowgirl':
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum81.jpg"></center>'
-		if pcs_horny >= 90 and hookup['orgasm'] = orgasm:
-			hookup['no_cum'] = 1
-			'"Nngh~! Ahhh~!" you moan, continuing to bounce up and down on <<$npc_firstname>>''s cock. "Yes! Yes! Yes! Ye-"'
-			*nl
+	act'Continue':
+		$hookup['cum_choice'] = 'condom'
+		if $hookup['position'] = 'miss':
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
+			if pcs_horny >= 90 and hookup['orgasm'] = orgasm:
+				hookup['no_cum'] = 1
+				'"Nngh~! Ahhh~! Don''t stop!" you moan. "Don''t stop! Don''t stop! Don-"'
+				*nl
+			end
+			'<<$npc_firstname>> suddenly thrusts into you one more time and stops, tensing up and shuddering as he does so. A few moments later, he withdraws his cock from your pussy and you can see the condom around it sagging, filled with a white liquid.'
+			act'Continue':
+				cla & *clr
+				gs'cum_call','stomach',$boy,1
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/condom1.jpg"></center>'
+				'<<$npc_firstname>> pulls the condom from his dick with a wet slapping sound, and semen flies from the open end, spattering across your skin. He ties it off and tosses it onto your stomach, landing next to his cum.'
+				gs'hookup_after','gross_condom'
+			end
+		elseif $hookup['position'] = 'doggy':
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum71.jpg"></center>'
+			if pcs_horny >= 90 and hookup['orgasm'] = orgasm:
+				hookup['no_cum'] = 1
+				'"Nngh~! Ahhh~! Don''t stop!" you moan. "Don''t stop! Don''t stop! Don-"'
+				*nl
+			end
+			'<<$npc_firstname>> suddenly thrusts hard into you and stops moving, holding his cock as deep inside you as it can go. You feel him shudder inside you, his cock flexing inside your pussy before his body relaxes and pulls his dick from your pussy. Based on that, you assume he must''ve cum and as you glance backwards you confirm your suspicions, watching him peel the condom from his cock, a white viscous liquid filling the rubber sleeve. He ties it off and tosses it aside.'
+			!!gs'hookup_after','good_for_you'
+			gs'hookup_after','pre'
+			
+		elseif $hookup['position'] = 'cowgirl':
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum81.jpg"></center>'
+			if pcs_horny >= 90 and hookup['orgasm'] = orgasm:
+				hookup['no_cum'] = 1
+				'"Nngh~! Ahhh~!" you moan, continuing to bounce up and down on <<$npc_firstname>>''s cock. "Yes! Yes! Yes! Ye-"'
+				*nl
+			end
+			'<<$npc_firstname>> suddenly grabs you by the hips thrusts hard into you, holding you down onto his cock. You feel him shudder inside you, his cock flexing inside your pussy before his body relaxes. You carefully pull yourself from <<$npc_firstname>>''s dick. As it pops from your pussy, you see that the rubber encasing it is filled with a thick white liquid. He pulls off the condom with a wet slapping sound, tying it off and tossing it aside.'
+			gs'hookup_after','pre'
 		end
-		'<<$npc_firstname>> suddenly grabs you by the hips thrusts hard into you, holding you down onto his cock. You feel him shudder inside you, his cock flexing inside your pussy before his body relaxes. You carefully pull yourself from <<$npc_firstname>>''s dick. As it pops from your pussy, you see that the rubber encasing it is filled with a thick white liquid. He pulls off the condom with a wet slapping sound, tying it off and tossing it aside.'
-		gs'hookup_after','pre'
-	end
-	if hookup['no_cum'] = 1:
-		*nl
-		'You lay back on the bed, panting. Fuck. You were <i>this</i> close to orgasm.'
 	end
 end
 

+ 4 - 4
locations/hookup_after.qsrc

@@ -11,16 +11,16 @@ if $ARGS[0] = 'exit':
 	killvar 'hookup'
 	minut += 2
 	!! exit should be based on type of apartment and location
-	if npc_residence[$boy] = 1:
+	if npc_residence = 1:
 		!! Pav residential exit
 		gt 'pav_residential'
-	elseif npc_residence[$boy] = 2:
+	elseif npc_residence = 2:
 		!! Student dorms exit
 		gt 'city_island'
-	elseif npc_residence[$boy] = 3:
+	elseif npc_residence = 3:
 		!! St. Petersburg Residential exit
 		gt 'city_residential'
-	elseif npc_residence[$boy] = 4:
+	elseif npc_residence = 4:
 		!! St. Petersburg City Center exit
 		gt 'city_center'
 	end

+ 1 - 1
locations/lariska_schedule.qsrc

@@ -4,7 +4,7 @@ lariloc = 0
 
 !! lariloc['athome'] = 1 means Lariska is not only home, but available to answer the door if you knock
 
-if SchoolAtestat = 0 or natholi = 0:
+if SchoolAtestat = 0 and natholi = 0:
 	if week <= 5:
 		if (hour < 6) or (hour = 6 and minut < 45):
 			!!Bedroom - Asleep

+ 116 - 9
locations/npcgeneratec.qsrc

@@ -1,6 +1,7 @@
 # npcgeneratec
 
 ! {This file expects npctempgsex which is the desired sex of the NPC to be generated, $npctempgn[0], which is the used name of the generated NPC. Rapist or Red Headed Stranger, for example. And npctempgage, which is the approximate age of the NPC in years. Everything is then randomly generated, and you are expected to fix the generated NPC yourself with any special items you need from it after it completes running. So sex, what you call them until they introduce themselves, and age.}
+
 ! The fourth parameters indicates what area the npc''s home is in
 !! 1 - Pavlovsk Residential Area
 !! 2 - Student dorms in the city
@@ -156,9 +157,6 @@ npc_syth[$npclastgenerated] = 0
 npc_gon[$npclastgenerated] = 0
 npc_thrush[$npclastgenerated] = 0
 
-! {Chemestry and clothing preference are unspecified}
-npc_style[$npclastgenerated] = 0
-
 npc_sex[$npclastgenerated] = 0
 npc_perv[$npclastgenerated] = 0
 
@@ -200,9 +198,12 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	end
 	
 	if npc_finance[$npclastgenerated] = 0:
-		if npc_residence[$npclastgenerated] ! 0 and npctempgage < 22:
-			npc_student = rand(0,1)
+		if npc_residence[$npclastgenerated] ! 1 and npc_residence[$npclastgenerated] ! 4 and npctempgage < 22:
+			npc_student[$npclastgenerated] = rand(0,1)
 			npc_apt_type[$npclastgenerated] = rand(1,4)
+		elseif npc_residence[$npclastgenerated] = 2:
+			npc_student[$npclastgenerated] = 1
+			npc_apt_type[$npclastgenerated] = 2
 		else
 			npc_apt_type[$npclastgenerated] = rand(2,4)
 		end
@@ -216,14 +217,85 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		npc_occupation[$npclastgenerated] = rand(14,18)
 	end
 	
-	if npc_apt_type = 2:
+	
+!	npc_style determines generally how they dress and what their "persona" is
+!	1 - "normal"
+!	2 - Gopnik
+!	3 - nerdy
+!	4 - sporty
+!	5 - fashionable
+!	6 - businessman
+	if npc_occupation < 15:
+		npc_style[$npclastgenerated] = rand(1,5)
+	else
+		npc_style[$npclastgenerated] = (rand(2,6) mod 6) + 1
+	end
+	
+	if npc_apt_type = 6:
+		!! high rise
+		
+		!! this is to determine what their spare room is used for based on their personality type
+		if npc_style = 3:
+			npc_apt_spare = 1
+		elseif npc_style = 2 or npc_style = 4:
+			npc_apt_spare = 2
+		else
+			npc_apt_spare = rand(1,2)
+		end
+		if npc_apt_spare = 1:
+			$npc_apt_spare = 'gaming'
+		elseif npc_apt_spare = 2:
+			$npc_apt_spare = 'gym'
+		end
+		npc_apt_number[$npclastgenerated] = rand(1,2)
+		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'		
+	elseif npc_apt_type = 4 or npc_apt_type = 5:
+		!! multi-bedroom
+		!! npc_apt_type = 4 will one day be living with roommates but for now we''re just making it easy on ourselves. No roommates until later.
+		
+		!! this is to determine what their spare room is used for based on their personality type
+		if npc_style = 3:
+			npc_apt_spare = 1
+		elseif npc_style = 2 or npc_style = 4:
+			npc_apt_spare = 2
+		else
+			npc_apt_spare = rand(1,2)
+		end
+		if npc_apt_spare = 1:
+			$npc_apt_spare = 'gaming'
+		elseif npc_apt_spare = 2:
+			$npc_apt_spare = 'gym'
+		end
+		
+		npc_apt_number[$npclastgenerated] = rand(1,2)
+		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/kitchen.jpg"></center>'
+		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
+		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
+		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
+		$npc_apt_spare[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/<<$npc_apt_spare[$npclastgenerated]>>.jpg"></center>'
+	elseif npc_apt_type = 3:
+		!! one bedroom
+		npc_apt_number[$npclastgenerated] = rand(1,3)
+		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/kitchen.jpg"></center>'
+		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
+		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
+		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
+	elseif npc_apt_type = 2:
+		!! studio apartment
 		npc_apt_number[$npclastgenerated] = rand(1,2)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
-	else
+	elseif npc_apt_type = 1:
+		!! student dorm
 		npc_apt_number[$npclastgenerated] = rand(1,3)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/kitchen.jpg"></center>'
@@ -255,7 +327,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 
 	npc_humor[$npclastgenerated] = rand(0,3)
- 
+	
+!! npc_fav_pos = 1: missionary
+!! npc_fav_pos = 2: doggy
+!! npc_fav_pos = 3: cowgirl
+!! npc_fav_pos = 4: blowjobs
+!! npc_fav_pos = 5: titjobs
+!! npc_fav_pos = 6: 69
+!! npc_fav_pos = 7: anal
+	
 	npc_fav_pos[$npclastgenerated] = rand(1,7)
  
 	npc_tit_pref[$npclastgenerated] = rand(0,3)
@@ -266,7 +346,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 ! we will skip addit for now, have a variable just for smoking
 
-	npc_addit[$npclastgenerated] = rand(0,1)
+!!	npc_addit[$npclastgenerated] = rand(0,1)
 
 	npc_doors[$npclastgenerated] = rand(0,2)
 
@@ -279,6 +359,33 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	npc_lover_keys[$npclastgenerated] = 0
 
 	npc_residence[$npclastgenerated] = temp_location
+	
+!! traits
+
+	if rand(0,2) > 0:
+		if rand(0,1) = 1:
+			npc_earlyriser[$npclastgenerated] = 1
+		else
+			npc_latesleeper[$npclastgenerated] = 1
+		end
+	end
+	
+	if rand(0,2) > 0:
+		if rand(0,1) = 1:
+			npc_generous[$npclastgenerated] = 1
+		else
+			npc_selfish[$npclastgenerated] = 1
+		end
+	end
+	
+	npc_argumentative[$npclastgenerated] = rand(0,2)
+	npc_competitive[$npclastgenerated] = rand(0,2)
+	npc_insecure[$npclastgenerated] = rand(0,2)
+	npc_condom_conscious[$npclastgenerated] = rand(0,1)
+	npc_childfree[$npclastgenerated] = rand(0,2)
+	npc_abusive[$npclastgenerated] = rand(0,2)
+	npc_sexdrive[$npclastgenerated] = rand(1,10)
+	
 
 ! {Variables are cleaned up.}
 killvar '$npctempgn'

+ 1 - 1
locations/pain.qsrc

@@ -38,7 +38,7 @@ elseif $ARGS[2] = 'pinch':
 	pain[2] = 5
 elseif $ARGS[2] = 'stretch':
 	pain[2] = 6
-elseif $ARGS[2] = 'Slam':
+elseif $ARGS[2] = 'slam':
 	pain[2] = 6
 elseif $ARGS[2] = 'burn':
 	pain[2] = 7

+ 152 - 0
locations/police_station.qsrc

@@ -1493,5 +1493,157 @@ if $ARGS[0] = 'returncell':
 	end
 end
 
+if $ARGS[0] = 'rape_report':
+	if $loc = 'pav_commercial' or $loc = 'pav_residential':
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg"></center>'
+		'One step after another, you trudge through town until you suddenly find yourself standing inside the police station. A bored looking cop glances at you.'
+		'"Can I help you?"'
+		'"I- I''d like t-to report a r-rape..." you stammer out. The officer''s eyes go wide with surprise, but less like he seems shocked at what you said happened to you and more like he didn''t expect you to have a real complaint.'
+		'"Oh! Well, just come this way, we can take your statement over here."'
+		act'Continue':
+			minut += rand(2,5)
+			gs'stat'
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation1.jpg"></center>'
+			'You sit down at a shoddy looking desk and another officer who looks only marginally more competent than the one who greeted you sits down across from you.'
+			'"Alright ma''am, tell me what happened to you."'
+			'You explain to the officer as best as you can what happened to you while he takes notes. How you were randomly attacked, how you were violated.'
+			act'Continue':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation1.jpg"></center>'
+				'"And where did the attack occur?"'
+				if $loc = 'pav_commercial':
+					'"In th-the commercial district. But he pulled me away. I... I don''t remember how far..."'
+				elseif $loc = 'pav_residential':
+					'"In th-the commercial district. But he pulled me away. I... I don''t remember how far..."'
+				end
+				'"Can you describe what he looked like?"'
+				'The blood drains from your face. "I... I-!"'
+				'"Anything about him will be helpful. Height? Build? Hair color? Eye color?"'
+				act'I... can''t...':
+					cla & *nl
+					'"He was... I don''t remember how tall he was... And... he was wearing a nondescript hoody, I couldn''t tell what his body type was... And-! And I don''t know what he looks like... he was behind me during... the event..."'
+					'The officer doesn''t say anything but you see him slightly shake his head. You realize that the information you gave him is going to be of little to no use at all. A rape in town and nothing else to go off of? You might as well have told him you saw a bird in the park.'
+					*nl
+					'For a moment, you wonder how many other girls like you have sat at this desk filing a report just like this one only for it to go nowhere. You wonder if any of them were been raped by the same man who raped you...'
+					act'Finish the interview':
+						minut += rand(2,5)
+						gs'stat'
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/police/pavrec.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 so very alone...'
+						act'Leave':gt'pav_train'
+					end
+					act'Can I get a rape kit?':
+						minut += rand(2,5)
+						gs'stat'
+						cla & *clr
+						'<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/shared/police/pavrec.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.' 
+							*nl
+							'Leaving you alone with your thoughts and memories of your rape...'
+							act'Leave':gt'pav_train'
+						end
+					end
+				end
+			end
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityrec.jpg"></center>'
+		'One step after another, you trudge through town until you suddenly find yourself standing inside the police station. On the other side of a plexiglass reception, you can see several officers milling about, though none pay attention to you. Stepping up to the window, you pick up the phone and hear a buzzer sound on the other side. One of the officers picks it up without hesitation and looks at you.'
+		'"Can I help you?"'
+		'"I- I''d like t-to report a r-rape..." you stammer out. The officer nods but his expression doesn''t change in the slightest.'
+		'"Someone will come out to meet you. Follow them and they''ll take your statement in the back."'
+		act'Continue':
+			minut += rand(2,5)
+			gs'stat'
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation1.jpg"></center>'
+			'As promised, someone comes out and takes you into their office space behind. You sit down at a shoddy looking desk and the officer takes his place on the other side of it.'
+			'"Alright ma''am, tell me what happened to you."'
+			'You explain to the officer as best as you can what happened to you while he takes notes. How you were randomly attacked, how you were violated.'
+			act'Continue':
+				minut += rand(2,5)
+				gs'stat'
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation1.jpg"></center>'
+				'"And where did the attack occur?"'
+				if $loc = 'city_center':
+					'"Here, i-in the city center. But he pulled me away. I... I don''t remember how far..."'
+				elseif $loc = 'city_residential':
+					'"In th-the residential district. But he pulled me away. I... I don''t remember how far..."'
+				elseif $loc = 'city_industrial':
+					'"In th-the industrial district. But he pulled me away. I... I don''t remember how far..."'
+				elseif $loc = 'city_island':
+					'"On th-the island, Vasilyevsky Island. But he pulled me away. I... I don''t remember how far..."'
+				elseif $loc = 'city_park':
+					'"In th-the park. But he pulled me away. I... I don''t remember how far..."'
+				end
+				'"Can you describe what he looked like?"'
+				'The blood drains from your face. "I... I-!"'
+				'"Anything about him will be helpful. Height? Build? Hair color? Eye color?"'
+				act'I... can''t...':
+					cla & *nl
+					'"He was... I don''t remember how tall he was... And... he was wearing a nondescript hoody, I couldn''t tell what his body type was... And-! And... I don''t know what he looks like... he was behind me during... the event..."'
+					'The officer doesn''t say anything but you see him slightly shake his head. You realize that the information you gave him is going to be of little to no use at all. A rape in town and nothing else to go off of? You might as well have told him you a pidgeon did it.'
+					*nl
+					'For a moment, you wonder how many other girls like you have sat at this desk filing a report just like this one only for it to go nowhere. You wonder if any of them were been raped by the same man who raped you...'
+					act'Finish the interview':
+						minut += rand(2,5)
+						gs'stat'
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.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 so very alone...'
+						act'Leave':gt'pav_train'
+					end
+					act'Can I get a rape kit?':
+						minut += 2
+						gs'stat'
+						cla & *clr
+						'<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':
+							minut += 20
+							gs'stat'
+							cla & *clr
+							'<center><img <<$set_imgh>> src="images/locations/city/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
+		end
+	end
+	
+end
+
 --- police_station ---------------------------------
 

+ 178 - 80
locations/street_event.qsrc

@@ -265,8 +265,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/rapist.jpg"></center>'
 				'You try to run away, but you''re not quick enough, and he catches you before you even get close to the end of the alleyway. He places a hand over your mouth so you can''t scream and drags you back into the alley.'
-				act 'Submit to the rape': gt 'street_event', 'rape'
-				act 'Fight': gt 'street_event', 'fight_rape'
+				act 'Struggle': gt 'street_event', 'rape'
 			else
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
@@ -282,8 +281,7 @@ if $ARGS[1] = 'main':
 				act 'Continue': gt 'succubus', 'RapistFight'
 			end
 		end
-		act 'Submit to the rape': gt 'street_event', 'rape'
-		act 'Fight': gt 'street_event', 'fight_rape'
+		act 'Struggle': gt 'street_event', 'rape'
 		exit
 	end
 
@@ -1727,96 +1725,196 @@ if $ARGS[0] = 'rape':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape1.jpg"></center>'
 	if $clothingworntype ! 'nude':
-		'Once he drags your far enough down into the alley, he throws you violently against the wall, knocking the wind out of you, stunning you for a moment. He grabs you by the hair and pushes your face against the stone wall, pinning it in place. He leans in, and you can feel his hot breath on your cheek as he whispers to you, "You better not scream bitch, or I will make this a lot worse."'
+		'Once your attacker drags your far enough down into the alley, he throws you violently against the wall, knocking the wind out of you, stunning you for a moment. He grabs you by the hair and pushes your face against the stone wall, pinning it in place. He leans in, and you can feel his hot breath on your cheek as he whispers to you, "You better not scream bitch, or I will make this a lot worse."'
 	else
-		'You meekly don''t move or cry out. In the faint light, you can see him grin as you obey him. "Yeah I knew you wanted this. Walking around naked, you were hoping some man would take you. Well you''re going to get your wish bitch," he says as he unbuttons his pants and pulls out his rock hard dick. Without another word, he grabs you and drags you to your feet. He turns you around so your face is against the wall.'
+		'You meekly don''t move or cry out. In the faint light, you can see him grin as you obey him. "Yeah I knew you wanted this. Walking around naked, you were hoping some man would take you." He leans in further. You can feel his hot breath on your cheek as he whispers to you, "You better not scream bitch, or I will make this a lot worse."'
 	end
 	act 'Stay silent':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape2.jpg"></center>'
-		'You meekly don''t move or cry out. In the faint light, you can see him grin as you obey him. "That''s right be a good little bitch, and I''ll take it easy on you as long as you do what I say," he says as he pulls your clothes away until your butt and pussy are exposed. Then he unbuttons his pants and pulls out his rock hard cock. Without another word, he shoves his dick painfully into your pussy, not caring that you are not remotely wet.'
-		gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'rape'
-		gs 'stat'
-		act 'Submit':
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape4.jpg"></center>'
-			'He pins you between himself and the wall, with you facing the wall. He roughly fucks your twat, grunting with each one of his balls deep thrusts into you. "Yeah you like this don''t you slut, all you sluts love getting fucked." You do your best to endure the pain as he roughly fucks your pussy.'
-			gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'rape'
-			gs 'stat'
-			act 'Do nothing':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape5.jpg"></center>'
-				'As he roughly fucks your twat, grunting with each one of his balls deep thrusts into you, he says, "Don''t worry slut, I don''t want any bastards either, lucky for us both you have another hole." Just as he says that, he pulls out of your pussy and then shoves his dick up your asshole, causing you to hiss in pain again.'
-				gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'rape'
-				gs 'stat'
-				act 'Too much pain':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape6.jpg"></center>'
-					'He forces his prick balls deep into your ass and starts hammering away, just as roughly as he was fucking your pussy. He starts grunting a bit louder and faster. "At least it sounds like he is nearly finished and this nightmare can finally be over," you think to yourself as tears stream down your face from the pain and violation happening to you.'
-					gs 'arousal', 'anal', 5, 'sub', 'rough', 'rape'
-					gs 'stat'
-					act 'Too much pain':
-						*clr & cla
-						minut +=3
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape7.jpg"></center>'
-						'He thrusts once, twice more balls deep into your butt before he groans loudly. You can feel his cum squirting inside of your ass. Finally, he finishes and pulls away. He presses your face against the wall with one hand. "Don''t move bitch!" With the other hand, he puts his dick away. Once he is fully dressed, he lets go of you and jogs out of the alleyway, leaving you standing there, half dressed and cum leaking out of your ass, with tears streaming down your face.'
-						gs 'arousal', 'anal', 2, 'sub', 'rough', 'rape'
-						gs 'cum_call','anus',$boy,1
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Leave':gt $loc
-					end
+		'You meekly don''t move or cry out. In the corner of your eye, you can see him grin as you obey him. "That''s right be a good little bitch, and I''ll take it easy on you as long as you do what I say."'
+		act'Continue':
+			if $pantyworntype ! 'none':
+				if PCloSkirt > 0:
+					'He roughly shoves you onto the ground, bearing his weight down upon you. Underneath your skirt, you feel him pull your panties aside and you involuntarily shiver in fear.'
+				else
+					'A weight from behind pushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass. You think you hear the sound of the elastic in your panties snapping and you shiver in fear.'
 				end
+			else
+				if PCloSkirt > 0:
+					'A weight from behind pushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. You feel your skirt pulled up and something between your legs.'
+					'"No panties! You fucking whore! You were practically asking for this!"'
+				else
+					'A weight from behind pushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass.'
+					'"No panties! You fucking whore! You were practically asking for this!"'
+				end
+				
+			end
+			
+			
+			if rand(0,1) = 1:
+				!! vaginal rape
+				'Then, without warning or preamble, he clamps his hand over your mouth and drives his cock inside your pussy.'
+				act'<i><b>MMMMMRRMMPH-!!!</b></i>':gt'street_event','vaginal_rape'
+			else
+				!! anal rape
+				'Then, without warning or preamble, he clamps his hand over your mouth and shoves his cock up your ass.'
+				act'<i><b>MMMMMRRMMPH-!!!</b></i>':gt'street_event','anal_rape'
 			end
 		end
 	end
-	act 'Please don''t get me pregnant':
+	act 'Scream':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape3.jpg"></center>'
-		'You can''t help it. You don''t want to get pregnant or some disease from him. "Please don''t get me pregnant, at least use a condom," you beg him.'
-		'He laughs. "Oh is that all your worried about? Don''t worry, I won''t get you pregnant," he says as he pulls your clothes away until your butt is exposed. Then he unbuttons his pants and pulls out his rock hard cock. With one hand on your neck, he holds your head in place against the wall. Suddenly, he pulls you away from the wall and shoves you face first down onto the dirty alleyway ground.'
-		gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'rape'
-		gs 'stat'
-		act 'Flung to the ground':
-			*clr & cla
-			gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape2.jpg"></center>'
+		gs 'pain', 7, 'head', 'slam'
+		'You can''t help it. You shriek at the top of your lungs.'
+		'For a single moment.'
+		'Your scream is immediately cut off as he bashes your head into the wall. Your legs buckle underneath you and your vision goes fuzzy.'
+		'"Fucking bitch. I guess we do it the hard way then." A muted clinking rings in the alley and some part of your brain registers that it sounds like a belt buckle. You groan and roll onto your stomach, trying to get your hands and feet underneath you.'
+		act'Continue':
+			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape8.jpg"></center>'
-			'He pins you between himself and the ground. You hear him spit, and then his other fingers, slightly wet from his spit, work their way into your ass, just getting it a little wet. Without another word, he shoves his dick painfully into your asshole. You hiss in pain as his cock rips its way into your mostly unlubricated ass. He roughly fucks your asshole, grunting with each one of his balls deep thrusts into you. "Yeah you like this don''t you slut, all you sluts love getting fucked." You do your best to endure the pain as he roughly fucks your butt.'
-			gs 'arousal', 'anal', 5, 'sub', 'rough', 'rape'
-			gs 'stat'
-			act 'Submit':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape9.jpg"></center>'
-				'As he roughly fucks your asshole, grunting with each one of his balls deep thrusts into you, he says, "Yeah you was right slut, this is better than that nasty pussy of yours." He keeps hammering himself into your ass.'
-				gs 'arousal', 'anal', 5, 'sub', 'rough', 'rape'
-				gs 'stat'
-				act 'Do nothing':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape10.jpg"></center>'
-					'He starts grunting a bit louder and faster. "At least it sounds like he is nearly finished and this nightmare can finally be over," you think to yourself as tears stream down your face from the pain and violation happening to you.'
-					gs 'arousal', 'anal', 5, 'sub', 'rough', 'rape'
-					gs 'stat'
-					act 'too much pain':
-						*clr & cla
-						minut +=3
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape11.jpg"></center>'
-						'He thrusts once, twice more balls deep into your butt before he groans loudly. You can feel his cum squirting inside of your ass. Finally, he finishes and pulls away. He presses your face against the ground with one hand. "Don''t move bitch!" With the other hand, he puts his dick away. Once he is fully dressed, he lets go of you, getting up off of you. Next, you can hear him jogging away. You turn and look up just in time to see him jog out of the alleyway. You slowly stand up, still half dressed, with cum leaking out of your ass and tears streaming down your face.'
-						gs 'arousal', 'anal', 2, 'sub', 'rough', 'rape'
-						gs 'cum_call','anus',$boy,1
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Leave':gt $loc
-					end
+			if $pantyworntype ! 'none':
+				if PCloSkirt > 0:
+					'A weight from behind pushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. Below your skirt, you feel your panties get pulled aside.'
+				else
+					'A weight from behind pushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass. You think you hear the sound of the elastic in your panties snapping.'
+				end
+			else
+				if PCloSkirt > 0:
+					'A weight from behind pushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. You feel your skirt pulled up and something between your legs.'
+					'"No panties! You fucking whore! You were practically asking for this!"'
+				else
+					'A weight from behind pushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass.'
+					'"No panties! You fucking whore! You were practically asking for this!"'
+				end
+			end
+			
+			act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+				if rand(0,1) = 1:
+					!! vaginal rape
+					'Then, without warning or preamble, he clamps his hand over your mouth and drives his cock inside your pussy.'
+					gt'street_event','vaginal_rape'
+				else
+					!! anal rape
+					'Then, without warning or preamble, he clamps his hand over your mouth and shoves his cock up your ass.'
+					gt'street_event','anal_rape'
+				end
+			end
+		end		
+	end
+	
+	act 'Fight back': 
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+		'You hesitate a moment, relaxing your body, making him think you''re about to submit. Then without warning, you throw your head back, smashing it into your attacker''s forehead. He stumbles backward and you bring your hands up. You''re not going to go down on this guy without a fight!'
+		act'Fight!':gt 'street_event', 'fight_rape'
+	end
+end
+
+if $ARGS[0] = 'vaginal_rape':
+	'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
+	'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
+	if pcs_vag = 0:
+		'Your eyes go wide in pain as your pussy is impaled by your attacker''s cock. It tears straight through your hymen and you try to scream but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut and your insides feel like they''re on fire as your attacker thrusts into you again and again and again with great self indulgence. You try to crawl away, but his weight and your position leaves your efforts futile. All you can do is endure, tears streaming down your face, while your virginity is violently robbed from you by a stranger.'
+	else
+		'Your eyes go wide in pain as your pussy is impaled by your attacker''s cock. You try to scream but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut and your insides feel like they''re on fire as your attacker thrusts into you again and again and again with great self indulgence. You try to crawl away, but his weight and your position leaves your efforts futile. All you can do is endure, tears streaming down your face, your most intimate place being thoroughly violated by a stranger.'
+	end
+	gs 'arousal', 'vaginal', rand(5,10), 'rough', 'rape'
+	gs 'stat'
+	act'The end...':
+		cla & *clr
+		gs 'cum_call','', 'rapist'
+		gs'stat'
+		'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
+		'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
+		'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from inside you, eliciting a whimper from your lips. With that final act, you''re left quivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something leak from your pussy.'
+		'"You''re a pretty good fuck girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
+		act'Cry':
+			cla & *clr
+			gs'stat'
+			minut += rand(3,10)
+			'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after.mp4"></video></center>'
+			if $pantyworntype ! 'none':
+				'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through your panties.'
+			else
+				if PCloSkirt > 0:
+					'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the liquid you feel dribbling down your leg.'
+				else
+					'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
+				end
+			end
+			act'Go to the police station':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+				if $loc = 'pav_commercial' or $loc = 'pav_residential':
+					'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
+				else
+					'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
 				end
+				act'Continue':gt'police_station','rape_report'
+			end
+			
+			act'Don''t go':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+				'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
+				*nl
+				'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
+				act'Leave':gt $loc
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'anal_rape':
+	'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
+	gs 'arousal', 'anal', rand(5,10), 'rough', 'rape'
+	gs 'stat'
+	'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
+	'Your eyes go wide in pain as your ass is impaled by your attacker''s cock. You try to scream but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut and your asshole feels like it''s on fire as your attacker thrusts into you again and again and again with great self indulgence. You try to crawl away, but his weight and your position leaves your efforts futile. All you can do is endure, tears streaming down your face, your anus being violently stretched out by a stranger.'
+	act'The end...':
+		cla & *clr
+		gs 'cum_call','anus', 'rapist'
+		gs'stat'
+		'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
+		'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
+		'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from your ass, eliciting a whimper from your lips. With that final act, you''re left quivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something trickle out of your ruined asshole.'
+		'"You''re a real buttslut, girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
+		act'Cry':
+			cla & *clr
+			gs'stat'
+			minut += 3
+			'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after.mp4"></video></center>'
+			if $pantyworntype ! 'none':
+				'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through the back of your panties.'
+			else
+				if PCloSkirt > 0:
+					'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel leaking from between your cheeks and dribbling down your leg.'
+				else
+					'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through the crack of your pants.'
+				end
+			end
+			act'Go to the police station':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+				if $loc = 'pav_commercial' or $loc = 'pav_residential':
+					'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. Slowly limping your way towards the train depot, you make your way to the police station that resides next to it.'
+				else
+					'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. Slowly limping your way towards the city center, you make your way to the police station that resides there.'
+				end
+				act'Continue':gt'police_station','rape_report'
+			end
+			
+			act'Don''t go':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+				'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
+				*nl
+				'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
+				act'Leave':gt $loc
 			end
 		end
 	end

+ 9 - 1
locations/taxi.qsrc

@@ -88,6 +88,7 @@ end
 
 if $ARGS[0] = 'ride':
 	cls
+	stat['taxi_sex_pay'] += 1
 	gs 'stat'
 	gs 'npcgeneratec', 0, 'Taxi Driver', rand(30,46)
 	gs 'boyStat', $npclastgenerated
@@ -95,6 +96,10 @@ if $ARGS[0] = 'ride':
 	$temp = func('sexprefrand')
 	'<center><img <<$set_imgh>> src="images/locations/shared/taxi/showtits.jpg"></center>'
 	'Once seated in the back seat, you blurt out, "I don''t have any money." The driver turns and glares back at you. "Why did you wave me down then, get out!" You quickly pull your top down, showing him your tits. "Maybe we can work something out?" He looks you over for a moment and then nods. "Ok, you give me a ride then I''ll give you a ride," he says with a leer and drives you back to his garage.'
+	'Once seated in the back seat you blurt out, "I don''t have any money."'
+	'The driver turns and glares back at you. "Why did you wave me down then, get out!"'
+	'You pull your top down showing him your tits. "Maybe we can work something out?" He looks you over for a moment and then nods.'
+	'"Ok you give me a ride then I''ll give you a ride," he says with a leer and drives you back to his garage.'
 	
 	if stat['vaginal'] = 0:
 		$temp = 'bj' & 'When he stops in his garage, you say, "I''m still a virgin." Seeing the look on his face, you hastily add with a sweet smile, "We can still have fun in other ways." He grunts and nods, accepting the condition.' 
@@ -110,7 +115,10 @@ if $ARGS[0] = 'ride':
 		if $temp = 'vaginal': gt 'taxi', 'vag1'
 		if $temp = 'anal': gt 'taxi', 'anal'
 	end
-	act 'Chicken out':gt $loc,$loc_arg
+	act 'Chicken out':
+		stat['taxi_sex_pay'] -= 1
+		gt $loc,$loc_arg
+	end
 end
 
 if $ARGS[0] = 'vag1':