Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

glife.qproj

@@ -431,7 +431,6 @@
 	</Folder>
 	<Folder name="Family">
 		<Location name="family_schedule"/>
-		<Location name="seeparentsex"/>
 		<Location name="father"/>
 		<Location name="fathersex"/>
 		<Location name="dinfather"/>

locations/arousal.qsrc

@@ -168,8 +168,16 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 80
 	elseif $ARGS[0] = 'rimming':
 		orgasm_flag = 1
+		temp_anal = 1
 		count['rimming'] = 1
 		stim['act'] = 30
+		if traits['buttslut_lvl'] = 1:
+			stim['mag'] += 2
+			stim['act'] = 50
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 4
+			stim['act'] = 80
+		end
 	elseif $ARGS[0] = 'trib':
 		orgasm_flag = 1
 		count['trib'] = 1
@@ -184,6 +192,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		else
 			count['anal'] = 1
 		end
+		if traits['buttslut_lvl'] = 1:
+			stim['mag'] += 1
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 3
+		end
 		if pcs_ass < temp_dick:pcs_ass += 1
 		if pcs_ass*2 < temp_dick:pcs_ass += 1
 		!! length and girth abilities of anus are not also separated , but I suppose that they are related although it is not propable
@@ -215,11 +228,23 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		temp_anal = 1
 		count['anal_finger'] = 1
 		stim['act'] = 40
+		if traits['buttslut_lvl'] = 1:
+			stim['mag'] += 1
+			stim['act'] = 60
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 1
+			stim['act'] = 80
+		end
 	elseif $ARGS[0] = 'anal_fist':
 		orgasm_flag = 1
 		temp_anal = 1
 		count['anal_fist'] = 1
 		stim['act'] = 30
+		if traits['buttslut_lvl'] = 1:
+			stim['act'] = 50
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['act'] = 70
+		end
 		if pcs_ass + anal_slip < 30:
 			pcs_ass = 30
 			gs 'pain', 4-agape, 'asshole', 'stretch'
@@ -238,6 +263,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
+		if traits['buttslut_lvl'] = 1:
+			stim['act'] += 10
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 1
+		end
 		if agrdif < 0: agrdif = 0
 		if altdif < 0: altdif = 0
 		agape = iif((agrdif + altdif) > 10*agape,(agrdif + altdif)/10,agape)
@@ -256,6 +286,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
+		if traits['buttslut_lvl'] = 1:
+			stim['act'] += 10
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 1
+		end
 		if agrdif < 0: agrdif = 0
 		if altdif < 0: altdif = 0
 		agape = iif((agrdif + altdif) > 10*agape,(agrdif + altdif)/10,agape)
@@ -267,6 +302,13 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['anal_vibe'] = 1
 		stim['mag'] += 1
 		stim['act'] = 60
+		if traits['buttslut_lvl'] = 1:
+			stim['mag'] += 1
+			stim['act'] = 70
+		elseif traits['buttslut_lvl'] >= 2:
+			stim['mag'] += 2
+			stim['act'] = 90
+		end
 	elseif $ARGS[0] = 'vaginal':
 		orgasm_flag = 1
 
@@ -469,6 +511,14 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 10
 	end
 
+	!! anal acts
+	if (mid($ARGS[0],1,4) = 'anal' and mid($ARGS[0],len($ARGS[0])-3,len($ARGS[0])) ! 'give') or $ARGS[0] = 'rimming':
+		if traits['buttslut_lvl'] = 3:
+			stim['act'] += 20
+		end
+	end
+
+
 	if stim['mag'] > 9: stim['mag'] = 9
 
 	if ARGS[1] > 0: minut += ARGS[1]

locations/bedrPar2.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if hour = 21 and parsexrand = 5 and parentsexday ! daystart:gt 'seeparentsex'
+	if hour = 21 and parsexrand = 5 and parentsexday ! daystart:gt 'bedrPar2', 'peek'
 end
 
 ! book
@@ -125,14 +125,15 @@ if $ARGS[0] = 'peek':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad1.jpg"></center>'
-	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed. You hear your mother say "Stop the kids are here." as Vlad starts running his hands all over her body. He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
+	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed. You hear your mother say "Stop the kids are here." as Vlad starts running his hands all over her body.'
+	'He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
 	act 'Leave':gt 'korrPar'
 
 	act 'Keep peeking':
 		cla & *clr
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad2.jpg"></center>'
-		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked, he pushes her down on the bed so she is sitting on it in front of him, her head about crotch height to him, apparantly knowing what he wants. She opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck you are the best cock sucker ever, Natasha."'
+		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked, he pushes her down on the bed so she is sitting on it in front of him, her head about crotch height to him, apparently knowing what he wants. She opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck you are the best cock sucker ever, Natasha."'
 		gs 'arousal', 'voyeur_sex', 3
 		gs 'stat'
 
@@ -142,7 +143,8 @@ if $ARGS[0] = 'peek':
 			cla & *clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad3.jpg"></center>'
-			'After several minutes of watching your <<$npc_nickname[''A29'']>> suck Vlad''s cock he says "Come on, I want to fuck you." With that he starts to strip and she helps him while contnuing to suck his dick. Once he is naked, she finally stops and he lies down on the bed. She straddles him and quickly starts riding his dick reverse cowgirl style. Both of them start moaning as they fuck. "Oh god Vlad, your dick feels so good in my pussy! It''s so big."'
+			'After several minutes of watching your <<$npc_nickname[''A29'']>> suck Vlad''s cock he says "Come on, I want to fuck you." With that he starts to strip and she helps him while continuing to suck his dick. Once he is naked, she finally stops and he lies down on the bed. She straddles him and quickly starts riding his dick reverse cowgirl style.'
+			'Both of them start moaning as they fuck. "Oh god Vlad, your dick feels so good in my pussy! It''s so big."'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 
@@ -161,7 +163,8 @@ if $ARGS[0] = 'peek':
 					cla & *clr
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad5.jpg"></center>'
-					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>>''s ass and lets out a loud moan as he twitches a bit. After a few moments of this pass, he pulls out of her and rolls off the bed. She lays on her back and pulls her cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says "You are such a nasty bitch Natasha." She smiles at him and replies "That''s why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
+					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>>''s ass and lets out a loud moan as he twitches a bit. After a few moments of this pass, he pulls out of her and rolls off the bed. She lays on her back and pulls her cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says "You are such a nasty bitch Natasha."'
+					'She smiles at him and replies "That''s why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
 					gs 'arousal', 'voyeur_sex', 3
 					gs 'stat'
 					act 'Leave':gt 'korrPar'

locations/gadbana.qsrc

@@ -219,10 +219,15 @@ if mira_guest = 0:
 
 	dynamic $brit
 
+	!!breast pump is now in the menu, not on the screen
 	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_bp', 'bp_milking'
 		end
+	elseif breastpump > 0 and bp_unbox <= 0:
+		'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
+	elseif breastpump <= 0:
+		gs 'lact_bp', 'massage'
 	end
 
 	dynamic $toymanage

locations/gdksex.qsrc

@@ -1409,7 +1409,7 @@ if $ARGS[0] = 'creampie_surprise1':
 			act 'It felt so good':
 				cla & *nl
 				'"That felt so good," you smile tiredly. <<$npc_firstname[$boy]>> blinks at you, a look of surprise on his face, as if he expected you to be mad about it.'
-				
+				gs'gdksex','disco_sex_end'
 			end
 			
 			act 'Premature ejaculation is hot':

locations/korrPar.qsrc

@@ -42,7 +42,7 @@ if indorf = 1:'With your parents away visiting your grandparents, the apartment
 
 if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
 
-if hour ! 18 and blockBedrPar = 1:blockBedrPar = 0
+if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
 
 !!Her room isn''t on the cleaning list yet
@@ -84,8 +84,8 @@ if blockBedrPar = 0:
 		act 'Go to your room':gt 'bedrPar'
 	end
 end
-if momloc = 1:
-	if (hour = 5 and minut > 30) or (hour = 6 and minut < 10):
+if momloc = 3 and sdadloc = 2:
+	if hour < 6:
 		'The door is closed. You know your <<$npc_nickname[''A29'']>> is likely waking up your stepfather and getting dressed.'
 		act 'Knock on your parents'' door':
 			if hour = 6 and minut < 10 and rand(0,2) ! 0:

locations/kuhrPar.qsrc

@@ -74,7 +74,7 @@ if sdadloc = 7: '<a href="exec:gt''father''">Your stepfather</a> is here setting
 
 if week = 6 and dostupindorf = 1 and grandaQW['block'] = 0 and hour > 9 and hour < 12:'Your parents are getting ready to go to <a href="exec:gt ''gadhouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
 
-if hour = 7 and breakfast_day ! daystart and indorf = 0: 
+if (hour = 6 and minut > 45) or (hour = 7 and minut < 15) and breakfast_day ! daystart and indorf = 0: 
 	if PCloswimwear ! 1 and $clothingworntype ! 'nude':
 		act 'Eat breakfast with your family (0:20)': 
 			*clr & cla
@@ -93,7 +93,7 @@ if hour = 7 and breakfast_day ! daystart and indorf = 0:
 					'The rest of breakfast is taken up talking about how Kolka is doing in school. He seems to be doing better than you and is showered with praise from your mother and stepfather. The food is good, even if the conversation wasn''t the best. You quickly finish your meal.'
 				end
 			else
-				if kanikuli <> 0:
+				if kanikuli ! 0:
 					'You smile at him. "I''m enjoying some time away from school hanging out with my friends. It''s nice to just relax for a change."'
 					'Your mother speaks up. "It wouldn''t hurt to study your school books and get ahead of your courses to get better grades." You roll your eyes, but before you can respond, your stepfather lays his hand on your mother''s. "Let her enjoy herself. This is her last year before she goes to university after all." he says with a little emphasis. You just sigh and nod as you both know that is what your mother wants.'
 				else 

locations/lezbsex.qsrc

@@ -61,11 +61,6 @@ if $ARGS[0] = 'ukuni':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/ukuni<<picrand>>.jpg"></center>'
 	'You begin by kissing her breasts, moving gradually down her body, lower and lower until you are facing her pussy. You start by gently caressing her swollen lips with up and down tongue lapping, up and down the swollen mound and moist slit, and getting ready to focus the tip of your tongue directly on her clitoris.  You part her outer lips with your fingers, spreading her pouty inner lips giving you full access to her puffy pink clitoris.'
 
@@ -82,11 +77,6 @@ if $ARGS[0] = 'kuni':
 	cla
 	*clr
 	
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/kuni<<picrand>>.jpg"></center>'
 	'She begins by dragging her tongue up your thighs to your crotch and plants light kisses from the top of your slit down to the opening of your vagina.  Her tongue pushes into your slickened hole a few times, then slides back up your cunny to caress your tingling clitoris again.'
 
@@ -101,11 +91,6 @@ if $ARGS[0] = 'anuli':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/anuli<<picrand>>.jpg"></center>'
 	'She kisses your buttocks in ever decreasing circles, eventually getting to the center where your puckered anus is waiting.  Reaching her goal, she licks all around the tender star to get it plenty moist, then firmly pushes her tongue forward, penetrating your ass with just the tip.  She retracts it, again licking all around your anus, and repeats her tongue invasion into that most private entrance.'
 
@@ -120,11 +105,6 @@ if $ARGS[0] = 'uanuli':
 	cla
 	*clr
 	
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/uanuli<<picrand>>.jpg"></center>'
 	'You kiss her buttocks in ever decreasing circles, eventually getting to the center where her puckered anus is waiting.  Reaching your goal, you lick all around the tender star to get it plenty moist, then firmly push your tongue forward, penetrating her ass with just the tip.  You retract it, again licking all around her anus, and repeating your tongue invasion into that most private entrance.'
 
@@ -139,11 +119,6 @@ if $ARGS[0] = 'svag':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/svag<<picrand>>.jpg"></center>'
 	'You put on the strap-on, adjusting it to your hips and centering it, and then insert it slowly into her pussy.  She moans and grinds back at you while you fuck her with it.'
 
@@ -158,11 +133,6 @@ if $ARGS[0] = 'sanal':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/sanal<<picrand>>.jpg"></center>'
 	'You suck on the shaft to get it well-lubed, then put on the strap-on and gently insert it into <<$lezbsexname>>''s anus, pressing into her slowly at first, and as she adjusts to the backdoor invasion you push in and out, faster and faster.'
 
@@ -177,11 +147,6 @@ if $ARGS[0] = 'usvag':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/usvag<<picrand>>.jpg"></center>'
 	'You watch as she puts on the strap-on, adjusting it to her hips and centering the fake cock, and then she moves to you and inserts it slowly into your pussy.  You moan and grind back at her while she fucks you with it.'
 
@@ -196,11 +161,6 @@ if $ARGS[0] = 'usanal':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/usanal<<picrand>>.jpg"></center>'
 	'She spits on the crack of your ass, collecting some saliva to moisten the tip of the strap-on and slowly presses it against your pucker, firmly pushing it into you as you adjust to the invasion.  You feel the fullness of it as it moves in and out of your ass with every thrust, pumping faster and deeper.'
 
@@ -215,11 +175,6 @@ if $ARGS[0] = 'dvag':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/dvag<<picrand>>.jpg"></center>'
 	'You take a dildo and poke her wet pussy with it.  She pulls your face to hers and kisses you while you are driving one shaft into her cunny with one hand and caressing her breasts with a second dildo.'
 
@@ -234,11 +189,6 @@ if $ARGS[0] = 'danal':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/danal<<picrand>>.jpg"></center>'
 	'You take a dildo, making sure she''s watching you as you slowly lick it, trying to cover it with the maximum amount of your thick saliva, and gently insert it into <<$lezbsexname>>''s anus.  At first, you ease it in slowly, getting her used to the invasion, then push it deeper, stroking it into her faster and faster.'
 
@@ -255,11 +205,6 @@ if $ARGS[0] = 'udvag':
 	minut += 5
 	pcs_horny += 10
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udvag<<picrand>>.jpg"></center>'
 	'<<$lezbsexname>> inserts the dildo into your wet pussy, moving it in and out while constantly twisting and turning it in her hands to stimulate your love hole as much as possible with it.'
 
@@ -272,11 +217,6 @@ if $ARGS[0] = 'udanal':
 	cla
 	*clr
 
-	if pcs_horny >= 80:
-		pcs_horny = 0
-		orgasm += 1
-	end
-
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udanal<<picrand>>.jpg"></center>'
 	'<<$lezbsexname>> spits in the crack of your ass, watching it slowly glide down to your pucker as she collects some of the saliva and rubs it all around the tip of the dildo before pressing it against your anus. You feel it stretching your puckered hole at it pushes farther and farther inside, bringing you that unique back-door pleasure.'
 

locations/piercing_management.qsrc

@@ -1,6 +1,7 @@
 # piercing_management
 
 If $ARGS[0] = 'main':
+	if ward_img_hgt = 0:ward_img_hgt = 150
 	*nl
 	'<center><font color="maroon">Piercing Management</font></center><center><table border=0 cellspacing=<<ward_img_hgt/25>> cellpadding=5>'
 	*p '<TH>Tongue piercing</TH><TH>Lip piercing</TH><TH>Ear piercings</TH><TH>Nose piercing</TH>'
@@ -39,7 +40,7 @@ If $ARGS[0] = 'main':
 	'</center></TD><TR><TD><center>'
 	if pirsA = 0:
 		'Not pierced'
-	elseif pirsA <= 10000:
+	elseif pirsA < 10000:
 		'<a href="exec:pirsA = 10000 & pierWearCount -= 1 & gt ''piercing_management'', ''main''">Remove</a>'
 	else
 		'Remove'
@@ -47,7 +48,7 @@ If $ARGS[0] = 'main':
 	'</center></TD><TD><center>'
 	if pirsB = 0:
 		'Not pierced'
-	elseif pirsB <= 10000:
+	elseif pirsB < 10000:
 		'<a href="exec:pirsB = 10000 & pierWearCount -= 1 & gt ''piercing_management'', ''main''">Remove</a>'
 	else
 		'Remove'
@@ -55,7 +56,7 @@ If $ARGS[0] = 'main':
 	'</center></TD><TD><center>'
 	if pirsC = 0:
 		'Not pierced'
-	elseif pirsC <= 10000:
+	elseif pirsC < 10000:
 		'<a href="exec:pirsC = 10000 & pierWearCount -= 1 & gt ''piercing_management'', ''main''">Remove</a>'
 	else
 		'Remove'
@@ -63,7 +64,7 @@ If $ARGS[0] = 'main':
 	'</center></TD><TD><center>'
 	if pirsD = 0:
 		'Not pierced'
-	elseif pirsD <= 10000:
+	elseif pirsD < 10000:
 		'<a href="exec:pirsD = 10000 & pierWearCount -= 1 & gt ''piercing_management'', ''main''">Remove</a>'
 	else
 		'Remove'
@@ -114,7 +115,7 @@ If $ARGS[0] = 'main':
 	'</center></TD><TD><center>'
 	if pirsF = 0:
 		'Not pierced'
-	elseif pirsF <= 10000:
+	elseif pirsF < 10000:
 		'<a href="exec:pirsF = 10000 & pierWearCount -= 1 & gt ''piercing_management'', ''main''">Remove</a>'
 	else
 		'Remove'
@@ -122,7 +123,7 @@ If $ARGS[0] = 'main':
 	'</center></TD><TD><center>'
 	if pirsN = 0:
 		'Not pierced'
-	elseif pirsN <= 10000:
+	elseif pirsN < 10000:
 		'<a href="exec:pirsN = 10000 & pierWearCount -= 1 & gt ''piercing_management'', ''main''">Remove</a>'
 	else
 		'Remove'
@@ -130,7 +131,7 @@ If $ARGS[0] = 'main':
 	'</center></TD><TD><center>'
 	if pirsG = 0:
 		'Not pierced'
-	elseif pirsG <= 10000:
+	elseif pirsG < 10000:
 		'<a href="exec:pirsG = 10000 & pierWearCount -= 1 & gt ''piercing_management'', ''main''">Remove</a>'
 	else
 		'Remove'

locations/seeparentsex.qsrc

@@ -1,168 +0,0 @@
-# seeparentsex
-parentsexday = daystart
-gs 'stat'
-$parBedroomTitle = '<center><h1><font color="maroon">Master bedroom</font></h1></center>'
-*pl $parBedroomTitle
-'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/see.jpg"></center>'
-*nl
-'Hearing a sound, you quietly move to the door to your parents'' room. You see your mother on her hands and knees, getting fucked by your stepfather.'
-
-act 'Leave':gt 'korrPar'
-
-$parBedroomCloseDoor = {
-	cla
-	npc_rel['A29'] -= 5
-	gs 'stat'
-	*nl
-	'Your <<$npc_nickname[''A29'']>> realizes who''s peeking, and since the two of you are not getting along right now, she surprises your stepfather by saying "Wait, I think the door didn''t get closed all the way, hold that thought. We don''t want us to be seen by unwelcome eyes, now do we?"'
-	'She pulls away from him and you see his hard cock spring up and out, just before she hurries over to the door and closes it.'
-	
-	gs 'arousal', 'voyeur_sex', 5, 'incest'
-	gs 'stat'
-	
-	act 'Leave':gt 'korrPar'
-}
-
-if momslut >= 2 and npc_QW['A29'] >= 2:
-	act '<<$npc_nickname[''A29'']>> notices you':
-		if npc_rel['A29'] >= 40:
-			cls
-			gs 'stat'
-			*pl $parBedroomTitle
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/see.jpg"></center>'
-			*nl
-			'She''s on her knees on the bed, facing the opposite wall. She turns her head back to look at your stepfather, and notices you peeking. You don''t think fast enough to move away, and your eyes meet.  Rather than being shocked or angry, she smiles, and winks at you, which gives you a big rush of heat going straight to your pussy.'
-			'She''s careful not to look too much towards you, first looking at him, then appearing to look down at the floor, sneaking glances at you. "Ohhh, give it to me! Yesss, pump it harder into me" she moans, as she grabs her breast and tugs on her nipple.'
-			'Her lust seems to also be enflamed by having you as her secret audience, and she pushes back against him, meeting his thrusts forcefully.'
-
-			gs 'arousal', 'voyeur_sex', 5, 'incest'
-			gs 'stat'
-	
-			if pcs_horny >= 80:
-				act 'Show <<$npc_nickname[''A29'']>> some too':
-					if $pantyworntype = 'none':
-						cls
-						gs 'stat'
-						*pl $parBedroomTitle
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/sisboyqw_26.jpg"></center>'
-						*nl
-						'Too horny to care, you quietly open the door a bit more, and you part your legs, and with both hands you pull your pussy lips apart, letting her see how swollen and wet you are.'
-						'You slide two fingers down the slickened slit, curling them to ease them inside your pussy, and drag them back up again, wetting your lips and clit even more with your warm lube.'
-						'Your <<$npc_nickname[''A29'']>> moans, and says "Yes, do that again, more!"  You''re not sure whether she meant that for you or him or both, but he pulled back and slammed fully into her even harder, and  you dipped your fingers back inside and spread some more juices all around your pink flower.'
-					
-						gs 'arousal', 'flash', 15
-						gs 'arousal', 'masturbate', 15, 'incest'
-						minut -= 15
-						gs 'stat'
-					else
-						cls
-						gs 'stat'
-						*pl $parBedroomTitle
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/sisboyqw_19.jpg"></center>'
-						*nl
-						'Too horny to care, you quietly open the door a bit more, and you part your legs, and pull the crotch of your panties to the side and start stroking your clit and swollen pussy lips as you look from her eyes, to her ass, back to her eyes again.'
-						'Your <<$npc_nickname[''A29'']>> moans, and says "Yes, do that again, more!"  You''re not sure whether she meant that for you or him or both, but he pulled back and slammed fully into her even harder, as you strum faster, rubbing back and forth on your clit and swollen hood surrounding it.'
-					
-						gs 'arousal', 'flash', 15
-						gs 'arousal', 'masturbate', 15, 'incest'
-						minut -= 15
-						gs 'stat'
-					end
-
-					*nl
-					'Your <<$npc_nickname[''A29'']>>, knowing you''re there watching, moves her body and moans like she''s being filmed for the next ''real people sex scene'' that they say is on the porno tv channel.'
-					'Your stepfather is really enjoying her extra enthusiasm, and slaps her ass as he continues pumping and driving his cock deep into your <<$npc_nickname[''A29'']>>''s shiny wet pussy hole.'
-					'"Ohhhh, yes! Yes! YESSS! Give me that meat! Fill me up! I want it! Slap my ass again, honey! I''m almost there!"'
-					'The whole scene is making you even more wet and hungry for your climax, and you beat your fingers back and forth, faster and harder, getting ready to come, too.'
-					'He swats her ass one more time, plunging into her two more times, then he grunts as his hips buck and he erupts deep into her pussy.'					
-					'She looks back at you one more time, and looks at your hand, then your face.  Your pussy convulses as you strum hard and fast against your clit, feeling your climax take over as you can barely stand.'
-					'Your <<$npc_nickname[''A29'']>> then arches her back, opening her mouth wide in a silent scream, panting as she hits her orgasm with you.'
-					$orgasm_or = 'yes'
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Leave':gt 'korrPar'
-				end
-			elseif pcs_horny >= 50:
-				act 'Watch and play':
-					cls
-					gs 'stat'
-					*pl $parBedroomTitle
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/see.jpg"></center>'
-					*nl
-					'Peeking through the slightly opened door, you slide your hand down between your legs, masturbating furiously as you watch and listen to them fucking.'
-					'Your <<$npc_nickname[''A29'']>>, knowing you''re there watching, moves her body and moans like she''s being filmed for the next ''real people sex scene'' that they say is on the porno tv channel.'
-					'Your stepfather is really enjoying her extra enthusiasm, and slaps her ass as he continues pumping and driving his cock deep into your <<$npc_nickname[''A29'']>>''s shiny wet pussy hole.'
-					'"Ohhhh, yes! Yes! YESSS! Give me that meat! Fill me up! I want it! Slap my ass again, honey! I''m almost there!"'
-					'The whole scene is making you even more wet and hungry for your climax, and you beat your fingers back and forth, faster and harder, getting ready to come, too.'
-					'He swats her ass one more time, plunging into her two more times, then he grunts as his hips buck and he erupts deep into her pussy.  Your <<$npc_nickname[''A29'']>> arches her back, opening her mouth wide in a silent scream, panting as she hits her orgasm with him.'
-					'Your pussy convulses as you strum hard and fast against your clit, feeling your climax take over as you can barely stand.'
-					$orgasm_or = 'yes'
-					gs 'arousal', 'masturbate', 10
-					gs 'arousal', 'end'
-					gs 'stat'
-					
-					act 'Leave':gt 'korrPar'
-				end
-			else
-				act 'Stay and watch':
-					cls
-					gs 'stat'
-					*pl $parBedroomTitle
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/see.jpg"></center>'
-					*nl
-					'You stay for a while and watch. You can''t help but get a bit more aroused, seeing how much your mother is enjoying the rough pounding she''s receiving from your stepfather.'
-					'But, you''re not feeling horny enough right now to do anything else, and you don''t stay and watch them finish.'
-					'Your <<$npc_nickname[''A29'']>> looks back at the door as you close it and prepare to leave, grinning.'
-					gs 'arousal', 'voyeur_sex', 10, 'incest'
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Leave':gt 'korrPar'
-				end
-			end
-		else
-			dynamic $parBedroomCloseDoor
-		end
-		act 'Leave':gt 'korrPar'
-	end
-
-elseif momslut < 2 and npc_QW['A29'] >= 2:
-	act 'She knows you''re watching':
-		if npc_rel['A29'] >= 40:
-			cls
-			momslut += 1
-			gs 'stat'
-			*pl $parBedroomTitle
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/see.jpg"></center>'
-			*nl
-			'She''s on her knees on the bed, facing the opposite wall. She turns her head back to look at your stepfather, and notices someone is peeking.'
-			'She looks at your stepfather, whose eyes are closed as he enjoys the moment. She looks back at the doorway, biting her lower lip as if trying to decide whether to continue or find a reason to stop.'
-			'Her lust takes over, and she moans "Keep going, keep doing just what you''re doing!" as she looks back towards the wall.'
-			'Not knowing whether she meant that for you, or him, or both, you stay for a while and watch. You can''t help but get more aroused, seeing how much your mother is enjoying the rough pounding she''s receiving from your stepfather while knowing one of her children is seeing her like this.'
-			gs 'arousal', 'voyeur_sex', 15, 'incest'
-			gs 'arousal', 'end'
-			gs 'stat'
-		
-			act 'Leave':gt 'korrPar'
-		else
-			dynamic $parBedroomCloseDoor
-		end
-	end
-	act 'Leave':gt 'korrPar'
-	
-elseif pcs_horny >= 50:	
-	act 'Stay and watch':
-		cla
-		gs 'stat'
-		*nl
-		'Making sure they don''t notice you, you stay for a while and watch. You can''t help but get a bit more aroused, seeing how much your mother is enjoying the rough pounding she''s receiving from your stepfather.'
-		
-		gs 'arousal', 'voyeur_sex', 15, 'incest'
-		gs 'arousal', 'end'
-		gs 'stat'
-					
-		act 'Leave':gt 'korrPar'
-	end	
-end
-
---- seeparentsex ---------------------------------
-

locations/stat.qsrc

@@ -26,6 +26,12 @@ if cheatHealth = 1: dynamic $cheatmenu['std_cure']
 
 if (analplay >= 2 and pcs_ass <= 10) or (analplay >= 4 and pcs_ass <= 15) or (analplay >= 8 and pcs_ass <= 20): pcs_ass += 1 & analplay = 0
 
+if analorgasm >= 10 and traits['buttslut_lvl'] = 0: traits['buttslut_lvl'] = 1
+if (analorgasm - (orgasm - analorgasm) >= 15) and traits['buttslut_lvl'] = 1: traits['buttslut_lvl'] = 2
+if (analorgasm - (orgasm - analorgasm) < 15) and traits['buttslut_lvl'] = 2: traits['buttslut_lvl'] = 1
+if ((orgasm - analorgasm)*2 <= analorgasm) and traits['buttslut_lvl'] = 2: traits['buttslut_lvl'] = 3
+if ((orgasm - analorgasm)*2 > analorgasm) and traits['buttslut_lvl'] = 3: traits['buttslut_lvl'] = 2
+
 !!The following seems to be part of the combat system.
 musle[1] = musle
 flex[1] = pcs_agil

locations/stat_display.qsrc

@@ -1745,8 +1745,8 @@ if amphHigh > 0: $stat_msg += '<BR><b><font color="red">You feel a little wired.
 
 !!--------------- Storyline = 1 Events (Start) ------------------------
 
-if StoryLine = 1 and sisboyday + 1 = daystart and hour < 19 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or (npc_QW['A33'] >= 9 and sisboytrioQW ! 1)):$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister not to go into your room at 18:00.'
-if StoryLine = 1 and sisboyday + 1 = daystart and hour < 19 and sisboytrioQW = 1:$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister to meet her in your room at 18:00.'
+if StoryLine = 1 and sisboyday + 1 = daystart and hour < 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or (npc_QW['A33'] >= 9 and sisboytrioQW ! 1)):$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister not to go into your room at 16:00.'
+if StoryLine = 1 and sisboyday + 1 = daystart and hour < 18 and sisboytrioQW = 1:$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister to meet her in your room at 16:00.'
 
 if StoryLine = 1 and day = nyp_day and month = 12 and SchoolAtestat = 0 and hour >= 5 and hour <= 14 and StoryLine = 1:
 	$stat_msg += '<BR>At 14:00, your school''s New Year''s party will start.'

locations/traits.qsrc

@@ -148,6 +148,31 @@ if $ARGS[0] = 'menu':
 		'You''ve built up a tolerance, making it harder for you to feel the effects of alcohol.'
 	end
 
+	*nl
+	if analorgasm >= 10 and traits['buttslut_lvl'] = 0: traits['buttslut_lvl'] = 1
+	if (analorgasm - (orgasm - analorgasm) >= 15) and traits['buttslut_lvl'] = 1: traits['buttslut_lvl'] = 2
+	if (analorgasm - (orgasm - analorgasm) < 15) and traits['buttslut_lvl'] = 2: traits['buttslut_lvl'] = 1
+	if ((orgasm - analorgasm)*2 <= analorgasm) and traits['buttslut_lvl'] = 2: traits['buttslut_lvl'] = 3
+	if ((orgasm - analorgasm)*2 > analorgasm) and traits['buttslut_lvl'] = 3: traits['buttslut_lvl'] = 2
+
+	'<center><b>Buttslut</b></center>'
+	if traits['buttslut_lvl'] = 0:
+		'You need to have more anal orgasms to gain this trait.'
+	elseif traits['buttslut_lvl'] = 1:
+		'You have this trait at level 1. To reach lvl 2 you need to have at least 15 more anal orgasms than vaginal orgasms.'
+		'You''re starting to enjoy anal sex ' + iif(pcs_vag > 0, 'almost as much as regular sex.', 'more than before.')
+	elseif traits['buttslut_lvl'] = 2:
+		'You have this trait at level 2. To reach lvl 3 you need to have at least twice more anal orgasms than vaginal orgasms.'
+		'You''re starting to enjoy anal sex ' + iif(pcs_vag > 0, 'as much as regular sex.', 'more than before.')
+	elseif traits['buttslut_lvl'] = 3:
+		'You have this trait at level 3.'
+		if pcs_vag > 0:
+			'You now prefer anal sex over regular sex.'
+		else
+			'You really enjoy anal.'
+		end
+	end
+
 	act 'Exit the menu': gt $loc, $loc_arg
 	'</td></tr></table></center>'
 end