Merge remote-tracking branch 'julzor/master'

locations/natbelapt.qsrc

@@ -288,9 +288,7 @@ if $ARGS[0] = 'hallway':
 		act 'Mother''s Room': gt 'natbelapt', 'natmother'
 		act 'Natasha''s Room': gt 'natbelapt', 'natroom'
 		act 'Bathroom': gt 'natbelapt', 'bathroom'
-		if NatashaLoc = 7:
-			act 'Laundry Room': gt 'natbelEv', 'laundry'
-		end
+		if NatashaLoc = 7: act 'Laundry Room': gt 'natbelEv', 'laundry'
 	else
 		'Natasha is standing next to you, looking at you expectantly. "What''s up, <<$pcs_nickname>>?"'
 		act '<b>Leave Natasha''s apartment</b>': gt 'natbelapt', 'leave_apartment'
@@ -369,8 +367,9 @@ if $ARGS[0] = 'showerevent1':
 			'You get back to showering making sure to pay special attention to your breasts. <<$NatashaMotherNickname>> sits down on the toilet, and you can hear the sound of her peeing. You get turned on a bit, taking glances at her. Finally, she gets up, flushes and washes her hands before leaving you alone again in the bathroom.'
 			gs 'arousal', 'flash', 2
 			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Get out of the shower': gt 'natbelapt','bathroom'
+			act 'Get out of the shower': gt 'natbelapt', 'bathroom'
 		end
 	end
 end
@@ -386,8 +385,10 @@ if $ARGS[0] = 'natroom':
 	*clr & cla
 	minut += 1
 	gs 'stat'
-	act 'Leave Natasha''s room': gt 'natbelapt', 'hallway'
 	'<center><h4><font color="maroon">Natasha''s Room</font></h4></center>'
+	
+	act 'Leave Natasha''s room': gt 'natbelapt', 'hallway'
+	
 	if hour <= 6 or hour >= 23:
 		NatashaLoc = 2
 		*clr & cla
@@ -401,6 +402,7 @@ if $ARGS[0] = 'natroom':
 			'You look into the room and see that Natasha is sleeping soundly on her bed. Not wanting to disturb her you close the door and leave.'
 		end
 		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave':gt 'natbelapt','hallway'
 	elseif natseethroughwearing = 1 and natstayroom = 0:
@@ -409,6 +411,7 @@ if $ARGS[0] = 'natroom':
 			'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethrough01.jpg"></center>'
 			'When you get back to Natasha''s room, you see she''s under her blankets reading a book.'
 			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'end'
 			gs 'stat'
 		else
 			'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethrough02.jpg"></center>'
@@ -421,7 +424,9 @@ if $ARGS[0] = 'natroom':
 				'"Jesus <<$pcs_nickname>> you nearly gave me a heart attack. For a second I thought my mom walked in."'
 				'You enjoy looking at her breasts through the thin fabric as she needs a moment to calm down.'
 				gs 'arousal', 'voyeur', 3
+				gs 'arousal', 'end'
 				gs 'stat'
+!!ToDo: Dead end
 			end
 		end
 	elseif natseethroughwearing = 1 and natstayroom = 1:
@@ -453,7 +458,7 @@ if $ARGS[0] = 'natroom':
 					delact 'Touch her belly'
 					nataskedbaby = 0
 				end
-				''
+				*nl
 				'She looks at you with a strange smile.'
 				'"Yes," she answers the question you didn''t voice, "your little brother has actually knocked me up. I hope you are happy with that because I can''t afford an abortion."'
 				'Her tone is a lot less accusing than you''d expected. In fact, she seems... happy.'
@@ -461,14 +466,11 @@ if $ARGS[0] = 'natroom':
 			end
 		end
 			
-		if lernHome ! 0:
-			act 'Study together': gs 'natbelapt', 'study_together'
-		end
+		if lernHome ! 0: act 'Study together': gs 'natbelapt', 'study_together'
 		
 		if NatDolg > 0 and NatDolgDay <= daystart:
-			if NatashaQW > 3 and lernHome ! 0:
-				act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
-			end
+			if NatashaQW > 3 and lernHome ! 0: act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
+
 			if NatashaQW > 5:
 				gs 'willpower', 'exhib'
 				if will_cost <= pcs_willpwr:
@@ -538,8 +540,11 @@ if $ARGS[0] = 'natroom':
 					'Natasha drops the towel and heads over to the closet to grab some clothes. "What to wear?" She sighs as she rummages through her closet. Which gives you a good view of her naked ass the entire time.'
 					'When she''s decided on what to wear she gets dressed seeming not to care about you seeing her naked.'
 				end
-				gs 'arousal', 'voyeur', 5, 'lesbian'
-				act 'Let her dress': gt 'natbelapt', 'natroom'
+				gs 'arousal', 'voyeur', 5
+				act 'Let her dress': 
+					gs 'arousal', 'end'
+					gt 'natbelapt', 'natroom'
+				end
 				act 'Pull her on the bed':
 					*clr & cla
 					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex01.jpg"></center>'
@@ -590,6 +595,7 @@ if $ARGS[0] = 'natroom':
 										$orgasm_txt = 'The feeling of her body writhing underneath yours as she orgasms sends you over the edge as well. You keep grinding for a few more seconds before you start bucking under the intensity of your own orgasm.'
 										$orgasm_or = 'yes'
 										gs 'arousal', 'trib', 5, 'lesbian'
+										gs 'arousal', 'end'
 
 										killvar '$orgasm_txt'
 										'Finally you fall down on top of Natasha, exhausted.'
@@ -628,8 +634,7 @@ if $ARGS[0] = 'natroom':
 											sexnutrition += 30 * scfeed
 											succubxp += 6
 										end
-										
-										gs 'orgasm', 'end'
+										gs 'arousal', 'end'
 										gs 'stat'
 										act 'Continue': gt 'natbelapt', 'natroom'
 									end
@@ -650,7 +655,8 @@ if $ARGS[0] = 'natroom':
 				*clr & cla
 				'<center><img src="images/characters/pavlovsk/school/girl/natasha/natdressing1.jpg"></center>'
 				'Natasha grabs some clean clothes out of her closet, drops the towel and quickly gets dressed.'
-				gs 'arousal', 'voyeur', 5, 'lesbian'
+				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Continue': gt 'natbelapt', 'natroom'
 			end
@@ -729,7 +735,7 @@ if $ARGS[0] = 'hwundress':
 				NatashaNakedHW += 1
 				'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework1.jpg"></center>'
 				'"Fine, you can keep your bra and panties on, but the rest comes off." You say, clearly letting your disappointment show in your voice.'
-				gs 'arousal', 'voyeur', 10, 'humiliation'
+				gs 'arousal', 'voyeur', 10
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Continue': gt 'natbelapt', 'undressedhw'
@@ -742,7 +748,7 @@ if $ARGS[0] = 'hwundress':
 					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework2.jpg"></center>'
 					'"Then your mom will see you naked, this is what happens when you borrow money from people and can''t pay them back. You pay it back in other ways. Now do as you''re told and take off your clothes, all of your clothes."'
 					'Natasha looks as if she wants to object but then hangs her head and begins to remove her clothing. Once she''s completely naked, she shyly walks over to her desk and sits down as she starts in on your homework. Though after a while you think she''s actually enjoying it.'
-					gs 'arousal', 'voyeur', 10, 'humiliation'
+					gs 'arousal', 'voyeur', 10
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue': gt 'natbelapt', 'undressedhw'
@@ -770,7 +776,7 @@ if $ARGS[0] = 'undressedhw':
 			'"It can''t be very comfortable for her, but I sure don''t mind the show." You think to yourself as you start to play with your pussy while you watch her work.'
 		end
 		'After a while, Natasha gets up saying: "It''s done <<$pcs_nickname>>, can I please get dressed now?"'
-		gs 'arousal', 'voyeur', 10, 'humiliation'
+		gs 'arousal', 'voyeur', 10
 		gs 'arousal', 'foreplay', 10, 'lesbian'
 		minut -= 10
 		gs 'arousal', 'end'
@@ -801,7 +807,7 @@ if $ARGS[0] = 'undressedhw':
 			'As she keeps working on your homework, you occasionally break Natasha''s concentration with more comments on her body. Each time you do so, she visibly loses her concentration.'
 		end
 		'After a while, Natasha gets up saying: "It''s done <<$pcs_nickname>>, can I please get dressed now?"'
-		gs 'arousal', 'voyeur', 10, 'humiliation'
+		gs 'arousal', 'voyeur', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gt 'natbelapt', 'afterhomework'
@@ -862,7 +868,7 @@ if $ARGS[0] = 'afterhomework':
 					end
 					'"There. Are you happy now? I''m wearing it."'
 					'"Good." You tell her. "Remember, you''re going to wear it until you go to bed. If I catch you wearing your own clothes again, I''ll have to get more creative."'
-					gs 'arousal', 'voyeur', 5, 'humiliation'
+					gs 'arousal', 'voyeur', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue': 
@@ -879,7 +885,7 @@ if $ARGS[0] = 'afterhomework':
 					end
 					'"There. Are you happy now? I''m wearing it again."'
 					'"It looks so good on you." You tell her. "Remember, you''re going to wear it until you go to bed. If I catch you wearing your own clothes again, I''ll have to get more creative."'
-					gs 'arousal', 'voyeur', 5, 'humiliation'
+					gs 'arousal', 'voyeur', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue': 
@@ -895,7 +901,7 @@ if $ARGS[0] = 'afterhomework':
 						'"Ok." She says a bit too eagerly as she makes a show of walking over to her underwear drawer. She bends over and sticks her naked ass out, wiggling it sexily before pulling the lingerie from her drawer and putting it on.'
 					end
 					'"It looks so good on you. I love making you wear it for me."'
-					gs 'arousal', 'voyeur', 5, 'humiliation'
+					gs 'arousal', 'voyeur', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue': 
@@ -1493,6 +1499,8 @@ if $ARGS[0] = 'livingroom':
 			'When it ends the both of you get up from the couch, visibly aroused.'
 			gs 'arousal', 'porn', 10
 			gs 'arousal', 'foreplay', 10
+			minut -= 10
+			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 		end
@@ -1564,6 +1572,7 @@ if $ARGS[0] = 'livingroom':
 						'You start feeling aroused. More from watching Natasha than the porno. By the time it ends your pussy is wet.'
 						'"That was pretty hot." She says at the end, her face completely red now. "Don''t worry, I won''t tell anyone.'
 						gs 'arousal', 'porn', 20
+						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 					else
@@ -1572,6 +1581,7 @@ if $ARGS[0] = 'livingroom':
 						'Natasha turns her attention back to the TV, and her eyes stay glued to the screen. You pay more attention to her reactions than what''s happening on the screen, feeling amused each time you see her squirm.'
 						'You start feeling aroused. More from watching Natasha than the porno. By the time it ends your pussy is wet.'
 						gs 'arousal', 'porn', 20
+						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 					end
@@ -1728,6 +1738,7 @@ if $ARGS[0] = 'natmother':
 						'"I-I''m not sure myself. I just am."'
 						'"It''s your age I guess, now would you kindly close the door so that I can get decent?"'
 					end
+					gs 'arousal', 'end'
 					gs 'stat'
 					
 					act 'Leave':gt 'natbelapt','hallway'
@@ -1760,6 +1771,7 @@ if $ARGS[0] = 'natmother':
 				pcs_horny += 10
 			end
 			gs 'arousal', 'voyeur', 2
+			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave':gt 'natbelapt','hallway'
 		end
@@ -1783,7 +1795,7 @@ if $ARGS[0] = 'natmother':
 					'"You can show those wonderful tits to me anytime." You praise her.'
 					gs 'arousal', 'foreplay', 3, 'exhibitionism', 'lesbian'
 					gs 'stat'
-					act 'keep going':
+					act 'Keep going':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natdressing03.jpg"></center>'
@@ -1826,7 +1838,7 @@ if $ARGS[0] = 'natmother':
 					'You strip down quickly, wanting to get started. "I can just leave my bra on, it''s not going to suck on my tits." You think as you relax on <<$NatashaMotherNickname>>''s bed.'
 					'You turn the big vibrator on and start rubbing it on your pussy. The stimulation is pretty intense, even at a low setting. Experimentally you turn up the speed causing you to let out a moan of pleasure as you feel your pussy getting soaking wet.'
 					'Just as you''re really getting into it, you notice that the door is open now and <<$NatashaMotherNickname>> is standing over you looking at your bare pussy with her toy rubbing it all over.'
-					gs 'arousal', 'mast', 10, 'unknown'
+					gs 'arousal', 'masturbate', 10, 'unknown'
 					gs 'stat'
 					act 'Say you''re sorry':
 						*clr & cla
@@ -1848,7 +1860,7 @@ if $ARGS[0] = 'natmother':
 							'"Time to show you what it does on max speed. You''ll want one of your own after this." She says with a grin, as she turns it up all the way'
 							*nl
 							$orgasm_txt = 'Within seconds you feel your orgasm crash down on you. You start convulsing hard, trying to close your legs to escape further stimulation but <<$NatashaMotherNickname>> holds your legs open and keeps rubbing your pussy with the Hitachi for a good minute or two. As she lets go, you immediately close your legs and roll onto your side, still shaking in the grip of your orgasm. It takes you a few minutes to get back to yourself. Once <<$NatashaMotherNickname>> sees that you''re coherent again she asks: "I can clearly see that you liked it, but was I right that you''d want one yourself now?" Still too out of breath for speech you just smile and nod.'
-							gs 'arousal', 'mast', 10, 'unknown'
+							gs 'arousal', 'masturbate', 10, 'unknown'
 							gs 'arousal', 'end'
 							gs 'stat'
 							killvar '$orgasm_txt'
@@ -1868,7 +1880,7 @@ if $ARGS[0] = 'natmother':
 					'You strip down quickly, wanting to get started. "I can just leave my bra on, it''s not going to suck on my tits." You think as you relax on <<$NatashaMotherNickname>>''s bed.'
 					'You turn the big vibrator on and start rubbing it on your pussy. The stimulation is pretty intense, even at a low setting. Experimentally you turn up the speed causing you to let out a moan of pleasure as you feel your pussy getting soaking wet.'
 					'With your other hand, you start playing with your pussy, putting a finger inside, pulling it open occasionally to apply the vibrations to your clit directly, causing you to moan even louder.'
-					gs 'arousal', 'mast', 10, 'unknown'
+					gs 'arousal', 'masturbate', 10, 'unknown'
 					gs 'stat'
 					act 'Contintue':
 						*clr & cla
@@ -1876,12 +1888,10 @@ if $ARGS[0] = 'natmother':
 						'The thought of doing this in someone else''s bedroom just makes it even more exciting. You feel your orgasm approaching rapidly as you start fingering yourself faster and faster. All the while rubbing your clit with as much pressure as you can stand.'
 						$orgasm_txt = 'Within seconds you feel your orgasm crash down on you. You start convulsing hard, closing your legs and trapping the <<$NatMomVibName>> between them to hold it in place. After a few more seconds your orgasm starts to subside, and the vibrations start feeling uncomfortable, so you turn it off.'
 						$orgasm_or = 'yes'
-						gs 'arousal', 'mast', 10, 'unknown'
+						gs 'arousal', 'masturbate', 10, 'unknown'
 						gs 'arousal', 'end'
 						killvar '$orgasm_txt'
 						'Deciding not to push your luck any further, you get dressed quickly and straighten out the bedsheets, trying to hide what you just did, but there''s no way to hide the wet spot on the sheets. You hope it won''t be noticeable by the time <<$NatashaMotherNickname>> goes to her bedroom.'
-						pcs_arousal = 0
-						 gs 'orgasm', 'end'
 						gs 'stat'
 						act 'Leave': gt 'natbelapt','hallway'
 					end

locations/natpimp.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'go_see_olu':
 				'She squeaks a reply. "You want him to fuck me in the ass with that thing?" she asks in disbelief.'
 				'"Yes I do, my ass could use a break and you owe me..."'
 				'After a moment she lowers her gaze and then nods her head. You pat her shoulder. "Good girl and it won''t be too bad, we have plenty of lube."'
-				gs 'arousal', 'voyeur', 5, 'dom'
+				gs 'arousal', 'voyeur', 5
 				gs 'stat'
 				act 'Let the fun begin':
 					*clr & cla
@@ -48,7 +48,7 @@ if $ARGS[0] = 'go_see_olu':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/olu2.jpg"></center>'
 					'You help Natasha get undressed and then get her down on all fours in front of Olu. While he lubes up his dick and her ass, you get undressed as well. No reason he should have all the fun. You knee down beside Natasha and grab her butt cheeks with your hands and spread them wide for Olu. Not needing any more invitation than that, he kneels down behind her and lines his cock up, she squeals loudly as he forces <<dick>>cm <<$dick_girth>> cock into her ass.'
 					'He starts fucking her slowly at first but you encourage him to go faster and deeper, pulling on her hips. You feel your pussy getting wet listening to Natasha cries and watching the <<dick>>cm <<$dick_girth>> cock rip up her ass. You start rubbing your clit while watching.'
-					gs 'arousal', 'voyeur', 5, 'dom'
+					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 					act 'Eat me':
 						*clr & cla
@@ -57,7 +57,7 @@ if $ARGS[0] = 'go_see_olu':
 						'You move to sit in front of Natasha and spread your legs, then you pull her face to your pussy and she wastes no time and starts licking it. You''re loving it all! You grinding your pussy into her face, her muffled cries while she eats you and Olu pounding her ass. You keep encouraging Olu to fuck her harder. The more she squeals the more turned on you get. Before long you are cumming, apparently seeing this is a turn on for Olu as well. As he shoots his load deep down her ass within a few moments of watching you cum.'
 						*nl
 						'With that you all get cleaned up and start getting dressed again. Once you are dressed you help Natasha back to her apartment, as she seems to be having a little trouble walking. You feel a little bad for her. "You did great, it gets better I promise. Next time it won''t hurt as much, believe me." Then you give her a passionate kiss on the lips. She gives you a smile, nods her head and goes back into her apartment walking quite bowlegged and probably painfully.'
-						gs 'arousal', 'voyeur', 5, 'dom'
+						gs 'arousal', 'voyeur', 5
 						gs 'arousal', 'cuni', 5, 'dom', 'lesbian'
 						minut - 5
 						gs 'arousal', 'end'