Browse Source

[fixed] Updated my previous willpower seeding with the new options and adjusted/corrected some checks + added some missing options to the descriptions at the beginning of willpower

Sicaa 5 years ago
parent
commit
5e2d8b3401

+ 14 - 16
locations/BDsex.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'start':
 			'<<$boydesc>> grabs the back of your head and pulls you to face his penis.'
 
 			act 'Take by mouth':gt 'BDsex', 'minet'
-			gs 'willpower', 'sex', 'resist'
+			gs 'willpower', 'bj', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
 				act 'Stand on all fours (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
@@ -94,17 +94,17 @@ if $ARGS[0] = 'start':
 
 			act 'Do anal':gt 'BDsex', 'anal2'
 
-			gs 'willpower', 'sex', 'resist'
+			gs 'willpower', 'anal', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
-				act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
+				act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'anal', 'resist', 'easy' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
+				act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'anal', 'resist', 'easy' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
 			else
 				act '"I do not want to!" Lie on your back and spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				act '"I''ll do it doggy style, but not in the ass!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			gs 'willpower', 'bj', 'resist'
+			gs 'willpower', 'bj', 'force'
 			if will_cost <= pcs_willpwr:
-				act 'Take him into your mouth (<<will_cost>> Willpower)': gs 'willpower', 'bj', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'minet'
+				act 'Take him into your mouth (<<will_cost>> Willpower)': gs 'willpower', 'bj', 'force' & gs 'willpower', 'pay', 'force' & gt 'BDsex', 'minet'
 			else
 				act 'Take him into your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
@@ -120,7 +120,6 @@ if $ARGS[0] = 'kuni':
 	gs 'stat'
 	if pcs_horny >= 90:
 		pcs_mood += 15
-		!pcs_willpwr += 15
 		$orgasm_txt = 'His skill is enough to spark an orgasm deep within you.'
 		$orgasm_or = 'custom'
 		gs 'stat'
@@ -336,17 +335,17 @@ if $ARGS[0] = 'hj':
 
 				act 'Anal':gt 'BDsex', 'anal2'
 
-				gs 'willpower', 'sex', 'resist'
+				gs 'willpower', 'anal', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
-					act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
-					act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
+					act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'anal', 'resist', 'easy' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
+					act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'anal', 'resist', 'easy' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
 				else
 					act '"I do not want to!" Lie on your back and spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					act '"I''ll do it doggy style, but not in the ass!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				gs 'willpower', 'bj', 'resist'
+				gs 'willpower', 'bj', 'force'
 				if will_cost <= pcs_willpwr:
-					act 'Take him into your mouth (<<will_cost>> Willpower)': gs 'willpower', 'bj', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'minet'
+					act 'Take him into your mouth (<<will_cost>> Willpower)': gs 'willpower', 'bj', 'force' & gs 'willpower', 'pay', 'force' & gt 'BDsex', 'minet'
 				else
 					act 'Take him into your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
@@ -426,10 +425,10 @@ if $ARGS[0] = 'minet':
 
 				act 'Anal':gt 'BDsex', 'anal2'
 
-				gs 'willpower', 'sex', 'resist'
+				gs 'willpower', 'anal', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
-					act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
-					act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
+					act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
+					act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
 				else
 					act '"I do not want to!" Lie on your back and spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					act '"I''ll do it doggy style, but not in the ass!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -592,7 +591,6 @@ if $ARGS[0] = 'org':
 	if mesec > 0:
 		!!periods, orgasm is not possible
 		pcs_mood -= 10
-		!pcs_willpwr -= 10
 		'It is your time of the month and, as his member rams into you, vaginal blood flows slowly around his girth. Painful sensations and pleasure mix. You moan while his strong <<dick>> centimeter dick fucks your pussy.'
 		$orgasm_or = 'no'
 		gs 'stat'

File diff suppressed because it is too large
+ 161 - 176
locations/FedorEv2.qsrc


+ 53 - 64
locations/FedorEv3.qsrc

@@ -38,7 +38,6 @@ if $ARGS[0] = 'Food':
 	minut += 5		
 	pcs_health += 5	
 	pcs_mood += 15
-	!pcs_willpwr += 15
 	pcs_energy += 30
 	pcs_hydra += 50
 	cumspclnt = 2
@@ -62,7 +61,6 @@ if $ARGS[0] = 'Food 2':
 	minut += 5
 	pcs_health += 10	
 	pcs_mood += 20
-	!pcs_willpwr += 20
 	fat += 2
 	pcs_energy += 60
 	pcs_hydra += 80
@@ -98,7 +96,6 @@ if $ARGS[0] = 'Front':
 	act 'Take a seat':
 		*clr & cla
 		pcs_mood += 20
-		!pcs_willpwr += 20
 		minut += 70
 		gs 'boyStat', 'A5'
 		'You and Fedor take a seat and he hands you your popcorn and snacks then gives you a kiss on the cheek as the lights dim and the movie begins.'
@@ -188,7 +185,6 @@ if $ARGS[0] = 'Middle':
 	act 'Take a seat':
 		*clr & cla
 		pcs_mood += 20
-		!pcs_willpwr += 20
 		minut += 70
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/staring.jpg"></center>'
@@ -245,7 +241,6 @@ if $ARGS[0] = 'Back':
 	act 'Take a seat':
 		*clr & cla
 		pcs_mood += 20
-		!pcs_willpwr += 20
 		minut += 60
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/staring.jpg"></center>'
@@ -385,7 +380,6 @@ if $ARGS[0] = 'Movies 2':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 20
-	!pcs_willpwr += 20
 	EndMovie = 1
 	minut += 5			
 	gs'stat'
@@ -625,7 +619,7 @@ if $ARGS[0] = 'Fedor Restroom':
 			'Fedor grabs you by your waist and flips you around then pushes you onto the sink as he pulls your shirt open exposing your breasts. You soon feel his <<dick>> centimeter Penis enter your vagina giving you jolt of stimulation as he begins to thrust his hips.'
 			gs 'arousal', 'vaginal', 5, 'sub'
 			
-			act 'lean against the sink':
+			act 'Lean against the sink':
 				*clr & cla
 				minut -= 5
 				gs'stat'
@@ -733,42 +727,6 @@ if $ARGS[0] = 'Restroom Lady':
 			gs 'arousal', 'foreplay_give', 5, 'lesbian', 'dom'
 			gs 'stat'					
 			
-			act 'Give her cuni':
-				*clr & cla
-				minut -= 5
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady4.jpg"></center>'
-				'You slowly break off the kiss and then lightly push her down onto a nearby chair and get down on all fours and crawl to her in a catlike manner, trying to entertain her as you make your way to her pussy.' 
-				'When you arrive she reaches out for your head with her hand and lightly pets you as you bury your head in between her legs. You do your best to continue stimulating her, Never taking your tongue off her clitoris.'
-				gs 'arousal', 'cuni_give', 5, 'lesbian', 'dom'
-				gs 'stat'							
-				
-				act 'Continue':
-					*clr & cla
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady5.jpg"></center>'
-					'You continue licking her as she leans further back trying to push her pussy further in your face but then slips off the chair, you do your best to catch her and then you both laugh as you help her back up.' 
-					'"I''m such a clutz. But let''s not let this stop us" She then waves you toward her and as you bury your face inbetween her legs. She lift her right leg over her head. You can''t help but think to yourself' 
-					'"She must be a cheerleader" as you continue licking her clit while enjoying the sight of her juices leaking down her leg.'
-					gs 'arousal', 'cuni_give', 5, 'lesbian', 'dom'
-					gs 'stat'	
-					
-					act 'Make her cum':
-						*clr & cla
-						gs'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady5.jpg"></center>'
-						'You start to pick up the pace and she begins moaning louder as you get her closer to her orgasm. You alternate between your tongue and finger to keep your tongue from getting tired and after a few minutes you can feel her body start to spasm and her legs begin to give out. You do your best to support her weight as you finish her off.' 
-						'After her body relaxes you lick her juices off both her legs and her pussy before holding her in your arms, kissing her passionately. After a minute you both help each other get dressed then the girl tells you "That was incredable! Thank you so much, That was exactly what I needed." as she moves in for one last kiss before leaving.'
-						*nl	
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/kiss2.jpg"></center>'
-						gs 'arousal', 'kiss', 5,'lesbian', 'dom'
-						gs 'arousal', 'end'
-						gs 'stat'							
-
-						act 'Wash up':gt 'FedorEv3', 'Restroom Wash'
-					end								
-				end	
-			end
 			gs 'willpower', 'cuni', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Pull her head to your crotch (<<will_cost>> Willpower)':
@@ -812,6 +770,42 @@ if $ARGS[0] = 'Restroom Lady':
 			else
 				act 'Pull her head to your crotch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
+			act 'Give her cuni':
+				*clr & cla
+				minut -= 5
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady4.jpg"></center>'
+				'You slowly break off the kiss and then lightly push her down onto a nearby chair and get down on all fours and crawl to her in a catlike manner, trying to entertain her as you make your way to her pussy.' 
+				'When you arrive she reaches out for your head with her hand and lightly pets you as you bury your head in between her legs. You do your best to continue stimulating her, Never taking your tongue off her clitoris.'
+				gs 'arousal', 'cuni_give', 5, 'lesbian', 'dom'
+				gs 'stat'							
+				
+				act 'Continue':
+					*clr & cla
+					gs'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady5.jpg"></center>'
+					'You continue licking her as she leans further back trying to push her pussy further in your face but then slips off the chair, you do your best to catch her and then you both laugh as you help her back up.' 
+					'"I''m such a clutz. But let''s not let this stop us" She then waves you toward her and as you bury your face inbetween her legs. She lift her right leg over her head. You can''t help but think to yourself' 
+					'"She must be a cheerleader" as you continue licking her clit while enjoying the sight of her juices leaking down her leg.'
+					gs 'arousal', 'cuni_give', 5, 'lesbian', 'dom'
+					gs 'stat'	
+					
+					act 'Make her cum':
+						*clr & cla
+						gs'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady5.jpg"></center>'
+						'You start to pick up the pace and she begins moaning louder as you get her closer to her orgasm. You alternate between your tongue and finger to keep your tongue from getting tired and after a few minutes you can feel her body start to spasm and her legs begin to give out. You do your best to support her weight as you finish her off.' 
+						'After her body relaxes you lick her juices off both her legs and her pussy before holding her in your arms, kissing her passionately. After a minute you both help each other get dressed then the girl tells you "That was incredable! Thank you so much, That was exactly what I needed." as she moves in for one last kiss before leaving.'
+						*nl	
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/kiss2.jpg"></center>'
+						gs 'arousal', 'kiss', 5,'lesbian', 'dom'
+						gs 'arousal', 'end'
+						gs 'stat'							
+
+						act 'Wash up':gt 'FedorEv3', 'Restroom Wash'
+					end								
+				end	
+			end
 		end
 	end	
 	act 'Ignore her and wash up':gt 'FedorEv3', 'Restroom Wash 2'
@@ -904,6 +898,19 @@ if $ARGS[0] = 'Restroom Man 2':
 	gs 'arousal', 'foreplay', 5, 'sub', 'rough'					
 	gs 'stat'
 	
+	if will_cost <= pcs_willpwr:
+		act 'Splash water in his face (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'resist'
+			VK = rand(1,3)
+			if VK = 1 or (succubusflag = 1 and succublvl > 1):
+				gt 'FedorEv3', 'Restroom Escape'
+			else
+				gt 'FedorEv3', 'Restroom Rape'
+			end	
+		end	
+	else
+		act 'Splash water in his face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 	act 'Submit':
 		*clr & cla				
 		gs'stat'
@@ -948,19 +955,6 @@ if $ARGS[0] = 'Restroom Man 2':
 			end
 		end	
 	end
-	if will_cost <= pcs_willpwr:
-		act 'Splash water in his face (<<will_cost>> Willpower)':
-			gs 'willpower', 'pay', 'resist'
-			VK = rand(1,3)
-			if VK = 1 or (succubusflag = 1 and succublvl > 1):
-				gt 'FedorEv3', 'Restroom Escape'
-			else
-				gt 'FedorEv3', 'Restroom Rape'
-			end	
-		end	
-	else
-		act 'Splash water in his face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
 end	
 
 if $ARGS[0] = 'Restroom Escape':
@@ -983,7 +977,6 @@ if $ARGS[0] = 'Restroom Rape':
 	menu_off = 1
 	pcs_health -= 10				
 	pcs_mood -= 20
-	!pcs_willpwr -= 5	
 	pain['tummy'] += 15
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/rape.jpg"></center>'
@@ -994,7 +987,6 @@ if $ARGS[0] = 'Restroom Rape':
 	act 'Plead':
 		*clr & cla
 		minut -= 5
-		!sub += 3
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/rape1.mp4"></video></center>'
 		'You plead with the man but his only response is "Shut the fuck up! The only thing a whore like you is good for is a getting fucked, so spread your legs and keep quiet!"' 
@@ -1081,8 +1073,7 @@ if $ARGS[0] = 'Restroom Gang':
 				'You quickly push the door closed and hold it then the guys start slaming the door while the guy peeping yells to the others "Check this out guys. This girl is hot! I bet she came in here looking for a good fucking." the guys start hollering even louder as the guy continues to make vulgar comments about you. After a few seconds you feel them slaming even harder on the door when it finally gives in, swinging open. You see the men all staring into the stall with lustful looks on their faces.'
 			
 				act 'Plead with them':
-					*clr & cla 
-					!sub += 3
+					*clr & cla
 					gs'stat'	
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang2.jpg"></center>'
 					'"I didn''t mean to interrupt. Can I please go." One of the guys grins. "You can go...After we''re done with you." He then lunges into the stall and grabs you by the throat and whispers in your ear "I bet you came in here hoping to get caught, so that you can get a good fucking. Well we''ll give you a fucking you''ll never forget." he then pulls you out of the stall where the other guys are waiting with their cocks in their hand.'
@@ -1121,7 +1112,7 @@ if $ARGS[0] = 'Restroom Gang':
 								gs'stat'						
 									
 								act 'Continue':
-									*clr & cla 
+									*clr & cla
 									minut -= 10
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang6.jpg"></center>'
@@ -1133,7 +1124,7 @@ if $ARGS[0] = 'Restroom Gang':
 									
 									gs 'willpower', 'cum_inside', 'resist', 'hard'
 									if will_cost <= pcs_willpwr:
-										act 'Eavesdrop (<<will_cost>> Willpower)':
+										act 'Beg them to pull out (<<will_cost>> Willpower)':
 											gs 'willpower', 'pay', 'resist'
 											*clr & cla
 											minut -= 15
@@ -1180,7 +1171,6 @@ if $ARGS[0] = 'Restroom Gang':
 									act 'Nod':
 										*clr & cla
 										minut -= 15
-										!sub += 5
 										gs'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/cum/cum2.jpg"></center>'
 										'You meekly nod yes and one of the guys says, "Alright boys, Lets fill this whore up." and one by one the guys begin to cum inside all of your' 
@@ -1380,7 +1370,6 @@ if $ARGS[0] = 'Movies 3':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 10
-	!pcs_willpwr += 10
 	minut += 5			
 	FedorRest = 0
 	WithFedor = 0

+ 4 - 4
locations/FedorMisc.qsrc

@@ -120,16 +120,16 @@ if $ARGS[0] = 'Fedor Chat 2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/hall/fedor.jpg"></center>'
 	'You approach Fedor and ask "How about we spend some alone time together?" Fedor gives you a playful smile as he wraps his arm around your neck, he then leads you to the hallway near the back of the school. Fedor rests against a nearby window and asks "So, what would you like to do today?"'
 
-	gs 'willpower', 'sex', 'self'
+	gs 'willpower', 'sex', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
-		act 'Wanna fool around in the locker room? (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'self' & gs 'willpower', 'pay', 'self' & gt 'FedorMisc', 'Locker Room'
+		act 'Wanna fool around in the locker room? (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'self', 'easy' & gs 'willpower', 'pay', 'self' & gt 'FedorMisc', 'Locker Room'
 	else
 		act 'Wanna fool around in the locker room? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 
-	gs 'willpower', 'sex', 'self', 'hard'
+	gs 'willpower', 'sex', 'self'
 	if will_cost <= pcs_willpwr:
-		act 'Begin caressing Fedor (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'self', 'hard' & gs 'willpower', 'pay', 'self' & gt 'FedorMisc', 'Hall'
+		act 'Begin caressing Fedor (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'self' & gs 'willpower', 'pay', 'self' & gt 'FedorMisc', 'Hall'
 	else
 		act 'Begin caressing Fedor (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end

+ 3 - 5
locations/Gnpc2.qsrc

@@ -459,8 +459,7 @@ $din_gboy_go_to_disco = {
 					gs 'stat'
 					'You head to the bar and <<$boydesc>> orders your drinks. When you finally get them you move to the outdoor area and find a secluded place to enjoy your drinks.'
 					
-					! TODO: update to something more appropriate, like 'kiss', if it ever gets included
-					gs 'willpower', 'sex', 'self', 'easy'
+					gs 'willpower', 'kiss', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Kiss (<<will_cost>> Willpower)':
 							cls
@@ -1097,12 +1096,11 @@ $din_gboy_knee = {
 	end
 
 	if pcs_horny >= 75:
-		! TODO: update to something more appropriate, like 'kiss', if it ever gets included
-		gs 'willpower', 'sex', 'self', 'easy'
+		gs 'willpower', 'kiss', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Kiss him (<<will_cost>> Willpower)':
 				cls
-				gs 'willpower', 'sex', 'self', 'easy'
+				gs 'willpower', 'kiss', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'arousal', 'kiss', 5
 				kissBoyFrend[numnpc] += 1

+ 1 - 1
locations/Gnpc_cinema.qsrc

@@ -24,7 +24,7 @@ act 'Watch the movie':
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		'You have been watching a movie and suddenly felt a hand on my knee Man.'
 
-		gs 'willpower', 'misc', 'self', 'hard'
+		gs 'willpower', 'sex_other', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Remove his hands (<<will_cost>> Willpower)':
 				cls

+ 1 - 1
locations/LakeBoyZ.qsrc

@@ -45,7 +45,7 @@ $gL_boy_z = {
 					'You drink more beer with <<$boydesc>>. He begins stroking your leg and puts his hand on your chest as he leans into you.'
 					if rand(1,100) <= 20:
 						'Leaned in he whispers to you, "I need to taste those lips."'
-						gs 'willpower', 'misc', 'resist', 'easy'
+						gs 'willpower', 'kiss', 'resist', 'easy'
 						if will_cost <= pcs_willpwr:
 							act 'Push him away and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
 						else

+ 1 - 2
locations/VoltrenerSexShower.qsrc

@@ -121,8 +121,7 @@ if $ARGS[0] = '3':
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower20.mp4"></video></center>'
 			'Opening your eyes, you see coach standing above you. He quite unceremoniously says: "Spread your bread."'
-			! 'cumshot' or someting like that (for being cum on) would be a better fit, if it ever gets added
-			gs 'willpower', 'cum_inside_anal', 'resist'
+			gs 'willpower', 'cum_outside', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Cover up (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'resist'

+ 1 - 1
locations/albinaEv.qsrc

@@ -60,7 +60,7 @@ if albinaCar = 0:
 					'Grinning, the tall one says "I see.", as the short one starts walking slowly towards you.'
 					'A chill runs up your spine as you realize you''ve been tricked. You need to get out of here right now!'
 					
-					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'misc', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Jump behind the wheel (<<will_cost>> Willpower)':
 							*clr & cla

+ 2 - 3
locations/annafrends.qsrc

@@ -258,13 +258,12 @@ if $ARGS[0] = 'scene1':
 			*nl
 			'Already pretty tipsy, Rex approaches you - "<<$pcs_nickname>>, let me refill your glass" - but he, seemingly accidentally, spills some on your foot. - "Oh, <<$pcs_nickname>>, forgive me! Here, I''ll clean that up."'
 			'Rex begins wiping off your legs with his shirt sleeve.'
-			gs 'willpower', 'misc', 'self', 'easy'
+			gs 'willpower', 'sex_other', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Step back (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'pay', 'self'
+					gs 'willpower', 'pay', 'resist'
 					minut += 5
-					!pcs_dom += 1
 					rex -= 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/community/rexnet.jpg"></center>'

+ 3 - 6
locations/artemEv.qsrc

@@ -118,7 +118,6 @@ if $ARGS[0] = 'learn':
 					act '"No way!" (<<will_cost>> Willpower)':
 						cla
 						gs 'willpower', 'pay', 'resist'
-						!pcs_dom += 1
 						artemLernQW = -1
 						artemblok = 1
 						npc_rel['A2'] = 0
@@ -133,13 +132,11 @@ if $ARGS[0] = 'learn':
 			else
 				'After you finish your homework, Artem has a serious look on his face when he says: "<<$pcs_nickname>>, everyone in the school is talking about how much of a slut you are. With how much I''ve been helping you... I think it''s only fair you give me a little something in return."'
 				act 'Suck him off': gt 'artemEv','bj'
-				!CUSTOM EDIT willpower seeding
 				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act '"No way!" (<<will_cost>> Willpower)':
 						cla
 						gs 'willpower', 'pay', 'resist'
-						!pcs_dom += 1
 						artemLernQW = -1
 						artemblok = 1
 						npc_rel['A2'] = 0
@@ -327,7 +324,7 @@ if $ARGS[0] = 'learn':
 			'Artem pressures you: "Come on... you need the money, right? We would both pay you."'
 			minut += 5
 			gs 'stat'
-			gs 'willpower', 'prostitution', 'resist'
+			gs 'willpower', 'prostitution', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse to meet his friend (<<will_cost>> Willpower)':
 					cla
@@ -718,9 +715,9 @@ if $ARGS[0] = 'kiss':
 	elseif leghumpArtem >= 1:
 		'Artem looks at you with embarrassment, but gathers the courage to ask: "<<$pcs_nickname>>, you''re the best thing that''s ever happened to me. I enjoyed last time so much... could we play like that again?"'
 		act 'Let him caress your ass': gt 'artemEv','leghump'
-		gs 'willpower', 'exhib', 'force'
+		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
-			act 'Strip and let Artem rub his dick against your ass (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'force' & gt 'artemEv','leghump2'
+			act 'Strip and let Artem rub his dick against your ass (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' & gt 'artemEv','leghump2'
 		else
 			act 'Strip and let Artem rub his dick against your ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end

+ 0 - 1
locations/brother.qsrc

@@ -947,7 +947,6 @@ if $ARGS[0] = 'brother_voyeur_end':
 	picrand = rand(1,2)
 	npc_rel['A34'] += 5
 	pcs_mood += 10
-	pcs_willpwr += 10
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/b (end<<picrand>>).jpg"></center>'
 !--- Need to expand
 !	if npc_QW['A34'] < 5

+ 1 - 1
locations/clener.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'start':
 						'You drink the shitty vodka and it burns your throat. Your throat is on fire and you quickly grab some cheese to help soothe it. Sasha casually downs the glass and doesn''t even blink. "Ah, good one."'
 						'While you are leaning over to eat the sausage, you feel a light touch as the guard pats you on the buttocks.'
 
-						gs 'willpower', 'misc', 'self'
+						gs 'willpower', 'sex_other', 'self'
 						if will_cost <= pcs_willpwr:
 							act 'React (<<will_cost>> Willpower)':
 								cla

+ 30 - 30
locations/dateM.qsrc

@@ -638,6 +638,22 @@ if $ARGS[0] = 'datecafe':
 			else
 				act 'React (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
+			gs 'willpower', 'misc', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Tell him off (<<will_cost>> Willpower)':
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
+					*clr & cla
+					'<center><img src="images/locations/shared/date/cafetelloff.jpg"></center>'
+					'Not liking the way <<$boydesc>> treated the waitress you go on the attack against <<$boydesc>>. You''re appalled by how he behaves. With such poor first-impression you decide you don''t ever want to see this bottom-feeder again.'
+					'"You should really learn some matters. To treat a human being like that is despicable. You should be ashamed of yourself."'
+					'<<$boydesc>> looks at you in fear as he wasn''t expecting you to react like that.'
+					'"Nothing to say? No need to, I''m done. Enjoy the date alone you loser." You quickly get up and walk out of the café.'
+					act 'Rush out':gt $loc, $metka
+				end
+			else
+				act 'Tell him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 			act 'Keep quiet':
 				*clr & cla
 				minut += 10
@@ -661,22 +677,6 @@ if $ARGS[0] = 'datecafe':
 				'"Thanks, one should not be accepting bad service no matter who you are."'
 				act 'Continue date':gt 'dateM', 'cafepeople'
 			end
-			gs 'willpower', 'misc', 'self', 'hard'
-			if will_cost <= pcs_willpwr:
-				act 'Tell him off (<<will_cost>> Willpower)':
-					gs 'willpower', 'misc', 'self', 'hard'
-					gs 'willpower', 'pay', 'self'
-					*clr & cla
-					'<center><img src="images/locations/shared/date/cafetelloff.jpg"></center>'
-					'Not liking the way <<$boydesc>> treated the waitress you go on the attack against <<$boydesc>>. You''re appalled by how he behaves. With such poor first-impression you decide you don''t ever want to see this bottom-feeder again.'
-					'"You should really learn some matters. To treat a human being like that is despicable. You should be ashamed of yourself."'
-					'<<$boydesc>> looks at you in fear as he wasn''t expecting you to react like that.'
-					'"Nothing to say? No need to, I''m done. Enjoy the date alone you loser." You quickly get up and walk out of the café.'
-					act 'Rush out':gt $loc, $metka
-				end
-			else
-				act 'Tell him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
 		end
 	end
 end
@@ -814,6 +814,20 @@ if $ARGS[0] = 'bartalk':
 								'"Get down on your knees <<$pcs_nickname>>."'
 								gs 'arousal', 'foreplay', 2
 								gs 'stat'
+								gs 'willpower', 'bj', 'resist'
+								if will_cost <= pcs_willpwr:
+									act 'Decide to stop (<<will_cost>> Willpower)':
+										*clr & cla
+										gs 'willpower', 'pay', 'resist'
+										gs 'arousal', 'end'
+										'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
+										'You can''t get yourself to go through this. Excusing yourself you walk back to the table and sit down.'
+										'<<$boydesc>> arrives shortly after you to the table. The whole situation is too awkward now and you begin to blush as you''re really ashamed of your actions. You''re starting to panic a bit...'
+										act 'Finish the date':gt 'dateM', 'barend'
+									end
+								else
+									act 'Decide to stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+								end
 								act 'Get down on your knees':
 									*clr & cla
 									'<center><img src="images/locations/shared/date/barbj.jpg"></center>'
@@ -846,20 +860,6 @@ if $ARGS[0] = 'bartalk':
 										end
 									end
 								end
-								gs 'willpower', 'bj', 'resist'
-								if will_cost <= pcs_willpwr:
-									act 'Decide to stop (<<will_cost>> Willpower)':
-										*clr & cla
-										gs 'willpower', 'pay', 'resist'
-										gs 'arousal', 'end'
-										'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
-										'You can''t get yourself to go through this. Excusing yourself you walk back to the table and sit down.'
-										'<<$boydesc>> arrives shortly after you to the table. The whole situation is too awkward now and you begin to blush as you''re really ashamed of your actions. You''re starting to panic a bit...'
-										act 'Finish the date':gt 'dateM', 'barend'
-									end
-								else
-									act 'Decide to stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-								end	
 							end
 						end	
 					end

+ 6 - 6
locations/natbelapt.qsrc

@@ -474,10 +474,10 @@ if $ARGS[0] = 'natroom':
 			if NatashaQW > 1 and lernHome ! 0: act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
 
 			if NatashaQW >= 5:
-				gs 'willpower', 'exhib', 'force', 'easy'
+				gs 'willpower', 'humiliation', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your feet (<<will_cost>> Willpower)':
-						gs 'willpower', 'exhib', 'force', 'easy'
+						gs 'willpower', 'humiliation', 'force', 'easy'
 						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'lick_feet'
 					end
@@ -486,10 +486,10 @@ if $ARGS[0] = 'natroom':
 				end
 			end
 			if NatashaQW >= 6:
-				gs 'willpower', 'exhib', 'force', 'easy'
+				gs 'willpower', 'humiliation', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Spit in face (<<will_cost>> Willpower)':
-						gs 'willpower', 'exhib', 'force', 'easy'
+						gs 'willpower', 'humiliation', 'force', 'easy'
 						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'spit_face'
 					end
@@ -501,7 +501,7 @@ if $ARGS[0] = 'natroom':
 				gs 'willpower', 'cuni', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your pussy (<<will_cost>> Willpower)':
-						gs 'willpower', 'sex', 'force', 'easy'
+						gs 'willpower', 'cuni', 'force', 'easy'
 						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'lick_pussy'
 					end
@@ -1020,7 +1020,7 @@ if $ARGS[0] = 'lick_pussy':
 	if natsub < 10:
 		'This useless cunt can''t even find your clitoris and only sluggishly works her mouth on your pussy without any enthusiasm.'
 		if NatDolg >= 500:
-			gs 'willpower', 'humiliation', 'force'
+			gs 'willpower', 'pee', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Piss in her mouth (<<will_cost>> Willpower)':
 					*clr & cla

+ 140 - 140
locations/postdeliveries.qsrc

@@ -290,12 +290,38 @@ if $ARGS[0] = '3':
 	'"Are you kidding? Of course I like clothes!" you shrug. "What girl doesn''t?"'
 	'"Then I have a proposition for you! Come in for a moment," he grins. He steps aside and beckons you to enter his apartment.'
 	''
+	gs 'willpower', 'misc', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Just get his signature and leave (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'resist'
+			cla
+			'This guy gives you the creeps! "Uhhh... I don''t think so, sir. I just need you to sign here so I can be on my way," you tell him.'
+			'The man smirks, but signs where you ask him to: "You''d rather be poor, huh? Suit yourself."'
+			'He slams the door shut before you can even say anything more.'
+			act 'Continue your round':gt 'postdeliveries', 'resume'
+		end
+	else
+		act 'Just get his signature and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 	act 'Ask him what he wants':
 		cla
 		posteventQW3 = 1
 		'"Uhh... why?" you ask him. "What do you want?"'
 		'He casts a quick look down to the street to make sure no one''s listening in, and says: "You say you love clothes? I love cute little girls like you. You get whatever''s in this box if you suck my dick. I can guarantee you: you''ll want what''s in this box. And I want that mouth on my cock. Win-win. So... interested?"'
 		''
+		gs 'willpower', 'prostitution', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Tell him you''re not interested (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'resist'
+				cla
+				'"I''m not that kind of girl, sir. I just need you to sign here so I can be on my way," you tell him.'
+				'The man smirks, but signs where you ask him to: "Suit yourself."'
+				'He slams the door shut before you can even say anything more.'
+				act 'Continue your round':gt 'postdeliveries', 'resume'
+			end
+		else
+			act 'Tell him you''re not interested (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 		act 'Ask if you come back after your shift':
 			cla
 			posteventQW3 = 2
@@ -304,12 +330,6 @@ if $ARGS[0] = '3':
 			'"You know what? Sure. That way I can take my time with you. But just so you know: once you enter my house, you do what I want. Unconditionally. I don''t want to hear a ''no'' or ''maybe'' out of you," he says resolutely. "Do we have a deal?"'
 			'You feel a shiver run down your back. He seems quite demanding!'
 			''
-			act 'Say you''ll be back when you''re done':
-				cla
-				'"Deal. I''ll come back once I''m done," you tell him. "I should be done around 15:00."'
-				'"Heh... I can''t wait. I have a feeling we''re going to be good friends," he grins, as he signs for his parcel. "See you then."'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
-			end
 			gs 'willpower', 'prostitution', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Say you probably won''t be coming (<<will_cost>> Willpower)':
@@ -323,34 +343,14 @@ if $ARGS[0] = '3':
 			else
 				act 'Say you probably won''t be coming (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		end
-		gs 'willpower', 'prostitution', 'resist', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Tell him you''re not interested (<<will_cost>> Willpower)':
-				gs 'willpower', 'pay', 'resist'
+			act 'Say you''ll be back when you''re done':
 				cla
-				'"I''m not that kind of girl, sir. I just need you to sign here so I can be on my way," you tell him.'
-				'The man smirks, but signs where you ask him to: "Suit yourself."'
-				'He slams the door shut before you can even say anything more.'
+				'"Deal. I''ll come back once I''m done," you tell him. "I should be done around 15:00."'
+				'"Heh... I can''t wait. I have a feeling we''re going to be good friends," he grins, as he signs for his parcel. "See you then."'
 				act 'Continue your round':gt 'postdeliveries', 'resume'
 			end
-		else
-			act 'Tell him you''re not interested (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
-	end
-	gs 'willpower', 'misc', 'resist', 'easy'
-	if will_cost <= pcs_willpwr:
-		act 'Just get his signature and leave (<<will_cost>> Willpower)':
-			gs 'willpower', 'pay', 'resist'
-			cla
-			'This guy gives you the creeps! "Uhhh... I don''t think so, sir. I just need you to sign here so I can be on my way," you tell him.'
-			'The man smirks, but signs where you ask him to: "You''d rather be poor, huh? Suit yourself."'
-			'He slams the door shut before you can even say anything more.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
 		end
-	else
-		act 'Just get his signature and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 end
 
 if $ARGS[0] = '4':
@@ -373,7 +373,6 @@ if $ARGS[0] = '4':
 			'The man regains his posture quickly and scoffs: "We''ll see who he believes! I''m not signing shit, unless you do what I want. And I happen to know the postmaster. If there''s one thing he hates, it''s complaints... trust me. What''s it gonna be, girl?"'
 			'You take another good look at him, but you can''t tell whether the man is bluffing or not. From your dealings with the postmaster so far, you''re not quite sure who he''d believe either. Still, he always seemed like a reasonable man. Surely he''d believe you?'
 			''
-			act 'Back down and agree to jerk him off': gt 'postevents', '4'
 			gs 'willpower', 'hj', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Stick to your guns and leave (<<will_cost>> Willpower)':
@@ -386,10 +385,26 @@ if $ARGS[0] = '4':
 			else
 				act 'Stick to your guns and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end	
+			act 'Back down and agree to jerk him off': gt 'postevents', '4'
 		end
 	else
 		act 'Say you don''t care if he reports you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
+	gs 'willpower', 'hj', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Run away from him (<<will_cost>> Willpower)':
+			cla
+			gs 'willpower', 'hj', 'resist', 'easy'
+			gs 'willpower', 'pay', 'resist'
+			posteventQW4 = 1
+			'You don''t like where this is going at all! Deciding you''re better off leaving his apartment while you still can, you bolt for the door and run away. You don''t trust him one bit... who knows what kind of other things he''d make you do!?'
+			'Once you''re a few houses away and look behind you, you realize there''s no way he can follow you. Not with the way he was dressed.'
+			'You take a deep breath, and look at your clipboard to see where you have to go next while you try to put the last guy out of your head. One signature will be missing from your list today, but surely the postmaster will understand when you explain what happened?'
+			act 'Continue your round':gt 'postdeliveries', 'resume'
+		end
+	else
+		act 'Run away from him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 	act 'Beg him to not go through with it':
 		cla
 		*clr
@@ -397,7 +412,6 @@ if $ARGS[0] = '4':
 		'"Please sir, I don''t want to do this! You know this is wrong! Couldn''t you please just sign and let me go?" you beg him, but he ignores your pleas and comes a bit closer to you.'
 		'His cock is fully erect now, and some precum is leaking from the tip. The man must be getting off on bullying you!'
 		'"Don''t be afraid, girl! Go ahead and touch it, just like your colleagues have before you," he grins. "It would only take a minute, and then you can be on your way with your perfect record intact. Otherwise, I''ll just have to get you fired and hope the next girl does want to do what it takes to keep her job..."'
-		act 'Do as he says and jerk him off': gt 'postevents', '4'
 		gs 'willpower', 'hj', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse and run away (<<will_cost>> Willpower)':
@@ -411,21 +425,7 @@ if $ARGS[0] = '4':
 		else
 			act 'Refuse and run away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-	end
-	gs 'willpower', 'hj', 'resist', 'easy'
-	if will_cost <= pcs_willpwr:
-		act 'Run away from him (<<will_cost>> Willpower)':
-			cla
-			gs 'willpower', 'hj', 'resist', 'easy'
-			gs 'willpower', 'pay', 'resist'
-			posteventQW4 = 1
-			'You don''t like where this is going at all! Deciding you''re better off leaving his apartment while you still can, you bolt for the door and run away. You don''t trust him one bit... who knows what kind of other things he''d make you do!?'
-			'Once you''re a few houses away and look behind you, you realize there''s no way he can follow you. Not with the way he was dressed.'
-			'You take a deep breath, and look at your clipboard to see where you have to go next while you try to put the last guy out of your head. One signature will be missing from your list today, but surely the postmaster will understand when you explain what happened?'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
-		end
-	else
-		act 'Run away from him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		act 'Do as he says and jerk him off': gt 'postevents', '4'
 	end
 end
 
@@ -440,6 +440,22 @@ if $ARGS[0] = '5':
 	if postamountrand = 1: 'You cast a quick glance at your phone and realize you''d roughly be back at the post office by 15:00. You can''t stick around for too long though...'
 	if postamountrand = 2: 'You cast a quick glance at your phone and realize you''re already behind schedule. You should probably keep going...'
 	''
+	if postamountrand = 0:
+		gs 'willpower', 'misc', 'resist'
+	else
+		gs 'willpower', 'misc', 'resist', 'easy'
+	end
+	if will_cost <= pcs_willpwr:
+		act 'Say you have no time (<<will_cost>> Willpower)':
+			cla
+			gs 'willpower', 'pay', 'resist'
+			'"Sorry guys, I have mail to deliver! No time to chat!" you say, and keep walking.'
+			'For a second you were afraid they were going to be more insistent, but luckily they leave you alone.'
+			act 'Continue your round':gt 'postdeliveries', 'resume'
+		end
+	else
+		act 'Say you have no time (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 	act 'Chat with them for a while':
 		cla
 		*clr
@@ -462,30 +478,33 @@ if $ARGS[0] = '5':
 			act 'Continue your round':gt 'postdeliveries', 'resume'
 		end
 	end
+end
+
+if $ARGS[0] = '6':
+	cla
+	gs 'stat'
+	''
+	'During your delivery round, you have to do a lot of walking. Today''s round is particularly bad; the addresses all seem very far apart from one another. For some reason it feels like your bag is heavier than usual too, and like you''ve been walking uphill this whole time! Your feet are begging you for a little break...'
+	''
 	if postamountrand = 0:
 		gs 'willpower', 'misc', 'resist'
 	else
 		gs 'willpower', 'misc', 'resist', 'easy'
 	end
 	if will_cost <= pcs_willpwr:
-		act 'Say you have no time (<<will_cost>> Willpower)':
+		act 'No time for breaks, keep working! (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'pay', 'resist'
-			'"Sorry guys, I have mail to deliver! No time to chat!" you say, and keep walking.'
-			'For a second you were afraid they were going to be more insistent, but luckily they leave you alone.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			gs 'pain', 3, 'feet', 'ache'
+			pcs_mood -= 5
+			gs 'stat'
+			'Even though you would like to sit down for a while, you decide it''s better to just deliver your mail first. You can relax when you''re done, right?'
+			'You ignore your aching feet and keep walking to your next address, and the one after that. You try to not let your feet slow you down, but the pain in your feet gets worse the longer you ignore it. You get used to it over time, but the constant nagging pain slowly wears down your mood a little while you continue your run.'
+			act 'Continue':gt 'postdeliveries', 'resume'
 		end
 	else
-		act 'Say you have no time (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		act 'No time for breaks, keep working! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-end
-
-if $ARGS[0] = '6':
-	cla
-	gs 'stat'
-	''
-	'During your delivery round, you have to do a lot of walking. Today''s round is particularly bad; the addresses all seem very far apart from one another. For some reason it feels like your bag is heavier than usual too, and like you''ve been walking uphill this whole time! Your feet are begging you for a little break...'
-	''
 	act 'Take a five minute break':
 		cla
 		minut += 5
@@ -523,25 +542,6 @@ if $ARGS[0] = '6':
 		end
 		act 'Resume your round':gt 'postdeliveries', 'resume'
 	end
-	if postamountrand = 0:
-		gs 'willpower', 'misc', 'resist'
-	else
-		gs 'willpower', 'misc', 'resist', 'easy'
-	end
-	if will_cost <= pcs_willpwr:
-		act 'No time for breaks, keep working! (<<will_cost>> Willpower)':
-			cla
-			gs 'willpower', 'pay', 'resist'
-			gs 'pain', 3, 'feet', 'ache'
-			pcs_mood -= 5
-			gs 'stat'
-			'Even though you would like to sit down for a while, you decide it''s better to just deliver your mail first. You can relax when you''re done, right?'
-			'You ignore your aching feet and keep walking to your next address, and the one after that. You try to not let your feet slow you down, but the pain in your feet gets worse the longer you ignore it. You get used to it over time, but the constant nagging pain slowly wears down your mood a little while you continue your run.'
-			act 'Continue':gt 'postdeliveries', 'resume'
-		end
-	else
-		act 'No time for breaks, keep working! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
 end
 
 if $ARGS[0] = '7':
@@ -936,22 +936,6 @@ if $ARGS[0] = '26':
 	'When you turn around, you see nothing at first. Until you look down; there''s a small boy, holding a note with a big pink heart on it.'
 	'"You deliver notes, right?" he asks. When you nod, he continues: "Could you deliver this note, please? It''s for that girl over there!"'
 	'He points in a general direction, where you see a girl his age walking on the other side of the street with her mother. They move around the corner and disappear from sight.'
-	act 'Deliver the note for him':
-		cla
-		*clr
-		minut += 10
-		pcs_mood += 20
-		money += 100
-		gs 'stat'
-		if temper > 0: '<center><img <<$set_imgh>> src="images/locations/shared/postoffice/smallgirl.jpg"></center>'
-		if temper <= 0: '<center><img <<$set_imgh>> src="images/locations/shared/postoffice/smallgirlw.jpg"></center>'
-		'"Of course, sir! Give me the note and I''ll go bring it to her!" you tell him.'
-		'The boy gives you the note with a big smile on his face, and you quickly walk in the direction you last saw the woman and her daughter go.'
-		'You lose track of them for a moment, but after a quick search you see them walking. "Excuse me, miss! I have a note for you!" you shout after them, and walk towards them.'
-		'The mother looks at you a bit surprised, but you stop her before she can say something and say: "Not for you... but for you!" as you hand the note to the little girl.'
-		'She needs her mother''s help to read the note, but a big grin appears on her face when her mother explains who it''s from. It may have cost you a few minutes, and it will cost you a few minutes more to get back on track, but the feeling you get from seeing her genuine happiness is amazing! When you''re about to leave, her mother stops you and gives you 100 <b>₽</b> and says: "What a nice thing of you to do! Thank you so much, that made her day!"'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
-	end
 	if postamountrand = 0:
 		gs 'willpower', 'misc', 'resist', 'hard'
 	else
@@ -968,6 +952,22 @@ if $ARGS[0] = '26':
 	else
 		act 'Decline and say you''re in a hurry (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Deliver the note for him':
+		cla
+		*clr
+		minut += 10
+		pcs_mood += 20
+		money += 100
+		gs 'stat'
+		if temper > 0: '<center><img <<$set_imgh>> src="images/locations/shared/postoffice/smallgirl.jpg"></center>'
+		if temper <= 0: '<center><img <<$set_imgh>> src="images/locations/shared/postoffice/smallgirlw.jpg"></center>'
+		'"Of course, sir! Give me the note and I''ll go bring it to her!" you tell him.'
+		'The boy gives you the note with a big smile on his face, and you quickly walk in the direction you last saw the woman and her daughter go.'
+		'You lose track of them for a moment, but after a quick search you see them walking. "Excuse me, miss! I have a note for you!" you shout after them, and walk towards them.'
+		'The mother looks at you a bit surprised, but you stop her before she can say something and say: "Not for you... but for you!" as you hand the note to the little girl.'
+		'She needs her mother''s help to read the note, but a big grin appears on her face when her mother explains who it''s from. It may have cost you a few minutes, and it will cost you a few minutes more to get back on track, but the feeling you get from seeing her genuine happiness is amazing! When you''re about to leave, her mother stops you and gives you 100 <b>₽</b> and says: "What a nice thing of you to do! Thank you so much, that made her day!"'
+		act 'Continue your round':gt 'postdeliveries', 'resume'
+	end
 end
 
 if $ARGS[0] = 'resume':
@@ -1212,51 +1212,6 @@ if $ARGS[0] = 'bandsex':
 		'"But..." you mumble.'
 		'"Did you really think we''d keep settling for a quick glance at your tits forever?" he asks sharply, getting impatient. "If you did, you''re even more naive than I thought. I want to feel those lips around my cock within the next ten seconds, if you want to keep that job of yours..."'
 		'He counts down out loud, you have to decide fast!'
-		act 'Do what he wants':
-			cls
-			postbandQW = 6
-			gs 'boyStat', 'A104'
-			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postbj1.jpg"></center>'
-			'If you want to keep your job, what choice do you have?'
-			'You kneel down before him and begin to suck the head of his cock. Within the minute, you feel several jets of his bittery sperm landing in your mouth. He didn''t give you any warning, and you recoil a bit from the sudden sharp taste in your mouth.'
-			gs 'arousal', 'bj', 10, 'sub'
-			gs 'arousal', 'end'
-			gs 'cum_call', 'mouth', $boy
-			gs 'stat'
-			'"Hah, you''re a natural!" he groans, slowly recovering from his orgasm. "Quick and efficient. Not bad! Could be better, but... we''ll work on that next time."'
-			'He waves you off, his attention focused on the TV now. As far as he''s concerned, you''re no longer there.'
-			'You quickly get dressed again and pull your bag out of the other guy''s hand, who was waiting outside. He eyes you up and down suspiciously, with a rather unkind look in his eyes.'
-			'You should probably start walking, before he decides he wants a piece of you too...'
-			''
-			act 'Walk away before he can say anything':
-				cla
-				gs 'stat'
-				'You quickly walk away from him before he can say anything, and continue your round as usual. Despite the hold-up you''re done a fair bit earlier than usual, but the tangy taste in your mouth is a constant reminder of what you had to do for it.'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
-			end
-			act 'Ask if you''re supposed to give him a blowjob too':
-				cls
-				gs 'boyStat', 'A105'
-				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postbj11.jpg"></center>'
-				'Figuring you''re better off staying on his good side, you stop and ask: "Uhhh... was I supposed to help you too?"'
-				'"No. But you will now. Come this way," he laughs.'
-				'Without waiting for an answer he grabs you by the arm and forcefully drags you to another room of the apartment. He doesn''t bother to undress but simply takes his cock out of his pants, expecting you to do the rest.'
-				'He groans when you close your lips around his shaft obediently and makes you take the full length of his cock down your throat several times, testing your limits thoroughly. His cock is even bigger than his friend''s, and you have to open your mouth as far as you can to allow him access.'
-				'Finally he dumps his load all over your face, and he grins at you: "You''re even more eager than the last Postslut! We''re going to have a lot of fun with you..."'
-				gs 'arousal', 'bj', 10, 'sub'
-				gs 'arousal', 'end'
-				gs 'cum_call', 'face', $boy
-				gs 'stat'
-				'While you get dressed again, you overhear the two guys talking. One of them says: "Wha... she did you too!? I told her she could leave! Maybe she enjoys this a lot more than we thought?"'
-				act 'Continue your round':
-					cla
-					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postgirl.jpg"></center>'
-					'You quickly leave the apartment before they come find you again, and complete your round without any more issues. You run into the guys several times more, but other than a few lewd remarks they leave you alone.'
-
-					act 'Continue your round':gt 'postdeliveries', 'resume'	
-				end
-			end
-		end
 		gs 'willpower', 'bj', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Beg him to not make you do it (<<will_cost>> Willpower)':
@@ -1311,6 +1266,51 @@ if $ARGS[0] = 'bandsex':
 		else
 			act 'Beg him to not make you do it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	
+		act 'Do what he wants':
+			cls
+			postbandQW = 6
+			gs 'boyStat', 'A104'
+			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postbj1.jpg"></center>'
+			'If you want to keep your job, what choice do you have?'
+			'You kneel down before him and begin to suck the head of his cock. Within the minute, you feel several jets of his bittery sperm landing in your mouth. He didn''t give you any warning, and you recoil a bit from the sudden sharp taste in your mouth.'
+			gs 'arousal', 'bj', 10, 'sub'
+			gs 'arousal', 'end'
+			gs 'cum_call', 'mouth', $boy
+			gs 'stat'
+			'"Hah, you''re a natural!" he groans, slowly recovering from his orgasm. "Quick and efficient. Not bad! Could be better, but... we''ll work on that next time."'
+			'He waves you off, his attention focused on the TV now. As far as he''s concerned, you''re no longer there.'
+			'You quickly get dressed again and pull your bag out of the other guy''s hand, who was waiting outside. He eyes you up and down suspiciously, with a rather unkind look in his eyes.'
+			'You should probably start walking, before he decides he wants a piece of you too...'
+			''
+			act 'Walk away before he can say anything':
+				cla
+				gs 'stat'
+				'You quickly walk away from him before he can say anything, and continue your round as usual. Despite the hold-up you''re done a fair bit earlier than usual, but the tangy taste in your mouth is a constant reminder of what you had to do for it.'
+				act 'Continue your round':gt 'postdeliveries', 'resume'
+			end
+			act 'Ask if you''re supposed to give him a blowjob too':
+				cls
+				gs 'boyStat', 'A105'
+				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postbj11.jpg"></center>'
+				'Figuring you''re better off staying on his good side, you stop and ask: "Uhhh... was I supposed to help you too?"'
+				'"No. But you will now. Come this way," he laughs.'
+				'Without waiting for an answer he grabs you by the arm and forcefully drags you to another room of the apartment. He doesn''t bother to undress but simply takes his cock out of his pants, expecting you to do the rest.'
+				'He groans when you close your lips around his shaft obediently and makes you take the full length of his cock down your throat several times, testing your limits thoroughly. His cock is even bigger than his friend''s, and you have to open your mouth as far as you can to allow him access.'
+				'Finally he dumps his load all over your face, and he grins at you: "You''re even more eager than the last Postslut! We''re going to have a lot of fun with you..."'
+				gs 'arousal', 'bj', 10, 'sub'
+				gs 'arousal', 'end'
+				gs 'cum_call', 'face', $boy
+				gs 'stat'
+				'While you get dressed again, you overhear the two guys talking. One of them says: "Wha... she did you too!? I told her she could leave! Maybe she enjoys this a lot more than we thought?"'
+				act 'Continue your round':
+					cla
+					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postgirl.jpg"></center>'
+					'You quickly leave the apartment before they come find you again, and complete your round without any more issues. You run into the guys several times more, but other than a few lewd remarks they leave you alone.'
+
+					act 'Continue your round':gt 'postdeliveries', 'resume'	
+				end
+			end
+		end
 	elseif postbandQW = 5:
 		cla
 		*clr

+ 45 - 45
locations/postevents.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = '1':
 				'"Well?" you ask him sharply.'
 				'"You look... very sexy," the man confesses. He''s actually fairly attractive, despite his age.'
 				''
-				gs 'willpower', 'misc', 'force', 'easy'
+				gs 'willpower', 'sex_other', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Press on and seduce him (<<will_cost>> Willpower)':
 						*clr & cla
@@ -47,7 +47,6 @@ if $ARGS[0] = '1':
 						'You slip out of the gown and stand naked before him, and smile sweetly: "Well, I don''t. Forget about your wife for a while, and focus on me. Your wife is not here, I am. If there was one thing you could ask of me... anything at all! What would it be?"'
 						'The man ponders for a second, and then looks at you as if he''s too embarrassed to say it. Then he says: "The blowjob. Definitely the blowjob. I haven''t had one in forever!"'
 						''
-						act 'Give him a blowjob he''ll never forget':gt 'postevents', '1-1'
 						gs 'willpower', 'bj', 'resist', 'easy'
 						if will_cost <= pcs_willpwr:
 							act 'Don''t do it, but tell him he deserves better (<<will_cost>> Willpower)':
@@ -69,6 +68,7 @@ if $ARGS[0] = '1':
 						else
 							act 'Don''t do it, but tell him he deserves better (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end	
+						act 'Give him a blowjob he''ll never forget':gt 'postevents', '1-1'
 					end
 				else
 					act 'Press on and seduce him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -194,18 +194,6 @@ if $ARGS[0] = '2':
 			'"You never asked him?" you ask her. "Aren''t you afraid someone will recognize you?"'
 			'Jenya laughs: "And then what? They would see I''m hot, that I love sex, and that I''m good at it! That''s nothing to be ashamed of! Besides, it hasn''t happened yet. I think he only publishes abroad..."'
 			'When she sees your face, she kisses your neck and says: "You''re not getting cold feet, are you? Here, have some vodka to ease your nerves! You''ll be fine, trust me!"'
-			act 'Drink the vodka':
-				*clr & cla
-				gs 'drugs', 'alcohol', 'vodka'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-4.jpg"></center>'
-				'"Maybe a few sips to take the edge off," you mutter, but she completely fills the mug and hands it to you. "Cheers!" she grins, and takes a swig straight from the bottle before putting it away.'
-				'You take a few sips of the vodka. It''s the cheap home brewed stuff, but it gets the job done.'
-				'Within minutes you feel a slight buzz in your head, and Jenya begins to kiss you again. She starts off slowly but her kisses become more and more passionate, and you struggle to keep the mug straight.'
-				'Realizing you need to get rid of the mug, you decide to just gulp down the rest and let yourself fall back down on the bed, where Jenya is immediately on top of you. After a few minutes, she refills the mug and hands it to you again.'
-
-				act 'Close your eyes and enjoy her touch': gt 'postevents', '2-1'
-			end
 			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Say you don''t want to do this and leave (<<will_cost>> Willpower)':
@@ -223,6 +211,18 @@ if $ARGS[0] = '2':
 			else
 				act 'Say you don''t want to do this and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
+			act 'Drink the vodka':
+				*clr & cla
+				gs 'drugs', 'alcohol', 'vodka'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-4.jpg"></center>'
+				'"Maybe a few sips to take the edge off," you mutter, but she completely fills the mug and hands it to you. "Cheers!" she grins, and takes a swig straight from the bottle before putting it away.'
+				'You take a few sips of the vodka. It''s the cheap home brewed stuff, but it gets the job done.'
+				'Within minutes you feel a slight buzz in your head, and Jenya begins to kiss you again. She starts off slowly but her kisses become more and more passionate, and you struggle to keep the mug straight.'
+				'Realizing you need to get rid of the mug, you decide to just gulp down the rest and let yourself fall back down on the bed, where Jenya is immediately on top of you. After a few minutes, she refills the mug and hands it to you again.'
+
+				act 'Close your eyes and enjoy her touch': gt 'postevents', '2-1'
+			end
 		end
 		act 'Tell her you only want to be with her':
 			cla
@@ -231,6 +231,23 @@ if $ARGS[0] = '2':
 			'"Come on, please?" you ask her. "I really like you, but..."'
 			'She sighs and thinks for a second. Then she offers: "Okay, look. I will try to keep him happy and do most of the work, but you can''t ignore him. At least suck him off a little, you know? Does that sound okay?"'
 			'Before you answer, she clarifies: "I''ll offer myself when the time is there." She takes a deep breath, and continues: "I''ll tell him he can fuck my ass, if it really comes to that. He loves my ass, but I never let him have it. He just doesn''t know how to pace himself and make it feel good for me too! Anyway, I don''t think he''ll say no... but if he goes for you, I won''t stop him. I can''t stop him. Not after everything he does for me. I already promised him he''d get to fuck a young cutie today, so..."'
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Say you don''t want to do this and leave (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'resist'
+					'"I''m sorry, but I really can''t do this," you tell her, and push her off you.'
+					'The girl looks disappointed, but doesn''t try to stop you. She says: "That''s a shame. Arsen would''ve loved to have a cutie like you. Oh well, more cocks for me!"'
+					'You''re gathering your clothes when Arsen and Maksim enter the room. Both their cocks are fully erect and bob up and down with every step they take.'
+					'"You''re leaving?" he mutters in disbelief. "We waited over an hour for this!?"'
+					'Maksim also seems upset: "I already promised the subscribers a threesome! This sucks..."'
+					'"Relax, baby! I''m sorry, she changed her mind. Come here, I''ll take care of the both of you! That''s still a threesome, right Maksim?" she smiles, pulling the two of them towards the bed. "See yourself out, will you?" the girl waves you off with a wink, before she takes both the cocks in her hands and begins to jerk them off. The guys completely forget about you, and you walk out of the room quietly.'
+
+					act 'Get dressed and leave': gt 'pavResidential'
+				end
+			else
+				act 'Say you don''t want to do this and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 			act 'Ask for the vodka':
 				*clr & cla
 				gs 'drugs', 'alcohol', 'vodka'
@@ -253,23 +270,6 @@ if $ARGS[0] = '2':
 
 				act 'Continue': gt 'postevents', '2-2'
 			end
-			gs 'willpower', 'sex', 'resist'
-			if will_cost <= pcs_willpwr:
-				act 'Say you don''t want to do this and leave (<<will_cost>> Willpower)':
-					cla
-					gs 'willpower', 'pay', 'resist'
-					'"I''m sorry, but I really can''t do this," you tell her, and push her off you.'
-					'The girl looks disappointed, but doesn''t try to stop you. She says: "That''s a shame. Arsen would''ve loved to have a cutie like you. Oh well, more cocks for me!"'
-					'You''re gathering your clothes when Arsen and Maksim enter the room. Both their cocks are fully erect and bob up and down with every step they take.'
-					'"You''re leaving?" he mutters in disbelief. "We waited over an hour for this!?"'
-					'Maksim also seems upset: "I already promised the subscribers a threesome! This sucks..."'
-					'"Relax, baby! I''m sorry, she changed her mind. Come here, I''ll take care of the both of you! That''s still a threesome, right Maksim?" she smiles, pulling the two of them towards the bed. "See yourself out, will you?" the girl waves you off with a wink, before she takes both the cocks in her hands and begins to jerk them off. The guys completely forget about you, and you walk out of the room quietly.'
-
-					act 'Get dressed and leave': gt 'pavResidential'
-				end
-			else
-				act 'Say you don''t want to do this and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
 		end
 	end
 end
@@ -614,20 +614,6 @@ if $ARGS[0] = '3-1':
 		'After he feels your teeth on his cock for the second time, he pulls away from you and scolds you: "That was terrible! Wait here..."'
 		'He walks off, and returns showing you a ring gag. He says: "Since you can''t give a decent blowjob, you''re going to wear this. Open your mouth."'
 		
-		act 'Open your mouth obediently':
-			*clr & cla
-!!!!you swallow his load
-			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-5.jpg"></center>'
-			'You let the man put the ring into your mouth, and wait obediently while he fastens it behind your head.'
-			'When he guides his erection back towards your wide open mouth, you realize how little control you have now. You cough and splutter several times when he shoves his cock inside your mouth further than you can handle. He usually backs off just enough to give you a moment to recover, and then continues to fuck your unexperienced throat.'
-			'You''ve come so far, though... you''re not stopping now! You make the most of it and feel relieved when you feel the man''s cum splurting down your throat a few minutes later.'
-			gs 'arousal', 'bj', 15, 'sub', 'bound', 'prostitution'
-			gs 'cum_call', 'mouth', $boy
-			gs 'stat'
-			'"Don''t feel bad, you did good!" he pants, while he undoes the gag. "Not the blowjob itself, obviously. That was terrible. But you''re not afraid to get a little kinky, and continued to try and please me even when you were having a rough time. You''re exactly the kind of girl I''m looking for!"'
-
-			act 'Continue': gt 'postevents', '3-2'
-		end
 		gs 'willpower', 'humiliation', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Beg him to let you try again (<<will_cost>> Willpower)':
@@ -649,6 +635,20 @@ if $ARGS[0] = '3-1':
 		else
 			act 'Beg him to let you try again (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
+		act 'Open your mouth obediently':
+			*clr & cla
+!!!!you swallow his load
+			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-5.jpg"></center>'
+			'You let the man put the ring into your mouth, and wait obediently while he fastens it behind your head.'
+			'When he guides his erection back towards your wide open mouth, you realize how little control you have now. You cough and splutter several times when he shoves his cock inside your mouth further than you can handle. He usually backs off just enough to give you a moment to recover, and then continues to fuck your unexperienced throat.'
+			'You''ve come so far, though... you''re not stopping now! You make the most of it and feel relieved when you feel the man''s cum splurting down your throat a few minutes later.'
+			gs 'arousal', 'bj', 15, 'sub', 'bound', 'prostitution'
+			gs 'cum_call', 'mouth', $boy
+			gs 'stat'
+			'"Don''t feel bad, you did good!" he pants, while he undoes the gag. "Not the blowjob itself, obviously. That was terrible. But you''re not afraid to get a little kinky, and continued to try and please me even when you were having a rough time. You''re exactly the kind of girl I''m looking for!"'
+
+			act 'Continue': gt 'postevents', '3-2'
+		end
 	end
 end
 

+ 75 - 76
locations/preNT.qsrc

@@ -161,80 +161,6 @@ if $ARGS[0] =  'Ride':
 					gs 'arousal', 'hj', 5, 'dom'
 					gs 'stat'
 
-					act 'Suck his dick':
-						*clr & cla
-						!sub += 5
-						minut -= 2
-						gs'stat'
-						'<center><img <<$set_imgh>> src="images/pre/city/bj1.jpg"></center>'
-						'Realizing what he wants, you lower your head to his penis then light kiss the tip before looking up at him, as he gives you an approving nod, signalling you to continue. You wrap your lips around the tip then give it a light suck before rubbing it with your tongue. You enjoy the warmth of it in your mouth while you slide it in deeper. You begin thoroughly sucking his cock while he takes a quick look around to see if anyone is watching before he continues driving with his dick in your mouth. You can feel your underwear growing wet, causing you to think to yourself,'
-						*nl
-						'<font color=#FF00CC>Why am I so wet? Did I pee myself? Am I really doing this? Is this really happening? I''m sucking this man''s dick and I don''t even know him, but I feel so hot. I want more. I want him to put his dick inside of me. I want him so bad. What is wrong with me? i just met him...</font>'
-						'<center><video autoplay loop src="images/pre/city/bj2.mp4"></video></center>'
-						gs 'arousal', 'bj', 5, 'sub'
-						gs 'stat'
-
-						act 'Continue':
-							*clr & cla
-							!sub += 5
-							guy += 1
-							minut -= 2
-							gs'stat'
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj2.mp4"></video></center>'
-							'You suddenly feel his penis throbbing in your mouth, filling it with a warm liquid. <font color=#FF00CC>What is going on? what is this liquid? Did he pee or something? Should I spit it out? No I will get it all over his floor. I should just swallow it quickly.</font> You swallow the liquid and suddenly feel the sting as it goes down your throat. You try not to gag as you look up at Albert and see a very satisfied smile on his face as he lightly strokes your cheek. You slowly sit back in your seat embarrassed at what you just did and not knowing what to say to him.'
-							'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
-							'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
-							gs 'cum_call', 'mouth', 'Albert'
-							gs 'arousal', 'bj', 5, 'sub'
-							gs 'stat'
-							gs 'arousal', 'end'
-
-							act 'Continue riding in silence':
-								*clr & cla
-								minut += 4
-								gs'stat'
-								'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/car.jpg"></center>'
-								'You lay back trying to relax while still feeling the sting of his cum in your mouth. After a few minutes of silence, the car stops and you realize that you have arrived at your building. Albert turns to your with a smile and says, "Here we are. I hope that you enjoyed the ride as much as I did." You can''t help but giggle a bit before replying, "I had a wonderful time. Thank you Albert." Albert chuckles before saying, "Anytime <<$pcs_firstname>>."'
-								*nl
-								'He then steps out of the car then heads to the trunk while you get out and begin stretching your legs. Albert brings out your bags then places them next to you before placing his hand on your hip then giving you a kiss on the cheek, followed by a wink. Albert returns to his car as you wave goodbye then turn to your new home."'
-								'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
-
-								act 'Walk toward your new home':
-									*clr & cla
-									!sub += 5
-									minut += 4
-									if sound = 0:
-										if month >=11 and month <= 12 or month >=1 and month <=3:
-											if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-											if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
-										else
-											if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-											if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
-										end
-									end
-									gs'stat'
-									if month >= 11 or month <= 3:
-										if hour >= 8 and hour <= 21:
-											'<center><img <<$set_imgh>> src="images/locations/city/residential/streetw.jpg"></center>'
-										else
-											'<center><img <<$set_imgh>> src="images/locations/city/residential/streetwn.jpg"></center>'
-										end
-									else
-										if hour >= 8 and hour <= 21:
-											'<center><img <<$set_imgh>> src="images/locations/city/residential/street.jpg"></center>'
-										else
-											'<center><img <<$set_imgh>> src="images/locations/city/residential/street_night.jpg"></center>'
-										end
-									end
-									'You begin heading in the direction of your new home when you notice some gopniks harassing a woman. One of the gopniks is whistling at her while the other is lifting up her skirt. You try your best to ignore them as you continue toward you apartment when you suddenly trip over something. You reach down and pick it up realizing that it is a news paper. You take a quick moment to open it up then look through the job listings.'
-
-									act 'Look at the job listings':gt 'preNT', 'Listings'
-								end
-							end
-						end
-					end
-
 					gs 'willpower', 'bj', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Continue jerking him (<<will_cost>> Willpower)':
@@ -308,11 +234,84 @@ if $ARGS[0] =  'Ride':
 						end
 					else
 						act 'Continue jerking him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end	
+					end
+					act 'Suck his dick':
+						*clr & cla
+						!sub += 5
+						minut -= 2
+						gs'stat'
+						'<center><img <<$set_imgh>> src="images/pre/city/bj1.jpg"></center>'
+						'Realizing what he wants, you lower your head to his penis then light kiss the tip before looking up at him, as he gives you an approving nod, signalling you to continue. You wrap your lips around the tip then give it a light suck before rubbing it with your tongue. You enjoy the warmth of it in your mouth while you slide it in deeper. You begin thoroughly sucking his cock while he takes a quick look around to see if anyone is watching before he continues driving with his dick in your mouth. You can feel your underwear growing wet, causing you to think to yourself,'
+						*nl
+						'<font color=#FF00CC>Why am I so wet? Did I pee myself? Am I really doing this? Is this really happening? I''m sucking this man''s dick and I don''t even know him, but I feel so hot. I want more. I want him to put his dick inside of me. I want him so bad. What is wrong with me? i just met him...</font>'
+						'<center><video autoplay loop src="images/pre/city/bj2.mp4"></video></center>'
+						gs 'arousal', 'bj', 5, 'sub'
+						gs 'stat'
+
+						act 'Continue':
+							*clr & cla
+							!sub += 5
+							guy += 1
+							minut -= 2
+							gs'stat'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj2.mp4"></video></center>'
+							'You suddenly feel his penis throbbing in your mouth, filling it with a warm liquid. <font color=#FF00CC>What is going on? what is this liquid? Did he pee or something? Should I spit it out? No I will get it all over his floor. I should just swallow it quickly.</font> You swallow the liquid and suddenly feel the sting as it goes down your throat. You try not to gag as you look up at Albert and see a very satisfied smile on his face as he lightly strokes your cheek. You slowly sit back in your seat embarrassed at what you just did and not knowing what to say to him.'
+							'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
+							'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
+							gs 'cum_call', 'mouth', 'Albert'
+							gs 'arousal', 'bj', 5, 'sub'
+							gs 'stat'
+							gs 'arousal', 'end'
+
+							act 'Continue riding in silence':
+								*clr & cla
+								minut += 4
+								gs'stat'
+								'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/car.jpg"></center>'
+								'You lay back trying to relax while still feeling the sting of his cum in your mouth. After a few minutes of silence, the car stops and you realize that you have arrived at your building. Albert turns to your with a smile and says, "Here we are. I hope that you enjoyed the ride as much as I did." You can''t help but giggle a bit before replying, "I had a wonderful time. Thank you Albert." Albert chuckles before saying, "Anytime <<$pcs_firstname>>."'
+								*nl
+								'He then steps out of the car then heads to the trunk while you get out and begin stretching your legs. Albert brings out your bags then places them next to you before placing his hand on your hip then giving you a kiss on the cheek, followed by a wink. Albert returns to his car as you wave goodbye then turn to your new home."'
+								'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
+								'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
+
+								act 'Walk toward your new home':
+									*clr & cla
+									!sub += 5
+									minut += 4
+									if sound = 0:
+										if month >=11 and month <= 12 or month >=1 and month <=3:
+											if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
+											if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+										else
+											if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
+											if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+										end
+									end
+									gs'stat'
+									if month >= 11 or month <= 3:
+										if hour >= 8 and hour <= 21:
+											'<center><img <<$set_imgh>> src="images/locations/city/residential/streetw.jpg"></center>'
+										else
+											'<center><img <<$set_imgh>> src="images/locations/city/residential/streetwn.jpg"></center>'
+										end
+									else
+										if hour >= 8 and hour <= 21:
+											'<center><img <<$set_imgh>> src="images/locations/city/residential/street.jpg"></center>'
+										else
+											'<center><img <<$set_imgh>> src="images/locations/city/residential/street_night.jpg"></center>'
+										end
+									end
+									'You begin heading in the direction of your new home when you notice some gopniks harassing a woman. One of the gopniks is whistling at her while the other is lifting up her skirt. You try your best to ignore them as you continue toward you apartment when you suddenly trip over something. You reach down and pick it up realizing that it is a news paper. You take a quick moment to open it up then look through the job listings.'
+
+									act 'Look at the job listings':gt 'preNT', 'Listings'
+								end
+							end
+						end
+					end
 				end
 			else
 				act 'Reach out for his crotch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 
 			act 'Pretend not to notice it':
 				*clr & cla

+ 1 - 1
locations/train_incidental.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'breastfeedthebaby':
 					'Then you unlatch the baby and hand it to the father, then you cover yourself up. The man thanks you for the help.'
 					act 'Leave':gt $loc, $metka
 				end
-				gs 'willpower', 'misc', 'force', 'medium'
+				gs 'willpower', 'sex_other', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Have him try your breast milk (<<will_cost>> Willpower)':
 						*clr & cla

+ 2 - 2
locations/vann.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'v1':
 	'"Oops... Sorry, I''ll come back later." you say and turn to leave.'
 	'"Weel, no... It''s okay, you can stay, I''m almost finished." she says with a smile. You come back and go to the sink to wash your hands to keep yourself busy until she leaves. But she seems not to be in a hurry and, a couple of minutes later, she asks "Do you want your feet smeared too?"'
 
-	gs 'willpower', 'cuni', 'resist', 'easy'
+	gs 'willpower', 'sex_other', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 			cla
@@ -252,7 +252,7 @@ if $ARGS[0] = 'v4':
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/bathroom/v10.jpg"></center>'
 		'You began to slowly crawl from the bathroom, covering your naked pussy, soapy water, and tried to close the chest hand that you do not really succeed. The guy kept watch over you and his smile grew wider, and then you realize that your hand is still stroking your pussy and his eyes only excites you. Making an effort you took the hand. He walked up to you and sat on the edge of the tub, lifted out of the water loofah handed to you, "Can I help you? ... I mean back rub, " he said. You sat and stared blankly at him not knowing what to say, and his hands were pulled down again.'
 
-		gs 'willpower', 'sex', 'resist', 'easy'
+		gs 'willpower', 'sex_other', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse (<<will_cost>> Willpower)':
 				*clr & cla

+ 1 - 1
locations/vecher.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = 'end10':
 	'<center><img <<$set_imgh>> src="images/locations/shared/party/itog10.jpg"></center>'
 	'You get drunk and dance with some stranger who spends the whole time pawing at your tits and making dirty comments.'
 
-	gs 'willpower', 'misc', 'resist'
+	gs 'willpower', 'sex_other', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm','korr'
 	else

+ 2 - 1
locations/willpower.qsrc

@@ -4,7 +4,8 @@
 !!Action: Determines what action sveta is resisting, forcing somebody to do or forcing herself to do
 !!List of actions: 
 !!		'voyeur', 'mast', 'hj', 'bj', 'cuni', 'sex', 'anal', 'group', 'gangbang', 'prostitution', 'swallow', 'cum_inside', 'cum_inside_anal', 'rape',
-!!		'footjob' 'titjob' 'trib' 'rimming' 'BDSM' 'cum_outside' 'drink', 'drugs', 'crime', 'exhib', 'sleep'
+!!		'humiliation', 'footjob', 'titjob', 'trib', 'rimming', 'BDSM', 'pee', 'cum_outside', 'drink', 'drugs', 'crime', 'exhib', 'sleep'
+!!		there is also 'sex_other' for things like touching and fondling
 !!		and two special cases 'misc' and 'skill' 
 !!Type: Determines what kind of willpower check sveta needs to do ('resist', 'force', 'self'). 
 !!		-'resist' is used if sveta is resisting to do the 'action' somebody else wants her to do. 

+ 4 - 8
locations/worksalon.qsrc

@@ -59,14 +59,13 @@ if $ARGS[0] = 'start':
 		end
 
 		if masharab = 1:
-			gs 'willpower', 'misc', 'force'
+			gs 'willpower', 'sex_other', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Tell Masha to give you a massage (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'force'
 					cla
 					*clr
 					pcs_mood += 10
-					!pcs_willpwr += 10
 					'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/s7.jpg"></center>'
 					'After you eat your lunch you walk over to Masha. Placing your hands on your hips you tell her in a commanding voice. "Well why are you just sitting there? Get up and give me a massage, a nice slow one."'
 					'Masha immediately jumps up and waits for you to get undressed and lay down. Once you are naked and laying on the table Masha starts massaging you.'
@@ -77,7 +76,6 @@ if $ARGS[0] = 'start':
 						cla
 						*clr
 						pcs_mood += 10
-						!pcs_willpwr += 10
 						picrand = rand(8, 9)
 						'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/s<<picrand>>.jpg"></center>'
 
@@ -163,7 +161,7 @@ if $ARGS[0] = 'start':
 			end
 
 		elseif masha > 5 and masharab = 0:
-			gs 'willpower', 'misc', 'force', 'easy'
+			gs 'willpower', 'sex_other', 'force', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Ask Masha to give you a massage (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'force'
@@ -178,7 +176,6 @@ if $ARGS[0] = 'start':
 						*clr
 						masharab = 1
 						pcs_mood += 10
-						pcs_willpwr += 10
 						'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/s1.jpg"></center>'
 						'You undress and lie down on the table, Masha begins to give you a massage, her delicate hands glide over your body, you moan slightly as your body relaxes. A few minutes later Masha says, "Can you please roll over onto your back?"'
 
@@ -189,7 +186,6 @@ if $ARGS[0] = 'start':
 							cla
 							*clr
 							pcs_mood += 10
-							pcs_willpwr += 10
 							'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/s2.jpg"></center>'
 							'You roll over in silence, eyes closed. You continue to enjoy the massage for a few minutes, then Masha begins to squeeze your breasts. Almost at once you feel her tongue begin to lick your nipple.'
 							'You open your eyes looking at her, when you look at her Masha immediately lets go of you and falls to her knees on the floor and begs for forgiveness. "I''m sorry if that displeased you." It takes you a few moments to realize Masha is a sub and loves to obey.'
@@ -295,10 +291,10 @@ if $ARGS[0] = 'start':
 								act 'Order her to lick your pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 
-							gs 'willpower', 'cuni', 'force', 'hard'
+							gs 'willpower', 'rimming', 'force'
 							if will_cost <= pcs_willpwr:
 								act 'Order her to lick your ass (<<will_cost>> Willpower)':
-									gs 'willpower', 'cuni', 'force', 'hard'
+									gs 'willpower', 'cuni', 'rimming', 'hard'
 									gs 'willpower', 'pay', 'force'
 									cla
 									*clr

Some files were not shown because too many files changed in this diff