Browse Source

Merge remote-tracking branch 'Sicaa/master'

KevinSmarts 5 years ago
parent
commit
a3837edd03

+ 63 - 43
locations/Gnpc.qsrc

@@ -131,7 +131,7 @@ if boytimes[numnpc] > 0 and otnBoyFrend[numnpc] > 40:
 end
 'You approach <<$nameBoyfrend[numnpc]>> and greet him<<$bfGreeting>>.'
 
-act 'Apologize and leave':otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
 
 act 'Take a walk through the park':
 	cla
@@ -178,12 +178,12 @@ act 'Take a walk through the park':
 	if gboyrand = 0:
 		'<<$nameBoyfrend[numnpc]>> offers to go to the movies.'
 
-		act 'Apologize and leave':otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
 		act 'Go to the cinema':gt 'Gnpc_cinema'
 	elseif gboyrand = 1:
 		'<<$nameBoyfrend[numnpc]>> suggests to drink some beers in the park.'
 
-		act 'Apologize and leave':otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
 
 		act 'Go for a beer':
 			cla
@@ -228,7 +228,6 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 
 			act 'Dump him and take the money':
 				cla
-				pcs_dom += 2
 				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				money += 5000
@@ -240,7 +239,6 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 
 			act 'Dump him and throw the money in his face':
 				cla
-				pcs_dom += 5
 				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				gs 'stat'
@@ -254,7 +252,6 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 
 			act 'Dump him':
 				cla
-				pcs_dom += 5
 				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				gs 'stat'
@@ -281,20 +278,24 @@ if GboyBalabol[numnpc] = 1:
 			'<<$nameBoyfrend[numnpc]>> grins, "Relax, <<$pcs_nickname>>. It''s a fact that you''re a <<$gnikname>>. So what?"'
 		end
 
-		act 'Break up with him':
-			cla
-			pcs_dom += 5
-			GboyBalabol[numnpc] = 2
-			otnBoyFrend[numnpc] = 0
-			gs 'stat'
-			'You furiously scream at him that you never want to see him again and storm off.'
+		gs 'willpower', 'misc', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Break up with him (<<will_cost>> Willpower)':
+				cla
+				gs 'willpower', 'pay', 'self'
+				GboyBalabol[numnpc] = 2
+				otnBoyFrend[numnpc] = 0
+				gs 'stat'
+				'You furiously scream at him that you never want to see him again and storm off.'
 
-			act 'Leave':gt $loc, $metka
+				act 'Leave': gt $loc, $metka
+			end
+		else
+			act 'Break up with 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 'Forgive him':
 			cla
-			sub += 5
 			GboyBalabol[numnpc] = 2
 			gs 'stat'
 			'You think about what he said. Because of the rumours, a lot of people have already a bad opinion about you and you don''t want to lose your <<$bfTitle[numnpc]>>, too. So you reluctantly decide to forgive him.'
@@ -304,50 +305,69 @@ if GboyBalabol[numnpc] = 1:
 	end
 end
 
-if sub < 20 and ((boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boytimes[numnpc] > 4 and otnBoyFrend[numnpc] < 120)):
+if (boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boytimes[numnpc] > 4 and otnBoyFrend[numnpc] < 120):
 	act 'End the relationship':
 		cla
 		*nl
 		'You think about how you could approach your <<$bfTitle[numnpc]>> with this delicate matter...'
 		*nl
 
-		if otnBoyFrend[numnpc] < 40 or pcs_dom > 10:
-			act 'Break up with him':
+		if otnBoyFrend[numnpc] < 40:
+			gs 'willpower', 'misc', 'self', 'easy'
+		else
+			gs 'willpower', 'misc', 'self'
+		end
+		if will_cost <= pcs_willpwr:
+			act 'Break up with him (<<will_cost>> Willpower)':
 				cla
-				pcs_dom += 5
+				if otnBoyFrend[numnpc] < 40:
+					gs 'willpower', 'misc', 'self', 'easy'
+				else
+					gs 'willpower', 'misc', 'self'
+				end
+				gs 'willpower', 'pay', 'self'
 				otnBoyFrend[numnpc] = 0
 				gs 'stat'
 				'You tell <<$nameBoyfrend[numnpc]>> that it would be better if you don''t see each other again and that he should''t call you anymore. He just stares at you, so you decide to quickly leave before he overcomes his state of shock.'
 
-				act 'Leave':gt $loc, $metka
+				act 'Leave': gt $loc, $metka
 			end
+		else
+			act 'Break up with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		if otnBoyFrend[numnpc] >= 40 and gnpcSex[numnpc] > 0:
-			act 'Just be friends':
-				cla
-				temprand = rand(0, 4)
-				sub -= 5
-				'You nervously approach <<$nameBoyfrend[numnpc]>>, "Listen, <<$nameBoyfrend[numnpc]>>, I really like you, but I''m not ready for an intimate relationship right now. I think we should forget what happened between us and just be friends, okay?"'
-
-				if boytimes[numnpc] > 4 and otnBoyFrend[numnpc] >= 80 and temprand = 0:
-					otnBoyFrend[numnpc] -= 40
-					gnpcSex[numnpc] = 0
-					gs 'stat'
-
-					'<<$nameBoyfrend[numnpc]>> looks totally dejected as you tell him the bad news. You really feel pity for him. When you finish your speech there''s a moment of painful silence.'
-					'Then <<$nameBoyfrend[numnpc]>> takes a deep breath, looks you in the eyes and says, "That''s really hard on me, <<$pcs_firstname>>. But I respect your feelings. I like you, too... very much in fact! That''s why I''m willing to be your friend, even if it means that we can''t be a couple."'
-					'Wow, you didn''t expect that! Still, you feel touched by his devotion and give him a bear hug, smiling from ear to ear. "Thank you, <<$nameBoyfrend[numnpc]>>! I''m so glad that you can understand me. I think we both need some time now to digest all that. Call me when you''re feeling better."'
-				else
-					otnBoyFrend[numnpc] = 0
-					gs 'stat'
-
-					'<<$nameBoyfrend[numnpc]>> narrows his eyes, "Just friends, huh? That''s a pretty lame excuse, <<$pcs_firstname>>, you know that? If you want to break up with me then why don''t you say so!"'
-					'You try to explain to him, "No, that''s not what I mean, <<$nameBoyfrend[numnpc]>>! I really like you..."'
-					'"You know what? You can stuff your friendship! I''m outta here!", with these words he storms off.'
+			gs 'willpower', 'misc', 'self', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Just be friends (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'misc', 'self', 'easy'
+					gs 'willpower', 'pay', 'self'
+					temprand = rand(0, 4)
+					'You nervously approach <<$nameBoyfrend[numnpc]>>, "Listen, <<$nameBoyfrend[numnpc]>>, I really like you, but I''m not ready for an intimate relationship right now. I think we should forget what happened between us and just be friends, okay?"'
+
+					if boytimes[numnpc] > 4 and otnBoyFrend[numnpc] >= 80 and temprand = 0:
+						otnBoyFrend[numnpc] -= 40
+						gnpcSex[numnpc] = 0
+						gs 'stat'
+
+						'<<$nameBoyfrend[numnpc]>> looks totally dejected as you tell him the bad news. You really feel pity for him. When you finish your speech there''s a moment of painful silence.'
+						'Then <<$nameBoyfrend[numnpc]>> takes a deep breath, looks you in the eyes and says, "That''s really hard on me, <<$pcs_firstname>>. But I respect your feelings. I like you, too... very much in fact! That''s why I''m willing to be your friend, even if it means that we can''t be a couple."'
+						'Wow, you didn''t expect that! Still, you feel touched by his devotion and give him a bear hug, smiling from ear to ear. "Thank you, <<$nameBoyfrend[numnpc]>>! I''m so glad that you can understand me. I think we both need some time now to digest all that. Call me when you''re feeling better."'
+					else
+						otnBoyFrend[numnpc] = 0
+						pcs_mood -= 10
+						gs 'stat'
+
+						'<<$nameBoyfrend[numnpc]>> narrows his eyes, "Just friends, huh? That''s a pretty lame excuse, <<$pcs_firstname>>, you know that? If you want to break up with me then why don''t you say so!"'
+						'You try to explain to him, "No, that''s not what I mean, <<$nameBoyfrend[numnpc]>>! I really like you..."'
+						'"You know what? You can stuff your friendship! I''m outta here!", with these words he storms off.'
+					end
+
+					act 'Leave':gt $loc, $metka
 				end
-
-				act 'Leave':gt $loc, $metka
+			else
+				act 'Just be friends (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 

File diff suppressed because it is too large
+ 509 - 458
locations/Gnpc2.qsrc


+ 17 - 12
locations/Gnpc_cinema.qsrc

@@ -20,19 +20,24 @@ act 'Watch the movie':
 	if otnBoyFrend[numnpc] < 80:
 		'You watched the movie a couple of hours sitting in a chair next to the guy.'
 
-		act 'Go to the exit':gt 'Gnpc2'
+		act 'Go to the exit': gt 'Gnpc2'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		'You have been watching a movie and suddenly felt a hand on my knee Man.'
 
-		act 'Remove his hands':
-			cls
-			pcs_dom += 1
-			otnBoyFrend[numnpc] -= 20
-			gs 'stat'
-			'You have removed palm guy with his knees and continued to watch the movie. Movie finally ended. In the hall lights went on and the screen went titles.'
-
-			act 'Go to the exit':gt 'Gnpc2'
-		end
+		gs 'willpower', 'misc', 'self', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Remove his hands (<<will_cost>> Willpower)':
+				cls
+				gs 'willpower', 'pay', 'self'
+				otnBoyFrend[numnpc] -= 20
+				gs 'stat'
+				'You have removed palm guy with his knees and continued to watch the movie. Movie finally ended. In the hall lights went on and the screen went titles.'
+
+				act 'Go to the exit': gt 'Gnpc2'
+			end
+		else
+			act 'Remove his hands (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 
 		act 'Ignore':
 			cls
@@ -40,12 +45,12 @@ act 'Watch the movie':
 			gs 'stat'
 			'You pretended that nothing happens and the guy started more actively stroking your leg. Movie finally ended. In the hall lights went on and the screen went titles.'
 
-			act 'Go to the exit':gt 'Gnpc2'
+			act 'Go to the exit': gt 'Gnpc2'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		'You have been watching the movies, and <<$nameBoyfrend[numnpc]>> put his hand on your foot and began to stroke your knee. Movie finally ended. In the hall lights went on and the screen went titles.'
 
-		act 'Go to the exit':gt 'Gnpc2'
+		act 'Go to the exit': gt 'Gnpc2'
 	end
 end
 

+ 53 - 44
locations/LakeBoyDy.qsrc

@@ -21,77 +21,86 @@ if $ARGS[0] = 'ride':
 end
 
 if $ARGS[0] = 'go':
-	act'Try to get away':
+	act 'Try to get away':
 		cls
 		minut+=5
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 		'You don''t like where this is going at all. You attempt to get up and walk away, but the bald man immediately grabs your wrist, pulling you back down.'
 		'"Relax girl, you don''t have to go. Are you nervous or something?"'
-		if pcs_dom>0:
-			act'Apologize and leave':
+		gs 'willpower', 'misc', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Apologize and leave (<<will_cost>> Willpower)':
 				cls
-				minut+=5
-				pcs_dom-=1
+				gs 'willpower', 'pay', 'self'
+				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 				'You assure him that you really need to get going, trying to hide the fact that you are indeed scared of him.'
 				'The guy lets go of your wrist and gives you an amicable smile: "Alright, girl. It''s a small world... I''m sure I will see you around". You rub your wrist as you leave, he was really quite rough about it.'
-				act 'Get away from him':gt'glake'
+				act 'Get away from him': gt 'glake'
 			end
+		else
+			act 'Apologize 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'You''re not nervous...':
+		act 'You''re not nervous...':
 			cls
-			minut+=5
+			minut += 5
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'You quietly say: "No... I''m not nervous", even though you''re afraid to look him in the eye. Well, that wasn''t very convincing.'
 			'The guy chuckles, and pulls you against his hairy chest. His sweaty hands are mauling your ass now.'
 			'As he feels you up, he tries to coax you into joining him, as if he owns you already: "I know you''re not, baby. You should come with me, I''ll show you a good time. You won''t regret it."'
 			
-			act 'Resist':gt 'LakeBoyDy', 'slap'
-			 
-			if pcs_dom>0:
-				act'Apologize and leave':
-					cls
-					minut+=5
-					pcs_dom-=1
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-					'You assure him that you really need to get going, trying to hide the fact that you are in fact quite scared of him.'
-					'The guy lets go of your ass and gives you an amicable smile: "Alright, girl. It''s a small world... I''m sure I will see you around". You rub your wrist as you leave, he was really quite rough about it.'
-					act 'Get away from him':gt'glake'
-				end
+			act 'Resist': gs 'LakeBoyDy', 'slap'
+			
+			act 'Apologize and leave':
+				cls
+				minut += 5
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
+				'You assure him that you really need to get going, trying to hide the fact that you are in fact quite scared of him.'
+				'The guy lets go of your ass and gives you an amicable smile: "Alright, girl. It''s a small world... I''m sure I will see you around". You rub your wrist as you leave, he was really quite rough about it.'
+				act 'Get away from him': gt 'glake'
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'slap':
-	if pcs_dom > 0: 
-		act 'Tell him to fuck off':
+	gs 'willpower', 'misc', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Tell him to fuck off (<<will_cost>> Willpower)':
 			cls
-			minut+=5
-			pcs_dom+=2
+			gs 'willpower', 'misc', 'resist', 'easy'
+			gs 'willpower', 'pay', 'resist'
+			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'You yell at him and tell him to get away from you. Your shouting quickly catches the attention of other people nearby and the bald man leaves quickly, not having expected your resistance.'
 			act 'Get away from him':gt'glake'		
 		end
+	else
+		act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	if (pcs_jab + pcs_punch + pcs_kick + pcs_def) > 150:
-		!! simple skill check as long as fight system is so clumsy
-		act 'Kick him in the balls':
+	! Changing these fighting skills to a simple strength check
+	!if (pcs_jab + pcs_punch + pcs_kick + pcs_def) > 150:
+	gs 'willpower', 'skill', 'resist', 'stren_lvl'
+	if will_cost <= pcs_willpwr:
+		act 'Kick him in the balls (<<will_cost>> Willpower)':
 			cls
-			minut+=5
-			pcs_dom+=2
+			gs 'willpower', 'skill', 'resist', 'stren_lvl'
+			gs 'willpower', 'pay', 'resist'
+			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'You''re angry at this guy and his harassment, so you decide to knee him in the balls. He did not expect such a reaction and you score a perfect hit. The bald man bends over and drops on the ground, whincing from pain.'
 			'You pack up your things and go.'
 			act 'Leave him lying in the sand':gt'glake'			
 		end
+	else
+		act 'Kick him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Tell him to let go':
 		cls
@@ -103,7 +112,7 @@ if $ARGS[0] = 'slap':
 
 		act'Complain about the pain':
 			cls
-			minut+=5
+			minut += 1
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'His hand has your wrist gripped like it''s in a vice, and you involuntarily shriek in pain: "Ow! Please let me go, you''re hurting me!"'
@@ -112,7 +121,7 @@ if $ARGS[0] = 'slap':
 
 			act 'Try to placate him':
 				cls
-				minut+=5
+				minut+=1
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 				'The way his friend is twisting your arm behind your back hurts a lot, combined with the tight grip he still has on your wrist. Your screaming is making the other visitors on the beach uncomfortable, and none of them want to mess with the scary guys who are holding you down. Instead, you notice everyone quickly gathering their belongings and disappearing from the beach, some of them giving you an apologetic look as they run off. Within seconds, it''s just you, him and his scary friend remaining.'
@@ -121,14 +130,14 @@ if $ARGS[0] = 'slap':
 
 				act'Offer him money':
 					cls
-					minut+=5
+					minut += 1
 					npc_QW['A113'] = 1
 					daybelisex = daystart
-					if money<10000:
-						belgangPay=50000
+					if money < 10000:
+						belgangPay = 50000
 					end
-					if money>=10000:
-						belgangPay=money*5
+					if money >= 10000:
+						belgangPay = money * 5
 					end
 					gs'stat'
 					if week = 7:
@@ -145,9 +154,9 @@ if $ARGS[0] = 'slap':
 					'He slaps you in the face, while his friend still has your arm twisted behind your back. "Did you hear me, girl? I said <<belgangPay>> fucking <b>₽</b>."'
 					act'Agree to pay him':
 						cls
-						minut+=5
+						minut += 2
 						gs'stat'
-						belgangday=daystart
+						belgangday = daystart
 						belgangPayWeekAmount = 5000
 						belgangPayWeek = 0
 						belgangPayextension = 0
@@ -161,7 +170,7 @@ if $ARGS[0] = 'slap':
 						end						
 						act 'Accept':
 							cls
-							minut+=5
+							minut += 1
 							belgangProstitute = 0
 							gs'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
@@ -182,7 +191,7 @@ if $ARGS[0] = 'slap':
 						end
 						act 'Beg him to reduce the weekly rate':
 							cls
-							minut+=5
+							minut += 1
 							gs'stat'
 							belgangPayWeekAmount = 4000
 							belgangPayWeek = 0
@@ -198,7 +207,7 @@ if $ARGS[0] = 'slap':
 				 
 					act 'You can''t afford that':
 						cls
-						minut+=5
+						minut += 2
 						belgangPayWeekAmount = 3000
 						belgangPayWeek = 0
 						belgangPayextension = 0
@@ -219,12 +228,12 @@ end
 
 if $ARGS[0] = 'sucksasha':
 	cls
-	if sashaBeliSex=0:sashaBeliSex=1&guy+=1
+	if sashaBeliSex = 0: sashaBeliSex = 1 & guy += 1
 	spafinloc = 12
 	gs 'cum_manage'
 	belgangday = daystart
 	belgangProstitute = 1
-	swallow +=1
+	swallow += 1
 	gs 'stat'
 	
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/beachblow.jpg"></center>'

+ 30 - 10
locations/LakeBoyZ.qsrc

@@ -7,40 +7,50 @@ $gL_boy_z = {
 		randvnesh = rand(40,120)
 		if rand(0,10) = 0 and pcs_apprnc >= randvnesh:
 			'<<$boydesc>> smiles as he says, "You''re a pretty cool girl. Maybe we can hang out again?"'
-			act 'Smile and leave':gt'glake'
+			act 'Smile and leave': gt 'glake'
 			act 'Give him your phone number':
 				cls
 				pcs_mood += 10
 				gs 'boy', 'details'
 				if rand(0,2) = 0: gs 'boyfrend','start'
-				minut += 15
+				minut += 5
 				bmFrend[Tboynum] = 1
 				gs 'stat'
 				'You give <<$boydesc>> your phone number and he adds it to his contact list.'
 				'He then excuses himself and leaves, promising to call you.'
-				act 'Return':gt'glake'
+				act 'Return': gt 'glake'
 			end
 		else
 			'<<$boydesc>> sits closer to you and offers you a cold beer.'
 			act 'Smile and leave':gt'glake'
 			act 'Drink beer':
 				cls
-				minut+=15
+				minut += 15
 				gs 'drugs', 'alcohol', 'beer', 1
-				gs'stat'
+				gs 'stat'
 				'You drink beer with the guy, and the two of you chat for a while.'
 				'Suddenly, he puts his hand on your thigh.'
 				'"Another beer, <<$pcs_nickname>>?"'
-				act 'Thank him for the beer and leave':gt'glake'
+				gs 'willpower', 'drink', 'resist', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'Thank him for the beer and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
+				else
+					act 'Thank him for the beer 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 some more beer':
 					cls
 					gs 'drugs', 'alcohol', 'beer', 1
-					gs 'arousal', 'foreplay', 15
+					gs 'arousal', 'foreplay', 5
 					gs 'stat'
 					'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."'
-						act 'Push him away and leave':gt'glake'
+						gs 'willpower', 'misc', 'resist', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Push him away and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
+						else
+							act 'Push him away 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 'Kiss him':
 							cls
 							gs 'arousal', 'kiss', 5
@@ -48,7 +58,12 @@ $gL_boy_z = {
 							gs 'stat'
 							'You passionately kiss <<$boydesc>>, as he continues to caress your body, paying particular interest to your breasts.'
 							'<<$boydesc>> invites you to his house.'
-							act 'Call it a day and leave':gt'glake'
+							gs 'willpower', 'sex', 'resist', 'easy'
+							if will_cost <= pcs_willpwr:
+								act 'Call it a day and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
+							else
+								act 'Call it a day 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 'Follow him to his house':
 								if $clothingworntype = 'nude':
 									gs 'clothing', 'wear_last_worn'
@@ -75,7 +90,12 @@ $gL_boy_z = {
 							gs'stat'
 							'You quickly get changed into your regular clothes and go for a walk with <<$boydesc>>.'
 							'<<$boydesc>> invites you over to his house.'
-							act 'Call it a day and leave':gt'pavResidential'
+							gs 'willpower', 'sex', 'resist', 'easy'
+							if will_cost <= pcs_willpwr:
+								act 'Call it a day and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
+							else
+								act 'Call it a day 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 'Follow him to his house':gt'LBZhouse'
 						end
 					end

+ 5 - 5
locations/anushkaev1.qsrc

@@ -320,7 +320,7 @@ if $ARGS[0] = 'watch_nushrad':
 			act 'Keep watching':
 				*clr & cla
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad4.jpg"></center>'
-				'Just as she is starting to moan in pleasure even louder than him, he pulls out of her and flips her over, grabbing her ass and giving her ass a hard squeeze, followed by another hard slap that leaves a red outline of his hand on her bare ass, causing her to yelp again. "Fuck you have such a nice ass Nush." He tells her, she apparently knows what that means, as she quickly grabs the bottle of lube out of her night stand. But before she can use it, he grabs it from her. "Give me that, you always use to much." He growls, then he squirts just a little onto the head of his dick, rubbing it down the shaft of his dick. Once done with that he briefly rubs his fingers between her butt cheeks. It doesn''t look like he used much lube to you, nor hardly applied any to her.'
+				'Just as she is starting to moan in pleasure even louder than him, he pulls out of her and flips her over, grabbing her ass and giving her ass a hard squeeze, followed by another hard slap that leaves a red outline of his hand on her bare ass, causing her to yelp again. "Fuck you have such a nice ass Nush." He tells her, she apparently knows what that means, as she quickly grabs the bottle of lube out of her night stand. But before she can use it, he grabs it from her. "Give me that, you always use too much." He growls, then he squirts just a little onto the head of his dick, rubbing it down the shaft of his dick. Once done with that he briefly rubs his fingers between her butt cheeks. It doesn''t look like he used much lube to you, nor hardly applied any to her.'
 				*nl
 				'He pushes her down until she is laying on her stomach, as he tosses the bottle aside and then leans forward, pushing his dick between her butt cheeks as struggles a bit. "Rad you didn''t use enough lube." She says as she winces as he keeps struggling to push his dick between her butt cheeks. "Shut up Nush, this feels better, you feel really tight." He says just as shoves his hips forward hard, which causes her to jump a little and cry out in pain. "Ow fuck Rad, that hurt, you need to use more lube." She says in a obviously pain stressed voice. He pushes her head against the mattress. You can see her wincing in pain and white knuckling her grip on the bed sheets. "See I knew you didn''t need much lube, fuck your ass is tight." He says as he struggles to force himself balls deep into her ass, moaning in pleasure as he does.'
 				gs 'arousal', 'voyeur', 5
@@ -344,7 +344,7 @@ if $ARGS[0] = 'watch_nushrad':
 						act 'Keep watching':
 							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad7.jpg"></center>'
-							'She starts pulling away, even the hand on her hip doesn''t completely stop her from pulling away. He leans forward as she does, putting more weight on her, slowly her hips move down more than away until she is laying flat on her stomach again. He clamps his hands on hips, pinning her in place between him and the mattress, to keep her from pulling away more. Her bed sheets are tightly balled up in her clenched fists as she white knuckle grips the sheets. "Please Rad just slow down a little, please!" She pleads with him. He ignores her pleas and continues to hammer her ass with full hard strokes. He starts moaning louder, "Fuck yes, god damn your ass is so fucking tight, I''m about to bust a nut." If you had to guess she is more than ready for him to finish.'
+							'She starts pulling away, even the hand on her hip doesn''t completely stop her from pulling away. He leans forward as she does, putting more weight on her, slowly her hips move down more than away until she is laying flat on her stomach again. He clamps his hands on her hips, pinning her in place between him and the mattress, to keep her from pulling away more. Her bed sheets are tightly balled up in her clenched fists as she white knuckle grips the sheets. "Please Rad just slow down a little, please!" She pleads with him. He ignores her pleas and continues to hammer her ass with full hard strokes. He starts moaning louder, "Fuck yes, god damn your ass is so fucking tight, I''m about to bust a nut." If you had to guess she is more than ready for him to finish.'
 							gs 'arousal', 'voyeur', 5
 							gs 'stat'
 							act 'Leave apartment': gt 'pavComplex','start'
@@ -353,7 +353,7 @@ if $ARGS[0] = 'watch_nushrad':
 								'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad8.jpg"></center>'
 								'He suddenly pulls his dick out of her ass and starts cumming all over her ass cheeks, moaning loudly as he does. While she lets out a relieved sigh, as a relieved look washes over her face, obviously glad he is finally finished. When he finishes cumming on her ass, he lets go of her and steps away. "Fuck Nush you are the best fucking slut, I have ever fucked. I''ll never get tired of fucking your tight little ass."'
 								*nl
-								'Despite how he treated her, she looks back to him with a smile and seems to be basking in the praise he is now giving her. He barely even looks back at her as he starts getting dressed, as she start to wipe the cum from her ass and get dressed as well. "Well I got to go, got things to do." He pauses a moment when he notices how gingerly she is moving. "You good Nush?" She gives him are you kidding me look, followed by a fairly dirty look. "No my fucking asshole feels like it''s on fire now!" He laughs loudly at that, apparently finding it pretty funny. "What can I say? Sucks to be a hoe! Aching holes is your lot in laugh." Then with out another glance or word he strides for the door, she flips him off behind his back and mutters. "Asshole."'
+								'Despite how he treated her, she looks back to him with a smile and seems to be basking in the praise he is now giving her. He barely even looks back at her as he starts getting dressed, as she start to wipe the cum from her ass and get dressed as well. "Well I got to go, got things to do." He pauses a moment when he notices how gingerly she is moving. "You good Nush?" She gives him are you kidding me look, followed by a fairly dirty look. "No my fucking asshole feels like it''s on fire now!" He laughs loudly at that, apparently finding it pretty funny. "What can I say? Sucks to be a hoe! Aching holes is your lot in life." Then with out another glance or word he strides for the door, she flips him off behind his back and mutters. "Asshole."'
 								gs 'arousal', 'voyeur', 5
 								gs 'stat'
 								gs 'arousal', 'end'
@@ -375,7 +375,7 @@ if $ARGS[0] = 'watch_nushrad':
 											'"Well you could not be so rough with her." You tell him.'
 											'He snorts and shakes his head. "Please she is like all you bitches, she loves every moment of it. I could come back her later tonight, she would just roll over and spread those ass cheeks for me, and let me fuck her ass again. No matter how much she whines and cries about it she is always ready for another good ass fucking."'
 											*nl
-											'You are not really sure what to say, if what he saying is true it is kinda hard to dispute it. If she didn''t on some level like it, why would she keep letting him do it? You don''t get to find out, while you was thinking about it. He walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
+											'You are not really sure what to say, if what he saying is true it is kinda hard to dispute it. If she didn''t on some level like it, why would she keep letting him do it? You don''t get to find out, while you were thinking about it. He walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
 											act 'Go in her room': gt 'anushapt','anushroom'
 										end
 									else
@@ -392,7 +392,7 @@ if $ARGS[0] = 'watch_nushrad':
 											'"Well you don''t have to be so rough with her." You tell him.'
 											'He snorts and shakes his head. "Please she is like all you bitches, she loves every moment of it. I could come back her later tonight, she would just roll over and spread those ass cheeks for me, and let me fuck her ass again. No matter how much she whines and cries she is always ready for another good ass fucking." Then pauses a moment. "Well you will understand if you ever find a guy willing to fuck you at least." He says as if the meer thought of it disgusts him.'
 											*nl
-											'You are not really sure what to say, if what he saying is true it is kinda hard to dispute it. If she didn''t on some level like it, why would she keep letting him do it? You don''t get to find out, while you was thinking about it. He walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
+											'You are not really sure what to say, if what he saying is true it is kinda hard to dispute it. If she didn''t on some level like it, why would she keep letting him do it? You don''t get to find out, while you were thinking about it. He walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
 											act 'Go in her room': gt 'anushapt','anushroom'
 										end
 									end

+ 3 - 12
locations/brother.qsrc

@@ -1252,10 +1252,7 @@ if $ARGS[0] = 'brother_voyeur_ev6':
 
 		gs 'willpower', 'exhib', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Refuse and get dressed (<<will_cost>> Willpower)':
-				gs 'willpower', 'pay', 'resist'
-				gt $loc, $metka
-				end
+			act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
 		else
 			act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -1267,10 +1264,7 @@ if $ARGS[0] = 'brother_voyeur_ev6':
 
 		gs 'willpower', 'exhib', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Refuse and get dressed (<<will_cost>> Willpower)':
-				gs 'willpower', 'pay', 'resist'
-				gt $loc, $metka
-				end
+			act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
 		else
 			act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -1351,10 +1345,7 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 
 			gs 'willpower', 'exhib', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse and get dressed (<<will_cost>> Willpower)':
-					gs 'willpower', 'pay', 'resist'
-					gt $loc, $metka
-					end
+				act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
 			else
 				act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end

+ 2 - 2
locations/cityTrain.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = 'village':
 	menu_off = 1
 	minut += 25
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 25 minutes, the train stops at the small station near the village of Gadukino.'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'oldtown':
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'After 35 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'

+ 281 - 78
locations/clener.qsrc

@@ -28,11 +28,11 @@ if $ARGS[0] = 'start':
 		act 'Talk to Yuri':
 			cla
 			menu_off = 1
-			minut += 15
+			minut += 5
 			gs 'stat'
 			'Still smiling he says, "<<$pcs_nickname>>, want to grab a cup of coffee?"'
 
-			act 'Decline':jouryQwNo = 1 & gt 'clener', 'start'
+			act 'Decline': jouryQwNo = 1 & gt 'clener', 'start'
 
 			act 'Accept':
 				*clr & cla
@@ -41,9 +41,9 @@ if $ARGS[0] = 'start':
 				'You nod and the two of you head off to the café, where Yuri orders coffee. You sit down at the table and begin to sip on your coffee. Yuri is painfully quiet, he has no sense of humor and is very stiff.'
 				'It''s pretty clear that he likes you, but he does not know how to put a move on you. As you finish the coffee Yuri finally suggests if you want to follow him to his home.'
 
-				act 'No':jouryQwNo = 1 & gt 'clener', 'start'
+				act 'No': jouryQwNo = 1 & gt 'clener', 'start'
 
-				act 'Go with Yuri':gt 'youry', 'quest'
+				act 'Go with Yuri': gt 'youry', 'quest'
 			end
 		end
 	end
@@ -71,50 +71,51 @@ if $ARGS[0] = 'start':
 
 					act 'Have a drink':
 						cla
-						if pcs_hydra >= 100:
-							pcs_hydra -= 5
-						else
-							pcs_hydra -= 10
-						end
+						gs 'drugs', 'alcohol', 'vodka'
+						pcs_energy += 10
+						fat += 2
+						gs 'stat'
 						'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.'
 
 						act 'Smile':
 							cla
-							minut += 15
+							minut += 10
 							pcs_horny += 10
-							if pcs_hydra >= 100:
-								pcs_hydra -= 5
-							else
-								pcs_hydra -= 10
-							end
+							gs 'drugs', 'alcohol', 'vodka'
 							gs 'stat'
 							'You smile and Sasha pours more vodka, not stopping his caressing of your buttocks.'
 
-							if pcs_horny < 50:dynamic $borodachNo2
+							if pcs_horny < 50: gs 'clener', 'borodachNo2'
 
-							dynamic $borodachDrink
+							gs 'clener', 'borodachDrink'
 						end
 
-						act 'Put your hand on his pants':
-							*clr & cla
-							borodachTimes += 1
-							gs 'stat'
-
-							picrand = rand(0, 2)
-
-							if picrand = 0:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj.jpg"></center>'
-							if picrand = 1:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj1.jpg"></center>'
-							if picrand = 2:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj2.jpg"></center>'
-
-							'You put your hand on his crotch and feel his erection harden. Your thin fingers slide over his hardon and find the zipper. You unzip him and get his cock out of his pants. Sasha relaxes on the couch waiting for you to continue what you started.'
-							
-							gs 'arousal', 'foreplay', 15
-							gs 'stat'
-							
-							
-							dynamic $ohrhj
-							dynamic $ohrbj
+						gs 'willpower', 'hj', 'self'
+						if will_cost <= pcs_willpwr:
+							act 'Put your hand on his pants (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'self'
+								borodachTimes += 1
+								gs 'stat'
+
+								picrand = rand(0, 2)
+
+								if picrand = 0:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj.jpg"></center>'
+								if picrand = 1:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj1.jpg"></center>'
+								if picrand = 2:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj2.jpg"></center>'
+
+								'You put your hand on his crotch and feel his erection harden. Your thin fingers slide over his hardon and find the zipper. You unzip him and get his cock out of his pants. Sasha relaxes on the couch waiting for you to continue what you started.'
+								
+								gs 'arousal', 'foreplay', 5
+								gs 'stat'
+								
+								
+								gs 'clener', 'ohrhj'
+								gs 'clener', 'ohrbj'
+							end
+						else
+							act 'Put your hand on his pants (<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
@@ -146,9 +147,14 @@ if $ARGS[0] = 'start':
 				'You nod, "Yes, the pay is pretty bad but I need the job..."'
 				'"By the way, I''m Sasha, and you''re?"'
 				'"<<$pcs_nickname>>." you politely answer.'
-				'"Nice name... I was just thinking about heading on a break, would you like to join me?"'
+				'"Nice name... I was just thinking about heading on a break, would you like to join me for a drink?"'
 
-				act 'Sorry, I have to go':gt 'clener', 'start'
+				gs 'willpower', 'drink', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Sorry, I have to go (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+				else
+					act 'Sorry, I have to go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
 
 				act 'Why not':
 					cla
@@ -158,40 +164,40 @@ if $ARGS[0] = 'start':
 
 					act 'Have a drink':
 						cla
-						if pcs_hydra >= 100:
-							pcs_hydra -= 5
-						else
-							pcs_hydra -= 10
-						end
+						gs 'drugs', 'alcohol', 'vodka'
+						pcs_energy += 10
+						fat += 2
+						gs 'stat'
 						'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.'
 
-						act 'React':
-							cla
-							minut += 15
-							pcs_horny += 10
-							gs 'stat'
-							'"Hey! What are you doing?" you ask.'
-							'"Relax, it was merely an accident." Sasha starts muttering as he pours another shot, "Let''s have a drink."'
+						gs 'willpower', 'misc', 'self'
+						if will_cost <= pcs_willpwr:
+							act 'React (<<will_cost>> Willpower)':
+								cla
+								gs 'willpower', 'pay', 'self'
+								minut += 10
+								pcs_horny += 10
+								gs 'stat'
+								'"Hey! What are you doing?" you ask.'
+								'"Relax, it was merely an accident." Sasha starts muttering as he pours another shot, "Let''s have a drink."'
 
-							if pcs_horny < 50:dynamic $borodachNo
+								if pcs_horny < 50: gs 'clener', 'borodachNo'
 
-							dynamic $borodachDrink
+								gs 'clener', 'borodachDrink'
+							end
+						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
 
 						act 'Pretend not to notice':
 							cla
-							if pcs_hydra >= 100:
-								pcs_hydra -= 5
-							else
-								pcs_hydra -= 10
-							end
-							minut += 15
-							pcs_horny += 15 + SUB
+							minut += 10
+							pcs_horny += 15
 							gs 'stat'
 							'You continue on as usual, trying not to pay attention to it, since it was only a casual touch. Sasha pours more vodka and says, "The second shot always tastes better." as he takes another quaff.'
-							if pcs_horny < 50:dynamic $borodachNo
-							dynamic $borodachDrink
+							if pcs_horny < 50: gs 'clener', 'borodachNo'
+							gs 'clener', 'borodachDrink'
 						end
 					end
 				end
@@ -230,7 +236,7 @@ if $ARGS[0] = 'start':
 				clener = 2
 				'You agree to work as a cleaner.'
 
-				act 'Leave':gt 'clener', 'start'
+				act 'Leave': gt 'clener', 'start'
 			end
 		end
 	end
@@ -248,7 +254,7 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 
 			if clener < 5:
-				if hour >= 9 and hour <= 16:'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor.'
+				if hour >= 9 and hour <= 16: 'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor.'
 			elseif clener >= 5 and clener < 10:
 				if hour >= 9 and hour <= 16:
 					jouryQw += 1
@@ -268,10 +274,10 @@ if $ARGS[0] = 'start':
 					act 'No':
 						cla
 						jouryQwNo = 1
-						'You look angerly at him, "No, I don''t mix business with pleasure..." Yuri looks dejected as he moves away from you.'
+						'You look angrily at him, "No, I don''t mix business with pleasure..." Yuri looks dejected as he moves away from you.'
 						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
-						act 'Leave':gt 'clener', 'start'
+						act 'Leave': gt 'clener', 'start'
 					end
 
 					act 'Yes':
@@ -282,19 +288,19 @@ if $ARGS[0] = 'start':
 						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 						'As you leave, you notice Yuri awiting you. He''s pretty nervous and it seems as if he doesn''t know what to do. Not knowing what to say, he blurts out, "How about we head over to my place, watch some movies, drink champagne and talk."'
 
-						act 'No':jouryQwNo = 1 & gt 'clener', 'start'
+						act 'No': jouryQwNo = 1 & gt 'clener', 'start'
 
-						act 'Go with Yuri':gt 'youry', 'quest'
+						act 'Go with Yuri': gt 'youry', 'quest'
 					end
 
 					exit
 				end
 
-				if jouryQw > 7 and hour >= 9 and hour <= 16 and jourySex = 0:'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor. Yuri looks at you studying every inch of your figure.'
-				if jouryQw > 7 and hour >= 9 and hour <= 16 and jourySex > 0:'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor. Yuri pretends not to notice you in the office.'
+				if jouryQw > 7 and hour >= 9 and hour <= 16 and jourySex = 0: 'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor. Yuri looks at you studying every inch of your figure.'
+				if jouryQw > 7 and hour >= 9 and hour <= 16 and jourySex > 0: 'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor. Yuri pretends not to notice you in the office.'
 			end
 
-			if hour < 9 or hour > 16:'The office is empty of people, you quietly wash the floor and wipe the floor in the office.'
+			if hour < 9 or hour > 16: 'The office is empty of people, you quietly wash the floor and wipe the floor in the office.'
 
 			'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
@@ -322,19 +328,23 @@ if $ARGS[0] = 'start':
 					'You let go off your cleaning stuff and look straight into Yuri''s eyes, asking him, "Are you ashamed of me?"'
 					'Yuri stammers, "I-I''m not embarrassed by you being a cleaner, but you must understand, I''m a manager, and you''re the cleaning lady. We must not be seen together. But I want you to keep seeing you. You know where I live, come by my place after 16:00."'
 
-					act 'Fuck you':
-						cla
-						pcs_dom += 1
-						jouryResult = 1
-						'You''re offended by his behaviour and without any hesitation you tell Yuri to go to hell. He quickly turns and walks away.'
-						'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
+					gs 'willpower', 'misc', 'self'
+					if will_cost <= pcs_willpwr:
+						act 'Fuck you (<<will_cost>> Willpower)':
+							cla
+							gs 'willpower', 'pay', 'self'
+							jouryResult = 1
+							'You''re offended by his behaviour and without any hesitation you tell Yuri to go to hell. He quickly turns and walks away.'
+							'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
 
-						act 'Leave':gt 'clener', 'start'
+							act 'Leave':gt 'clener', 'start'
+						end
+					else
+						act 'Fuck you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 
 					act 'Okay.':
 						cla
-						sub += 1
 						jouryResult = 10
 						'Yuri only sees you as a simple fuck whore. But you''re willing to put up with it and agree to visit him afterwards. Yuri nods in satisfaction and leaves the toilet.'
 						'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
@@ -388,5 +398,198 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'borodachNo':
+	menu_off = 1
+	act 'I''ve had enough':
+		cla
+		minut += 5
+		gs 'stat'
+		'You refuse to drink and start to leave. The guard tries to persuade you to stay with him and continue.'
+
+		gs 'willpower', 'drink', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+		else
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		gs 'clener', 'borodachDrink'
+	end
+end
+
+if $ARGS[0] = 'borodachNo2':
+	menu_off = 1
+	act 'I have to go now':
+		cla
+		minut += 5
+		gs 'stat'
+		'You gather your things and start to leave, Sasha tries to persuade you to stay with him and continue.'
+
+		gs 'willpower', 'sex', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+		else
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		gs 'clener', 'borodachSex'
+	end
+end
+
+if $ARGS[0] = 'borodachDrink':
+	menu_off = 1
+	act 'Another drink':
+		cla
+		minut += 15
+		pcs_horny += 20
+		gs 'stat'
+		'You drink and eat some more cheese, you realize that you are happily drunk. The guard''s hand does not stop caressing your ass.'
+		gs 'clener', 'borodachNo2'
+		gs 'clener', 'borodachSex'
+	end
+end
+
+if $ARGS[0] = 'borodachSex':
+	menu_off = 1
+	act 'Relax':
+		cla
+
+		if borodachSex = 0:borodachSex = 1 & guy += 1
+		'You calm down and begin to enjoy the hands caressing you. Sasha has openly embraced and started kissing you.'
+		'His hands slide under your clothes, unbuttoning and removing them. Soon he has exposed your chest and begins to suck your nipples.'
+
+		gs 'arousal', 'foreplay', 5 
+		gs 'stat'
+		
+		act 'Lie down on the sofa':
+			*clr & cla
+			gs 'stat'
+			borodachSexDay = daystart
+			pose = 0
+			gs 'boyStat', 'A39'
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
+			'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> cm dick, his fingers begin to caress your pussy, preparing it for entry.'
+			
+			gs 'arousal', 'vaginal_finger', 5
+			gs 'arousal', 'vaginal', 15
+			gs 'stat'
+			
+			gs 'orgazm', 'start'
+
+			act 'Leave':gt 'street'
+		end
+	end
+end
+
+if $ARGS[0] = 'ohrhj':
+	menu_off = 1
+	act 'Masturbate him':
+		cla
+		'You start stroking his cock with your delicate hands. Quickly Sasha groans, "I can''t hold on much longer."'
+		
+		gs 'arousal', 'hj', 5, 'dom'
+		gs 'stat'
+		
+		gs 'clener', 'ohrbj'
+		gs 'clener', 'ohrhjcum'
+		gs 'clener', 'ohrsex'
+	end
+end
+
+if $ARGS[0] = 'ohrhjcum':
+	menu_off = 1
+	act 'Masturbate him more':
+		*clr & cla
+		borodachSexDay = daystart
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hjcum.jpg"></center>'
+		'Sasha groans and his cock enthusiastically paints your hand white.'
+
+		gs 'arousal', 'hj', 5, 'dom'
+		gs 'stat'
+		
+		act 'Leave':gt 'street'
+	end
+end
+
+if $ARGS[0] = 'ohrbj':
+	menu_off = 1
+	act 'Suck him':
+		*clr & cla
+		picrand = rand(1, 4)
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/bj<<picrand>>.jpg"></center>'
+
+		'You wrap your <<$liptalk>> around his strong and warm 15 cm cock and quickly begin by sucking the head, caressing it with your tongue and lips. Sasha groans, "I''m going to come."'
+		
+		gs 'arousal', 'bj', 5, 'sub'
+		gs 'stat'
+		
+		gs 'clener', 'ohrbjcum'
+		gs 'clener', 'ohrsex'
+	end
+end
+
+if $ARGS[0] = 'ohrbjcum':
+	menu_off = 1
+	act 'Suck harder':
+		*clr & cla
+		spafinloc = 12
+		gs 'cum_manage'
+		gs 'stat'
+		picrand = rand(1, 4)
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/bjcum<<picrand>>.jpg"></center>'
+		'You redouble your efforts, sucking his hard cock with your <<$liptalk>>. Hot sperm hits your mouth, again and again. You continue to suck, ignoring your mouth full of viscous sperm. Until he finally nothing left.'
+		
+		gs 'arousal', 'bj', 5, 'sub'
+		gs 'stat'
+
+		act 'Swallow sperm':
+			*clr & cla
+			borodachSexDay = daystart
+			gs 'stat'
+			picrand = rand(1, 3)
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/swallow<<picrand>>.jpg"></center>'
+			'You open your sperm filled mouth and show off your hard work, then swallow it.'
+
+			gs 'arousal', 'bj', 1, 'sub'
+			gs 'arousal', 'end'
+			gs 'stat'
+		
+			act 'Leave':gt 'street'
+		end
+
+		act 'Spit it out':
+			*clr & cla
+			borodachSexDay = daystart
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/spit.jpg"></center>'
+			'You open your sperm filled mouth and show off your hard work, then quickly find the sink and spit it out.'
+
+			gs 'arousal', 'bj', 1, 'sub'
+			gs 'arousal', 'end'
+			gs 'stat'
+			
+			act 'Leave':gt 'street'
+		end
+	end
+end
+
+if $ARGS[0] = 'ohrsex':
+	menu_off = 1
+	act 'Sex':
+		*clr & cla
+		gs 'stat'
+		borodachSexDay = daystart
+		pose = 0
+		gs 'boyStat', 'A39'
+		'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
+		'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> centimeter dick. His fingers begin to caress your pussy, preparing it for entry.'
+
+		gs 'arousal', 'vaginal_finger', 5
+		gs 'arousal', 'vaginal', 15, 'sub'
+		gs 'arousal', 'end'
+		gs 'stat'
+			
+		act 'Leave':gt 'street'
+	end
+end
 --- clener ---------------------------------
 

+ 0 - 187
locations/dinBoroda.qsrc

@@ -1,187 +0,0 @@
-# dinBoroda
-$borodachNo = {
-	menu_off = 1
-	act 'I''ve had enough':
-		cla
-		minut += 15
-		gs 'stat'
-		'You refuse to drink and start to leave. The guard tries to persuade you to stay with him and continue.'
-
-		if SUB < 10:act 'Leave':pcs_dom += 1 & gt 'clener', 'start'
-		dynamic $borodachDrink
-	end
-}
-
-$borodachNo2 = {
-	menu_off = 1
-	act 'I have to go now':
-		cla
-		minut += 15
-		gs 'stat'
-		'You gather your things and start to leave, Sasha tries to persuade you to stay with him and continue.'
-
-		if pcs_dom > 0 and pcs_horny < 50:act 'Leave':pcs_dom += 1 & gt 'clener', 'start'
-		dynamic $borodachSex
-	end
-}
-$borodachDrink = {
-	menu_off = 1
-	act 'Another drink':
-		cla
-		minut += 15
-		pcs_horny += 20
-		gs 'stat'
-		'You drink and eat some more cheese, you realize that you are happily drunk. The guard''s hand does not stop caressing your ass.'
-		dynamic $borodachNo2
-		dynamic $borodachSex
-	end
-}
-
-$borodachSex = {
-	menu_off = 1
-	act 'Relax':
-		cla
-
-		if borodachSex = 0:borodachSex = 1 & guy += 1
-		'You calm down and begin to enjoy the hands caressing you. Sasha has openly embraced and started kissing you.'
-		'His hands slide under your clothes, unbuttoning and removing them. Soon he has exposed your chest and begins to suck your nipples.'
-
-		gs 'arousal', 'foreplay', 5 
-		gs 'stat'
-		
-		act 'Lie down on the sofa':
-			*clr & cla
-			gs 'stat'
-			borodachSexDay = daystart
-			pose = 0
-			gs 'boyStat', 'A39'
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
-			'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> cm dick, his fingers begin to caress your pussy, preparing it for entry.'
-			
-			gs 'arousal', 'vaginal_finger', 5
-			gs 'arousal', 'vaginal', 25
-			gs 'stat'
-			
-			gs 'orgazm', 'start'
-
-			act 'Leave':gt 'street'
-		end
-	end
-}
-
-$ohrhj = {
-	menu_off = 1
-	act 'Masturbate him':
-		cla
-		'You start stroking his cock with your delicate hands. Quickly Sasha groans, "I can''t hold on much longer."'
-		
-		gs 'arousal', 'hj', 15, 'dom'
-		gs 'stat'
-		
-		dynamic $ohrbj
-		dynamic $ohrhjcum
-		dynamic $ohrsex
-	end
-}
-
-$ohrhjcum = {
-	menu_off = 1
-	act 'Masturbate him more':
-		*clr & cla
-		borodachSexDay = daystart
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hjcum.jpg"></center>'
-		'Sasha groans and his cock enthusiastically paints your hand white.'
-
-		gs 'arousal', 'hj', 15, 'dom'
-		gs 'stat'
-		
-		act 'Leave':gt 'street'
-	end
-}
-
-$ohrbj = {
-	menu_off = 1
-	act 'Suck him':
-		*clr & cla
-		picrand = rand(1, 4)
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/bj<<picrand>>.jpg"></center>'
-
-		'You wrap your <<$liptalk>> around his strong and warm 15 cm cock and quickly begin by sucking the head, caressing it with your tongue and lips. Sasha groans, "I''m going to come."'
-		
-		gs 'arousal', 'bj', 15, 'sub'
-		gs 'stat'
-		
-		dynamic $ohrbjcum
-		dynamic $ohrsex
-	end
-}
-
-$ohrbjcum = {
-	menu_off = 1
-	act 'Suck harder':
-		*clr & cla
-		spafinloc = 12
-		gs 'cum_manage'
-		gs 'stat'
-		picrand = rand(1, 4)
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/bjcum<<picrand>>.jpg"></center>'
-		'You redouble your efforts, sucking his hard cock with your <<$liptalk>>. Hot sperm hits your mouth, again and again. You continue to suck, ignoring your mouth full of viscous sperm. Until he finally nothing left.'
-		
-		gs 'arousal', 'bj', 15, 'sub'
-		gs 'stat'
-
-		act 'Swallow sperm':
-			*clr & cla
-			borodachSexDay = daystart
-			gs 'stat'
-			picrand = rand(1, 3)
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/swallow<<picrand>>.jpg"></center>'
-			'You open your sperm filled mouth and show off your hard work, then swallow it.'
-
-			gs 'arousal', 'bj', 15, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
-		
-			act 'Leave':gt 'street'
-		end
-
-		act 'Spit it out':
-			*clr & cla
-			borodachSexDay = daystart
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/spit.jpg"></center>'
-			'You open your sperm filled mouth and show off your hard work, then quickly find the sink and spit it out.'
-
-			gs 'arousal', 'bj', 15, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
-			
-			act 'Leave':gt 'street'
-		end
-	end
-}
-
-$ohrsex = {
-	menu_off = 1
-	act 'Sex':
-		*clr & cla
-		gs 'stat'
-		borodachSexDay = daystart
-		pose = 0
-		gs 'boyStat', 'A39'
-		'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
-		'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> centimeter dick. His fingers begin to caress your pussy, preparing it for entry.'
-
-		gs 'arousal', 'vaginal', 30, 'sub'
-		gs 'arousal', 'end'
-		gs 'stat'
-			
-		act 'Leave':gt 'street'
-	end
-}
-
-rikudootvet = 1415
-
---- dinBoroda ---------------------------------
-

+ 1 - 1
locations/dinParty.qsrc

@@ -364,7 +364,7 @@ if $ARGS[0] = 'dance':
 	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_gost_1_' + rand(1,7) + '.mp4"></video></center>'
 	'Moving to the rhythmic sounds, you indulge in an unrestrained dance.'
 	'You jump, sway your body, and rock your booty, losing yourself in the general merriment.'
-	if pcs_danc >= 50:'You move your body perfectly with the rhythm of the music in an erotic way, getting you a lot of attention from others and you love they attention.'
+	if pcs_danc >= 50:'You move your body perfectly with the rhythm of the music in an erotic way. This gets you a lot of attention from the others and you love their attention.'
 	if pcs_danc < 50:'Your ridiculous movements during the dance does not bother anyone, You dance badly, but you do not care.'
 	act 'Have a rest':gt $loc,$metka
 	act 'Dance more':gt 'dinParty', 'dance' 

+ 121 - 96
locations/gLakeNude.qsrc

@@ -8,9 +8,9 @@ $menu_arg = ''
 $locclass = 'beach'
 menu_off = 0
 *clr & cla
-gs'stat'
+gs 'stat'
 !!check to make sure I did the sound call correct
-if sound = 0:PLAY 'sound/lakeshore2.mp3',20
+if sound = 0: PLAY 'sound/lakeshore2.mp3',20
 '<center><H4>Secluded beach</H4></center>'
 if month >= 3 and month <= 5:
 	if hour >= 6 and hour <= 17:
@@ -58,10 +58,10 @@ act'Leave the secluded beach<<$tmp_lakenude_leave>>':
 	if $clothingworntype ! 'nude' or ($clothingworntype = 'nude' and pcs_inhib >= 60):
 		cla
 		minut += 10
-		gt'glake'
+		gt 'glake'
 	else
 		msg '<center>You are not willing to show off your naked body on the main beach, what would people say?</center>'
-		gt'gLakeNude'
+		gt 'gLakeNude'
 	end
 end
 killvar '$tmp_lakenude_leave'
@@ -76,43 +76,49 @@ if month >= 5 and month <= 9:
 	end
 		
 	if $clothingworntype ! 'nude' and (pcs_inhib > 30 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
-		act'Take off your clothes':
-			menu_off = 1
-			if pcs_inhib > 30:
-				*clr & cla
-				minut+=5
-				inhib_exp += rand(1,3)
-				gs 'clothing', 'strip'
-				gs 'underwear', 'remove'
-				if pcs_horny >= 80 and exhibitionist_lvl > 1:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
-					'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
-				elseif pcs_inhib >= 60:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-					'Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.'
-				elseif pcs_inhib < 60:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-					'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
+		gs 'willpower', 'exhib', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Take off your clothes (<<will_cost>> Willpower)':
+				gs 'willpower', 'exhib', 'self', 'easy'
+				gs 'willpower', 'pay', 'self'
+				menu_off = 1
+				if pcs_inhib > 30:
+					*clr & cla
+					minut += 5
+					inhib_exp += rand(1,3)
+					gs 'clothing', 'strip'
+					gs 'underwear', 'remove'
+					if pcs_horny >= 80 and exhibitionist_lvl > 1:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
+						'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
+					elseif pcs_inhib >= 60:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+						'Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.'
+					elseif pcs_inhib < 60:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+						'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
+					end
+				else
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/shyness.jpg"></center>'
+					'Even though no one is around, you don''t feel confident enough to actually take your clothes off. What if someone would see you nude?'
 				end
-			else
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/shyness.jpg"></center>'
-				'Even though no one is around, you don''t feel confident enough to actually take your clothes off. What if someone would see you nude?'
+				act 'Continue': gt 'gLakeNude'
 			end
-			act'Continue':gt'gLakeNude'
+		else
+			act 'Take off your clothes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif $clothingworntype = 'nude':
-		act'Put your clothes back on':
+		act 'Put your clothes back on':
 			*clr & cla
 			menu_off = 1
-			minut+=5
+			minut += 5
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
 			nudelake = rand(1,10)
 			if nudelake <= 2:
 				minut += 5
 				pcs_mood -= 5
-				pcs_willpwr -= 5
 				gs 'exhibitionism', 4
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/noclothes.jpg"></center>'
@@ -120,7 +126,7 @@ if month >= 5 and month <= 9:
 				act 'Run home naked': gt 'glake', 'nude_home'
 			else
 				'You return to the place where you left your clothes, and put them back on.'
-				act'Continue': gt 'gLakeNude'
+				act 'Continue': gt 'gLakeNude'
 			end
 		end
 	end
@@ -133,9 +139,8 @@ if temper >= 15 and month >= 5 and month <= 9:
 		*clr & cla
 		menu_off = 1
 		minut += 30
-		pcs_willpwr += 5
 		pcs_mood += 5
-		gs'stat'
+		gs 'stat'
 
 		if $clothingworntype = 'swimwear' and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
@@ -156,7 +161,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 	end
 	
 	if hour >= 6 and hour <= 20 and ($clothingworntype = 'swimwear' or $clothingworntype = 'nude'):
-		act'Go swimming (30 minutes)':
+		act 'Go swimming (30 minutes)':
 			menu_off = 1
 			*clr & cla
 			cumspclnt = 4
@@ -182,12 +187,12 @@ if temper >= 15 and month >= 5 and month <= 9:
 			'You play around and have fun in the lake, enjoying the feel of the warm water on your naked body. The clean lake water refreshes and invigorates you.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-			act 'Get out of the water':gt'gLakeNude'
+			act 'Get out of the water': gt 'gLakeNude'
 		end
 	end
 	
 	if sunWeather = 1 and hour >= 6 and hour <= 20  and ($clothingworntype = 'swimwear' or $clothingworntype = 'nude'):
-		act'Go sunbathing (30 minutes)':
+		act 'Go sunbathing (30 minutes)':
 			menu_off = 1
 			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 				*clr & cla
@@ -209,76 +214,90 @@ if temper >= 15 and month >= 5 and month <= 9:
 					pcs_tan = pcs_tan + 3
 					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
 				end
-				act 'Continue':gt'gLakeNude'
+				act 'Continue': gt 'gLakeNude'
 			else
 				cla
 				'You have to take off your clothes before you can lay down to sunbath.'
-				act'Continue':gt'gLakeNude'
+				act 'Continue': gt 'gLakeNude'
 			end
 		end
 	end
 	
 	if voyeurism_start = 0:
-		act'Look around the beach':
+		act 'Look around the beach':
 			*clr & cla
 			menu_off = 1
-			minut += 5
 			voyeurism_start_view = rand(1,3)
 			gs 'stat'
 			if voyeurism_start_view <= 2:
+				minut += 5
 				'<center><img <<$set_imgh>> src="images/locations/shared/lake/lake_beach1.jpg"></center>'
 				'You look around, but see nothing interesting. Just a few others in swimwear or relaxing on the beach.'
 			else
 				voyeurism_start = 1
 				voyeurism += 1
+				gs 'arousal', 'voyeur', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
 				'You look around and notice that a little ways off at the end of the small beach is a pair of lovers laying on the sand. The girl is completely naked and her hand is stroking the guy''s cock through his white pants. The guy turns his head and notices that you look at them. You immediately turn away, blushing terribly and begin to explore your feet as if seeing them for the first time.'
 			end
 			act'Back': gt 'gLakeNude'
 		end
 	elseif voyeurism_start = 1:
-		act'Watch couple on the beach':
-			*clr & cla
-			menu_off = 1
-			if voyeurism = 0:
-				minut += 5
-				voyeurism += 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/lake_legs.jpg"></center>'
-				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
-				act'Stop Watching!': gt'gLakeNude'
-			else
-				voyeurism_start = 2
-				minut += 50
-				pcs_horny += 75
-				voyeurism += 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
-				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
-				act'Watch the couple': 	gs'gLakeNudeEvent','gLakeNude_sex'
+		gs 'willpower', 'voyeur', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Watch couple on the beachs (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'voyeur', 'self'
+				gs 'willpower', 'pay', 'self'
+				menu_off = 1
+				if voyeurism = 0:
+					gs 'arousal', 'voyeur', 5
+					voyeurism += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/lake_legs.jpg"></center>'
+					'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
+					act'Stop Watching!': gt'gLakeNude'
+				else
+					voyeurism_start = 2
+					gs 'arousal', 'voyeur', 30
+					voyeurism += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
+					'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
+					act'Watch the couple': 	gs'gLakeNudeEvent','gLakeNude_sex'
+				end
 			end
+		else
+			act 'Watch couple on the beach (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif voyeurism_start = 2 and (pcs_horny < 90 or pav_slut < 50):
-		act 'Spy on other nudists on the beach':
-			menu_off = 1
-			gs 'stat'
-			if voyeurism_nudist <= 14 or pav_slut > 50:
-				voyeurism_nudist += 1
-				gs'gLakeNudeEvent','gLakeNude_nudist'
-				act'Continue': gt 'gLakeNude'
-			else
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/nudebeachself'+rand(1,3)+'.jpg"></center>'
-				'You want to watch for nudists, but suddenly notice that you start to feel weird.<br><dh>"Probably spying too much."</dh> you think and look straight ahead.'
-				act'Continue': gt'gLakeNude'
+		gs 'willpower', 'voyeur', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Spy on other nudists on the beach (<<will_cost>> Willpower)':
+				gs 'willpower', 'voyeur', 'self', 'easy'
+				gs 'willpower', 'pay', 'self'
+				menu_off = 1
+				gs 'stat'
+				if voyeurism_nudist <= 14 or pav_slut > 50:
+					voyeurism_nudist += 1
+					gs 'gLakeNudeEvent','gLakeNude_nudist'
+					act 'Continue': gt 'gLakeNude'
+				else
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/nudebeachself'+rand(1,3)+'.jpg"></center>'
+					'You want to watch for nudists, but suddenly notice that you start to feel weird.<br><dh>"Probably spying too much."</dh> you think and look straight ahead.'
+					act 'Continue': gt'gLakeNude'
+				end
 			end
 		end
-	end
+		else
+			act 'Spy on other nudists on the beach (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	if voyeurism >= 17 and voyeurism_start = 2:
 		if voyeurism_forest = 0:
-			act'Explore the forest': gt'gLakeNudeForest'
+			act 'Explore the forest': gt 'gLakeNudeForest'
 		else
-			act'Hide in the woods near the beach': gt'gLakeNudeForest'
+			act 'Hide in the woods near the beach': gt 'gLakeNudeForest'
 		end
 	end
 end
@@ -312,7 +331,7 @@ if $ARGS[0] = 'sauna':
 	end
 		
 	if $clothingworntype ! 'nude' and (pcs_inhib > 25 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
-		act'Take off your clothes':
+		act 'Take off your clothes':
 			*clr & cla
 			menu_off = 1
 			minut +=  5
@@ -323,14 +342,14 @@ if $ARGS[0] = 'sauna':
 			act 'Continue': gt 'gLakeNude', 'sauna'
 		end
 	else
-		act'Put your clothes back on':
+		act 'Put your clothes back on':
 			cla
 			menu_off = 1
 			minut += 5
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
 			'You put your clothes back on.'
-			act'Continue': gt 'gLakeNude', 'sauna'
+			act 'Continue': gt 'gLakeNude', 'sauna'
 		end
 	end
 	
@@ -345,7 +364,7 @@ if $ARGS[0] = 'sauna':
 				'It appears to be empty at the moment.'
 			else
 				saunarand = rand(1,5)
-				if saunarand = 1:
+				if saunarand = 4:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/womennude.jpg"></center>'
 					'You find several other girls inside completely naked using the sauna.'
 				elseif saunarand > 4:
@@ -382,7 +401,7 @@ if $ARGS[0] = 'sauna':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunaempty.jpg"></center>'
 			'It appears to be empty at the moment.'
-			act 'Leave': gt 'gLakeNude', 'sauna' 
+			act 'Leave': gt 'gLakeNude', 'sauna'
 			act 'Use the sauna':
 				*clr & cla
 				minut += 30
@@ -410,7 +429,7 @@ if $ARGS[0] = 'sauna':
 				'It appears to be empty at the moment.'
 			else
 				saunarand = rand(1,5)
-				if saunarand = 1:
+				if saunarand = 4:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/coednude.jpg"></center>'
 					'You find several other people in here, men and women. All of them completely naked.'
 				elseif saunarand > 4:
@@ -421,26 +440,32 @@ if $ARGS[0] = 'sauna':
 					'It appears to be empty at the moment.'
 				end
 			end
+			gs 'willpower', 'exhib', 'self', 'easy'
+			if saunarand < 4 or $clothingworntype = 'swimwear': will_cost = 0
+			if will_cost <= pcs_willpwr:
+				act iif(saunarand < 4 or $clothingworntype = 'swimwear', 'Use the sauna', 'Use the sauna (<<will_cost>> Willpower)'):
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					minut += 30
+					pcs_mood += 10
+					if $clothingworntype = 'swimwear':
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
+						if pcs_inhib < 40: inhib_exp += rand(0,1)
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunanude.jpg"></center>'
+						if pcs_inhib < 60: inhib_exp += rand(1,3)
+					end
+					gs 'stat'
+					'You spend 30 minutes relaxing in the sauna.'
 
-			act 'Leave': gt 'gLakeNude', 'sauna'
-			act 'Use the sauna':
-				*clr & cla
-				minut +=30
-				pcs_mood += 10
-				if $clothingworntype = 'swimwear':
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
-					if pcs_inhib < 40: inhib_exp += rand(0,1)
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunanude.jpg"></center>'
-					if pcs_inhib < 60: inhib_exp += rand(1,3)
-				end
-				gs 'stat'
-				'You spend 30 minutes relaxing in the sauna.'
-
-				act 'Leave': gt 'gLakeNude', 'sauna'
+					act 'Leave': gt 'gLakeNude', 'sauna'
 
-				if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
+					if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
+				end
+			else
+				act 'Use the sauna (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
+			act 'Leave': gt 'gLakeNude', 'sauna'
 		end
 	else
 		*nl

+ 14 - 14
locations/gLakeNudeEvent.qsrc

@@ -6,14 +6,14 @@ if $args[0] = 'gLakeNude_sex':
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_0.jpg"></center>'
 	'You tear your eyes from their beautiful legs and look around. You see that no one else is on the beach except you and the couple that''s getting hot and heavy. By now they are too into each other to pay attention to you. The girl slowly wraps her plump lips around the head of her man''s cock, pushing her ass into the air in a seductive pose.'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur', 1
 	gs 'stat'
 	act 'Continue watching':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_1.jpg"></center>'
 		'The gorgeous blonde wraps a delicate hand around the shaft of the engorged cock. She slowly begins pumping the base of her boyfriend''s dick as she sucks and licks around the head, never breaking eye contact. The stud''s abs tighten visibly as he draws in a breath of pleasure from blonde''s ministrations. You find yourself enthralled; unable to look away as a heat begins to build just below your belly.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur', 2
 		gs 'stat'
 		act 'Further':
 			cla
@@ -21,7 +21,7 @@ if $args[0] = 'gLakeNude_sex':
 			gs 'clothing','strip'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_2.jpg"></center>'
 			'Leaving your clothes lying on the sand, you move a little closer to the sexy couple, pretending that you''re just walking on the beach. You see the girl push her man''s legs further apart, allowing her to dip her head down and take one ball into her mouth, then the other. Once she returns to his throbbing cock, she opens her tight throat and takes it in further than before, almost 3/4 of the way down the impressive member'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Further':
 				cla
@@ -29,7 +29,7 @@ if $args[0] = 'gLakeNude_sex':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_3.jpg"></center>'
 				'Suddenly a strong wave rushes on shore and drenches them both. The water crashes up over the cock-hungry blonde''s legs and thighs, causing her throw her head up and gasp, the meaty phallus popping out her mouth. The couple make eye contact with each other and giggle lightly. "Let''s go swimming" you hear the hot woman say in a sultry voice.
 				As the pair start to get up a wave of panic rushes over you. You need to do duck away quickly; otherwise they''ll surely take notice of you and how you''re shaking from excitement.' 
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur', 1
 				gs 'stat'
 				act 'Further':
 					cla
@@ -52,28 +52,28 @@ if $args[0] = 'gLakeNude_sex':
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_6.jpg"></center>'
 							'The hot Adonis of a man gives his girl one hard smack on her plump ass. He then spreads his feet wide apart and bends his knees, lining up his still rock hard member with the blonde girl''s waiting orifice. As he slides his thick pole into her pussy, you catch sight of her eyes as they roll back into her head. She bites down on her lower lip, stifling a moan.'							
-							gs 'arousal', 'voyeur', 5
+							gs 'arousal', 'voyeur', 1
 							gs 'stat'
 							act 'Further':
 								cla
 								*clr
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_7.jpg"></center>'
 								'The chiseled statue of a man continues pounding into his girlfriend for several more minutes, continually changing angles and speed to keep her at the peak of passion. You continue rubbing your dripping vagina, feeling shame and excitement in equal measure. Even from this distance you can hear the blonde girl''s breaths as they become shorter and more erratic. Suddenly her breathe catches in her throat for a moment before she lets out a wailing cry of pleasure. "Oh my god, she just came so hard!" you think as your own arousal continues to build.'
-								gs 'arousal', 'voyeur', 5
+								gs 'arousal', 'voyeur', 4
 								gs 'stat'
 								act 'Further':
 									cla
 									*clr
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_8.jpg"></center>'
 									'After her orgasm subsides, the blond rolls over onto her back, letting the massive cock slide out of her for just a moment. Before long, however, her boyfriend is sliding his knees up to her ass in the sand. The hormone driven man pushes his girlfriend''s knees back, exposing her used hole to him once more. Without giving her more than a moment to prepare the strong brute thrusts his mighty dick back into her waiting pussy.'
-									gs 'arousal', 'voyeur', 5
+									gs 'arousal', 'voyeur', 2
 									gs 'stat'
 									act 'Further':
 										cla
 										*clr
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_9.jpg"></center>'
 										'"It seems that the time for tender loving is over" you think as you watch the ripped man drive his veiny cock into her without mercy. He thrusts hard and fast, his tight balls swinging violently with every thrust.'
-										gs 'arousal', 'voyeur', 5
+										gs 'arousal', 'voyeur', 1
 										gs 'stat'
 										act 'Further': gt 'gLakeNudeEvent', 'gLakeNude_sex2'
 									end
@@ -92,7 +92,7 @@ if $args[0] = 'gLakeNude_sex2':
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_10.jpg"></center>'
 	'Another unexpected wave crashes onto the beach and flows over the fucking couple. This time it seems like they will pay it no mind, too enraptured by each other''s bodies to care about the sandy water.'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur', 1
 	gs 'stat'
 	act 'Further':
 		cla
@@ -107,7 +107,7 @@ if $args[0] = 'gLakeNude_sex2':
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_12.jpg"></center>'
 			'The horny, impatient man wastes no time getting himself back into position. He grips both of the girl''s perfect ass cheeks in either hand, flesh pillowing through is fingers, as he thrusts himself back into her sopping hole.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur', 1
 			gs 'stat'
 			act 'Further':
 				cla
@@ -121,7 +121,7 @@ if $args[0] = 'gLakeNude_sex2':
 					*clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_14.jpg"></center>'
 					'Without warning the man suddenly crosses his arms over his girlfriend''s hips and flips her onto her back. In a moment he''s back inside of her, never breaking the rhythm of his thrusts. You marvel at the power in his body, as well as the possessiveness he has over his girlfriend. She is his and he will do what he wants with her.'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Further':
 						cla
@@ -130,14 +130,14 @@ if $args[0] = 'gLakeNude_sex2':
 						'"Do it!" the gruff man commands as his girlfriend vigorously rubs her clit while he fucks her.'
 						'"Do It now!" he threatens just a moment before the blonde girl throws her head back and screams in orgasm, her body and legs shaking uncontrollably.'
 						'The dominant man thrusts hard just a few more times before...'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur', 1
 						gs 'stat'
 						act 'Further':
 							cla
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_16.jpg"></center>'
 							'he pulls his pussy juice soaked cock out of his girlfriend''s snatch and erupts a volcano of cum all over her.'
-							gs 'arousal', 'voyeur', 5
+							gs 'arousal', 'voyeur', 1
 							gs 'stat'
 							act 'Further':
 								cla
@@ -145,7 +145,7 @@ if $args[0] = 'gLakeNude_sex2':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_17.jpg"></center>'
 								'The sperm and sand mix to form a coarse paste as they cover the blonde girl''s belly. She obediently attempts to lean her head forward to catch a few drops in her mouth as it flies out, but she is too spent to really make the effort.'
 								'The couple collapse next to each other, exhausted from their romance session, and begin quietly talking.'
-								gs 'arousal', 'voyeur', 5
+								gs 'arousal', 'voyeur', 1
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Further':

+ 34 - 18
locations/gLakeNudeForest.qsrc

@@ -19,26 +19,42 @@ end
 
 if temper >= 20 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 	if voyeurism_forest = 0:
-		set voyeurism_forest = 1
-		act'Follow the girl': gt'gLakeNudeEvent','gLakeNudeForest_piss'
+		voyeurism_forest = 1
+		gs 'willpower', 'voyeur', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Follow the girl (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' & gt 'gLakeNudeEvent', 'gLakeNudeForest_piss'
+		else
+			act 'Follow the girl (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	else
-		act'Spy on nudists':
-			menu_off = 1
-			gs 'gLakeNudeEvent','gLakeNude_nudist'
-			act 'Look': gt 'gLakeNudeForest'
+		gs 'willpower', 'voyeur', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Spy on nudists (<<will_cost>> Willpower)':
+				menu_off = 1
+				gs 'willpower', 'voyeur', 'self', 'easy'
+				gs 'willpower', 'pay', 'self'
+				gs 'gLakeNudeEvent','gLakeNude_nudist'
+				act 'Look': gt 'gLakeNudeForest'
+		else
+			act 'Spy on nudists (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		act'Spy on girl going for a pee':
-			cla
-			*clr
-			menu_off = 1
-			minut += 10
-			pcs_horny += 10
-			voyeurism += 1
-			kol_foto_piss = 169
-			viewforestpiss = rand(1,kol_foto_piss)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/piss_forest/piss_forest_<<rand(1,kol_foto_piss)>>.jpg"></center>'
-			'You slip behind a tree and watch as a cute girl looks for a private spot to do her business. She finally decides on a patch of dirt near some bushes and squats down. You dare to peek your head around the tree trunk for a better look as the girl finds her balance and appears to relax. A torrent of hot piss begins to flow from the young woman''s nether lips. You hear a light moan escape her mouth. "Wow, she must have been holding it awhile.", you think as heat radiates through your groin from the naughtiness of what you just saw.'
-			act'Back': gt 'gLakeNudeForest'
+		gs 'willpower', 'voyeur', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Spy on girl going for a pee (<<will_cost>> Willpower)':
+				*clr & cla
+				menu_off = 1
+				gs 'willpower', 'voyeur', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'arousal', 'voyeur', 10
+				voyeurism += 1
+				kol_foto_piss = 169
+				viewforestpiss = rand(1,kol_foto_piss)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/piss_forest/piss_forest_<<rand(1,kol_foto_piss)>>.jpg"></center>'
+				'You slip behind a tree and watch as a cute girl looks for a private spot to do her business. She finally decides on a patch of dirt near some bushes and squats down. You dare to peek your head around the tree trunk for a better look as the girl finds her balance and appears to relax. A torrent of hot piss begins to flow from the young woman''s nether lips. You hear a light moan escape her mouth. "Wow, she must have been holding it awhile.", you think as heat radiates through your groin from the naughtiness of what you just saw.'
+				act'Back': gt 'gLakeNudeForest'
+			end
+		else
+			act 'Spy on girl going for a pee (<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

+ 392 - 317
locations/garfather.qsrc

@@ -19,12 +19,12 @@ dynamic $fatherRep
 
 act 'Leave': gt 'gargazel'
 
-if hour >= 21:exit
+if hour >= 21: exit
 
 act 'Chat':
 	cls
 	menu_off = 1
-	minut+=rand(10,15)
+	minut += rand(10,15)
 	gs 'stat'
 	'<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
@@ -32,51 +32,61 @@ act 'Chat':
 
 	dynamic $fatherRep
 
-	if npc_rel['A28']<20:
+	if npc_rel['A28'] < 20:
 		!He hates you
 		'You try to have a conversation with your stepfather, but he dislikes you too much to even pretend to be interested in what you have to say.'
-		if sorryday!daystart:
-			act 'Apologize':
-				cla
-				sorryday=daystart
-				npc_rel['A28']+=(pcs_intel/10)+(pcs_apprnc/20)
-				gs 'stat'
-				'You profusely apologize to your stepfather, and after a while you can tell his attitude towards you is slightly milder.'
-				act 'Move away':gt $loc, $metka
+		if sorryday ! daystart:
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Apologize (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					sorryday = daystart
+					npc_rel['A28'] += (pcs_intel/10) + (pcs_apprnc/20)
+					gs 'stat'
+					'You profusely apologize to your stepfather, and after a while you can tell his attitude towards you is slightly milder.'
+					act 'Move away':gt $loc, $metka
+				end
+			else
+				act 'Apologize (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Move away':gt $loc, $metka
 		end
-	elseif npc_rel['A28']>=20 and npc_rel['A28']<40:
+		act 'Move away':gt $loc, $metka
+	elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
 		!He doesn''t like you very much
 		'You try to have a conversation with your stepfather, but he''s not really interested and barely has anything to contribute while you do all the talking.'
-		if sorryday!daystart:
-			act 'Try to get on his good side':
-				cla
-				sorryday=daystart
-				npc_rel['A28']+=(pcs_intel/10)+(pcs_apprnc/20)
-				gs 'stat'
-				'You spend some time trying to get on your stepfather''s good side, and you feel like he likes you a bit more after you show interest in the things he enjoys.'
-				act 'Move away':gt $loc, $metka
+		if sorryday ! daystart:
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Try to get on his good side (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					sorryday = daystart
+					npc_rel['A28'] += (pcs_intel/10) + (pcs_apprnc/20)
+					gs 'stat'
+					'You spend some time trying to get on your stepfather''s good side, and you feel like he likes you a bit more after you show interest in the things he enjoys.'
+					act 'Move away':gt $loc, $metka
+				end
+			else
+				act 'Try to get on his good side (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Move away':gt $loc, $metka
 		end
-	elseif npc_rel['A28'] >=40:
+		act 'Move away':gt $loc, $metka
+	elseif npc_rel['A28'] >= 40:
 		if pcs_apprnc + (npc_rel['A28']/10) <= 60:
 			!good relations but he is not attracted to you
 			gs 'dinfather', 'garchat'
 		else
 			!good relations and he finds you attractive
-			talkrand=rand(1,100)
-			if talkrand >=20:
+			talkrand = rand(1,100)
+			if talkrand >= 20:
 				gs 'dinfather', 'garchat'
 			elseif talkrand < 20:
 				'You relax and share funny stories with your stepfather.'
-				if npc_rel['A28']>=40 and npc_rel['A28']<60:FatherMolest = RAND (1,8)
-				if npc_rel['A28']>=60 and npc_rel['A28']<80:FatherMolest = RAND (1,4)
-				if npc_rel['A28']>=80:FatherMolest = RAND (1,2)
-				if FatherMolest=1:
+				if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60: FatherMolest = rand(1,8)
+				if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80: FatherMolest = rand(1,4)
+				if npc_rel['A28'] >= 80: FatherMolest = rand(1,2)
+				if FatherMolest = 1:
 					gs 'dinfather', 'gar_act1'
 					gs 'dinfather', 'gar_act2'
 					gs 'dinfather', 'gar_act3'
@@ -104,123 +114,154 @@ act 'Help':
 	if npc_rel['A28'] < 20:
 		!scandal stepfather
 		'You offer to help your stepfather out in the garage. He waves you away and grumpily says "Get out of the way <<$pcs_nickname>>, can''t you see I''m busy? Besides, why would I want to be around you?"'
-		if sorryday!daystart:
-			act 'Apologize':
-				cla
-				sorryday=daystart
-				npc_rel['A28']+=(pcs_intel/10)+(pcs_apprnc/20)
-				gs 'stat'
-				'You profusely apologize to your stepfather, and after a while you can tell his attitude towards you is slightly milder.'
-				act 'Move away':gt $loc, $metka
+		if sorryday ! daystart:
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Apologize (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					sorryday = daystart
+					npc_rel['A28'] += (pcs_intel/10) + (pcs_apprnc/20)
+					gs 'stat'
+					'You profusely apologize to your stepfather, and after a while you can tell his attitude towards you is slightly milder.'
+					act 'Move away':gt $loc, $metka
+				end
+			else
+				act 'Apologize (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Move away':gt $loc, $metka
 		end
+		act 'Move away':gt $loc, $metka
 	elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
 		!strained relations
 		'You ask your stepfather if there''s anything you can do to help him out in the garage, but he shrugs and shakes his head. "And what would you even do? Maybe you should go help your mother in the kitchen, that seems to suit your skill set better."'
-		if sorryday!daystart:
-			act 'Try to get on his good side':
-				cla
-				sorryday=daystart
-				npc_rel['A28']+=(pcs_intel/10)+(pcs_apprnc/20)
-				gs 'stat'
-				'You spend some time trying to get on your stepfather''s good side, and you feel like he likes you a bit more after you show interest in the things he enjoys.'
-				act 'Move away':gt $loc, $metka
+		if sorryday ! daystart:
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Try to get on his good side (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					sorryday = daystart
+					npc_rel['A28'] += (pcs_intel/10) + (pcs_apprnc/20)
+					gs 'stat'
+					'You spend some time trying to get on your stepfather''s good side, and you feel like he likes you a bit more after you show interest in the things he enjoys.'
+					act 'Move away':gt $loc, $metka
+				end
+			else
+				act 'Try to get on his good side (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Move away':gt $loc, $metka
 		end
+		act 'Move away':gt $loc, $metka
 	elseif npc_rel['A28'] >= 40:
 		if pcs_apprnc + (npc_rel['A28']/10) <= 60:
 			!gg good relations but he is not attracted to you
 			gs 'dinfather', 'garhelpchat'
 		else
 			!good relations and Messrs attractive
-			talkrand=rand(1,100)
-			if talkrand>=20:
+			talkrand = rand(1,100)
+			if talkrand >= 20:
 				gs 'dinfather', 'garhelpchat'
 			else
 				'You help your stepfather while he works on the Gazelle, handing him the bolts and tools he needs.'
-				if npc_rel['A28']>=40 and npc_rel['A28']<60:FatherMolest = RAND (1,8)
-				if npc_rel['A28']>=60 and npc_rel['A28']<80:FatherMolest = RAND (1,4)
-				if npc_rel['A28']>=80:FatherMolest = RAND (1,2)
-				if FatherMolest=1:
-					if pcs_horny >= 50 or TouchedByFather=1:
-						act '''Accidentally'' drop the wrench':
-							cla
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.pre<<rand(0,5)>>.jpg"></center>'
-
-							'Feeling horny, you decide to tease your stepfather while you help him in the garage. You let the wrench slip out of your hand, the loud clattering of metal on the stone floor ringing throughout the garage. "Oops! I can be so clumsy sometimes..." you say with a smile, bending over to pick up the wrench without bending your knees. In this pose, you give your stepfather a great view of your ass.'
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust >=2:
+				if npc_rel['A28'] >= 40 and npc_rel['A28']<60: FatherMolest = rand(1,8)
+				if npc_rel['A28'] >= 60 and npc_rel['A28']<80: FatherMolest = rand(1,4)
+				if npc_rel['A28'] >= 80: FatherMolest = rand(1,2)
+				if FatherMolest = 1:
+					if pcs_horny >= 60 or TouchedByFather = 1:
+						gs 'willpower', 'exhib', 'self'
+						if will_cost <= pcs_willpwr:
+							act 'Spread your legs (<<will_cost>> Willpower)':
 								cls
-								pcs_horny -= RAND(1,5)
+								gs 'willpower', 'exhib', 'self'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flash', 5
+								gs 'arousal', 'end'
 								gs 'stat'
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim29.jpg"></center>' & 'Even though your body is definitely having an effect on him your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel uncomfortable.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim27.jpg"></center>' & 'The sight of your ass makes your stepfather uncomfortable. "Clumsy you say? It seems like that wrench is not the only thing you let slip today", he snarks, referring to your lack of underwear. His snarky tone and disapproving look make you feel a bit awkward.'
-							else
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim29.jpg"></center>'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim27.jpg"></center>'
-								'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he definitely likes what he sees.'
+								'While pretending not to notice, you slowly spread your legs as you talk.'
+
+								if pcs_apprnc + (npc_rel['A28']/10) < 60: fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120: fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200: fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather = 1: fatherLust = 1
+								if fatherLust >= 2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim31.jpg"></center>' & 'You notice your stepfather''s eyes darting down while you talk, and suddenly his face turns beet red. You look down and notice your skimpy underwear did a very poor job of hiding your pussy. Your stepfather is clearly embarrassed and surprised. He loudly clears his throat and says "<<$pcs_nickname>> don''t do that, that''s no way for a lady to behave. And go put some normal underwear on."'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim24.jpg"></center>' & 'You notice your stepfather''s eyes darting down while you talk, and suddenly his face turns beet red. "What''s wrong?" you ask him innocently, knowing full well you''re not wearing underwear and that he has a great view of your bare pussy. You''re not fooling him though, and he doesn''t appreciate your teasing in the slightest. "<<$pcs_nickname>>, stop that at once and go put some pants on."'
+								end
+								if fatherLust = 1:
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim20.jpg"></center>' & 'Your stepfather realizes what you''re up to and pulls you closer to him, desire burning in his eyes. He runs his hands over your ass cheeks and thighs, petting and kneading them, and then pushes your panties to the side. Two of his fingers are exploring your sphincter, rubbing and teasing you. "Is there something you want, <<$pcs_nickname>>?" he asks with a smug grin on his face, knowing he turned the tables on you. All you can do is whimper in response.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim26.jpg"></center>' & 'Your stepfather gets a glimpse of your bare pussy and realizes what you''re up to. "<<$pcs_nickname>>... are you not wearing panties? Get down on the ground and spread your legs for me, Daddy has to know now." You do as he says, lie down on the ground and spread your legs wide. He kneels in front of you, pulls your clothes to the side and rubs your pussy and thighs with his rough calloused hands. "Just as I thought, you little minx!" he says with a grin on his face. After he had his fun he helps you get back up and even helps you straighten your clothes, his hands lingering on your hips and ass a few seconds longer than is needed.'
+								end
+								act 'Move away':gt $loc, $metka
 							end
-							act 'Move away':gt $loc, $metka
+						else
+							act '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>'
 						end
 					end
-					if pcs_horny >= 30 or TouchedByFather=1:
-						act 'Fondle your breasts as you talk':
-							cls
-							gs 'arousal', 'flashlite', 5
-							gs 'arousal', 'breasts', 5, 'incest', 'exhibitionism'
-							gs 'arousal', 'end'
-							minut -= 5
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim28.jpg"></center>'
-							'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing your stepfather with an amazing view of your <<$titsize>> breasts.'
-
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust>=2:
-								pcs_horny -= RAND(1,5)
+					if pcs_horny >= 50 or TouchedByFather = 1:
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act '''Accidentally'' drop the wrench (<<will_cost>> Willpower)':
+								cla
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flash', 5
+								gs 'arousal', 'end'
 								gs 'stat'
-								'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable.'
-							elseif fatherLust=1:
-								'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he definitely likes what he sees.'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.pre<<rand(0,5)>>.jpg"></center>'
+
+								'Feeling horny, you decide to tease your stepfather while you help him in the garage. You let the wrench slip out of your hand, the loud clattering of metal on the stone floor ringing throughout the garage. "Oops! I can be so clumsy sometimes..." you say with a smile, bending over to pick up the wrench without bending your knees. In this pose, you give your stepfather a great view of your ass.'
+								if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
+								if fatherLust >=2:
+									cls
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim29.jpg"></center>' & 'Even though your body is definitely having an effect on him your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel uncomfortable.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim27.jpg"></center>' & 'The sight of your ass makes your stepfather uncomfortable. "Clumsy you say? It seems like that wrench is not the only thing you let slip today", he snarks, referring to your lack of underwear. His snarky tone and disapproving look make you feel a bit awkward.'
+								else
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim29.jpg"></center>'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim27.jpg"></center>'
+									'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he definitely likes what he sees.'
+								end
+								act 'Move away':gt $loc, $metka
 							end
-							act 'Move away':gt $loc, $metka
+						else
+							act '''Accidentally'' drop the wrench (<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 pcs_horny >= 60 or TouchedByFather=1:
-						act 'Spread your legs':
-							cls
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-							gs 'stat'
-							'You, while pretending to not notice, slowly spread your legs as you talk.'
-
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust>=2:
-								pcs_horny -= RAND(1,5)
+					if pcs_horny >= 30 or TouchedByFather = 1:
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Fondle your breasts as you talk (<<will_cost>> Willpower)':
+								cls
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flashlite', 5
+								gs 'arousal', 'breasts', 5, 'incest', 'exhibitionism'
+								gs 'arousal', 'end'
+								minut -= 5
 								gs 'stat'
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim31.jpg"></center>' & 'You notice your stepfather''s eyes darting down while you talk, and suddenly his face turns beet red. You look down and notice your skimpy underwear did a very poor job of hiding your pussy. Your stepfather is clearly embarrassed and surprised. He loudly clears his throat and says "<<$pcs_nickname>> don''t do that, that''s no way for a lady to behave. And go put some normal underwear on."'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim24.jpg"></center>' & 'You notice your stepfather''s eyes darting down while you talk, and suddenly his face turns beet red. "What''s wrong?" you ask him innocently, knowing full well you''re not wearing underwear and that he has a great view of your bare pussy. You''re not fooling him though, and he doesn''t appreciate your teasing in the slightest. "<<$pcs_nickname>>, stop that at once and go put some pants on."'
-							end
-							if fatherLust=1:
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim20.jpg"></center>' & 'Your stepfather realizes what you''re up to and pulls you closer to him, desire burning in his eyes. He runs his hands over your ass cheeks and thighs, petting and kneading them, and then pushes your panties to the side. Two of his fingers are exploring your sphincter, rubbing and teasing you. "Is there something you want, <<$pcs_nickname>>?" he asks with a smug grin on his face, knowing he turned the tables on you. All you can do is whimper in response.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim26.jpg"></center>' & 'Your stepfather gets a glimpse of your bare pussy and realizes what you''re up to. "<<$pcs_nickname>>... are you not wearing panties? Get down on the ground and spread your legs for me, Daddy has to know now." You do as he says, lie down on the ground and spread your legs wide. He kneels in front of you, pulls your clothes to the side and rubs your pussy and thighs with his rough calloused hands. "Just as I thought, you little minx!" he says with a grin on his face. After he had his fun he helps you get back up and even helps you straighten your clothes, his hands lingering on your hips and ass a few seconds longer than is needed.'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim28.jpg"></center>'
+								'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing your stepfather with an amazing view of your <<$titsize>> breasts.'
+
+								if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
+								if fatherLust>=2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable.'
+								elseif fatherLust=1:
+									'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he definitely likes what he sees.'
+								end
+								act 'Move away':gt $loc, $metka
 							end
-							act 'Move away':gt $loc, $metka
+						else
+							act 'Fondle your breasts as you talk (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					else
 						gs 'dinfather', 'garhelpchat'
@@ -233,126 +274,124 @@ act 'Help':
 	end
 end
 
-if pcs_horny > 50 and npc_sex['A28']!0:
-
-	act 'Seduce your stepfather':
-		gs 'boyStat', 'A28'
-		cla
-		*clr
-		menu_off = 1
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.pre<<rand(0,5)>>.jpg"></center>'
-		'You walk up to the Gazelle and pick up a sponge. Bending slightly forwards, you begin washing the car and simultaneously putting your ass on display for your stepfather.'
-		'"- Oh..." - Stepfather did not expect this from you, but his involuntary exhalation and kindled eyes tell you he is enjoying it very much.'
-		'Your stepfather walks up behind you and puts his hands on your ass. He leisurely begins to knead your butt.'
-
-		gs 'arousal', 'foreplay', 3, 'sub', 'incest'
-		gs 'stat'
-
-		act 'Get down on your knees':
-			cla
-			*clr
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bimbo.knees<<rand(1,3)>>.jpg"></center>'
-			'You fall on your knees in front of your stepfather and place the palm of your hand on his crotch. You can feel his erection through the fabric of his jeans, and begin to caress him. After a while you unzip his pants and pull out his cock, taking a firm grasp on it with one hand.'
-
-			gs 'arousal', 'hj', 3, 'sub', 'incest'
+if pcs_horny > 50 and npc_sex['A28'] ! 0:
+
+	gs 'willpower', 'sex', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Seduce your stepfather (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'self'
+			gs 'boyStat', 'A28'
+			menu_off = 1
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.pre<<rand(0,5)>>.jpg"></center>'
+			'You walk up to the Gazelle and pick up a sponge. Bending slightly forwards, you begin washing the car and simultaneously putting your ass on display for your stepfather.'
+			'"- Oh..." - Stepfather did not expect this from you, but his involuntary exhalation and kindled eyes tell you he is enjoying it very much.'
+			'Your stepfather walks up behind you and puts his hands on your ass. He leisurely begins to knead your butt.'
+
+			gs 'arousal', 'foreplay', 3, 'sub', 'incest'
 			gs 'stat'
 
-			act 'Take his dick in your mouth':
-				cla
-				*clr
+			act 'Get down on your knees':
+				*clr & cla
 				gs 'stat'
-				if pcs_throat < dick:pcs_throat += 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.0,<<rand(0,4)>>.jpg"></center>'
-				'Your stepfather opens the passenger side door of the Gazelle, and you sit down on the seat. He places a hand on your head and guides his dick towards your mouth.'
-				'You leisurely lick your stepfather''s dick, caress his balls, and then take his cock in your mouth. Soon the cock began to throb, giving signs of an early end.'
+				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bimbo.knees<<rand(1,3)>>.jpg"></center>'
+				'You fall on your knees in front of your stepfather and place the palm of your hand on his crotch. You can feel his erection through the fabric of his jeans, and begin to caress him. After a while you unzip his pants and pull out his cock, taking a firm grasp on it with one hand.'
 
-				gs 'arousal', 'bj', 5, 'sub', 'incest'
+				gs 'arousal', 'hj', 3, 'sub', 'incest'
 				gs 'stat'
 
-				act 'Suck him off and swallow his sperm':
-					cls
-					if npc_rel['A28']<100:npc_rel['A28']+=2
-					fatherSuck+=1
-					sexpartkno = 1
-					spafinloc = 12
-					gs 'cum_manage'
-					swallow += 1
-					pcs_hydra += 5
+				act 'Take his dick in your mouth':
+					*clr & cla
 					gs 'stat'
-					'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,<<rand(0,10)>>.mp4"></video></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.0,<<rand(0,4)>>.jpg"></center>'
+					'Your stepfather opens the passenger side door of the Gazelle, and you sit down on the seat. He places a hand on your head and guides his dick towards your mouth.'
+					'You leisurely lick your stepfather''s dick, caress his balls, and then take his cock in your mouth. Soon the cock began to throb, giving signs of an early end.'
 
-					'You continue to suck your stepfather''s dick as it continues throbbing. Suddenly, he arches his back and you feel cum begin to pour into your mouth. Although you try your best, the amount of cum flowing from your stepfathers dick is simply too much for you, and some of it instead flows out of your mouth and down your chin. Soon your <<$boydesc>> finishes and you pull his cock out of your sperm-smelling mouth. You can feel the taste of sperm in your mouth, and your <<$liptalk3>> are wet with cum.'
-
-					gs 'arousal', 'bj', 10, 'sub', 'incest'
-					gs 'arousal', 'end'
+					gs 'arousal', 'bj', 5, 'sub', 'incest'
 					gs 'stat'
 
-					act 'Move away':gt 'gargazel'
-				end
-
-				act 'Take his load on your face':
-					cls
-					if npc_rel['A28']<100:npc_rel['A28']+=2
-					fatherSuck+=1
-					sexpartkno = 1
-					spafinloc = 11
-					gs 'cum_manage'
-					facial += 1
-					gs 'stat'
-					gar_rand1 = rand(0,100)
-					if gar_rand1 < 49:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial0,<<rand(0,8)>>.jpg"></center>'
-					if gar_rand1 => 50:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial0,<<rand(0,8)>>.jpg"></center>'
-					'You stop sucking on your stepfather''s cock just as he reaches orgasm, and a jet of sperm immediately hits you in the face. You squeeze your eyes shut for fear of getting cum in your eyes and feel another jet of hot sperm land on your face.'
-
-					gs 'arousal', 'bj', 10, 'sub', 'incest'
-					gs 'arousal', 'end'
-					gs 'stat'
+					act 'Suck him off and swallow his sperm':
+						cls
+						if npc_rel['A28'] < 100: npc_rel['A28'] += 2
+						fatherSuck += 1
+						sexpartkno = 1
+						spafinloc = 12
+						gs 'cum_manage'
+						swallow += 1
+						pcs_hydra += 5
+						gs 'stat'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,<<rand(0,10)>>.mp4"></video></center>'
 
-					act 'Move away':gt 'gargazel'
-				end
-			end
+						'You continue to suck your stepfather''s dick as it continues throbbing. Suddenly, he arches his back and you feel cum begin to pour into your mouth. Although you try your best, the amount of cum flowing from your stepfathers dick is simply too much for you, and some of it instead flows out of your mouth and down your chin. Soon your <<$boydesc>> finishes and you pull his cock out of your sperm-smelling mouth. You can feel the taste of sperm in your mouth, and your <<$liptalk3>> are wet with cum.'
 
-			act 'Bend over, leaning against the Gazelle':
-				cla
-				*clr
-				if pcs_vag < dick:pcs_vag += 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.1,<<rand(0,2)>>.jpg"></center>'
-				'Your stepfather grabs you and pulls you up from your knees, turning you to face the Gazelle. You plant your hands on the car, and arch your back to give him easier access to your ass and pussy. Once you''re in position, he begins caressing your pussy and then slams his dick in.'
+						gs 'arousal', 'bj', 10, 'sub', 'incest'
+						gs 'arousal', 'end'
+						gs 'stat'
 
-				gs 'arousal', 'vaginal', 10, 'sub', 'incest'
-				gs 'stat'
+						act 'Move away':gt 'gargazel'
+					end
 
-				gs 'dinSex', 'wear_condom'
-				gs 'dinsex','vaginal_sex',10
-				act 'Continue':
-					cla
-					*clr
-					gs 'stat'
-					sexpartkno = 1
-					if npc_rel['A28'] < 100:npc_rel['A28'] += 3
-					if fathersex = 0:guy += 1
-					FatherSex += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.cum1,0.jpg"></center>'
-					if protect = 0:
-						'After a thorough fucking, you feel your stepfather''s cock begin to throb within you. Your stepfather''s body spasms, his cock filling your pussy with his sperm.'
-						gs 'arousal', 'vaginal', 10, 'sub', 'incest'
-						gs 'cum_manage'
-						pcs_mood -= 15
-						pcs_willpwr -= 15
-						gs 'cuminsidereact', 'your stepfather'
-					else
-						'After a thorough fucking, you feel your stepfather''s cock begin to throb within you. Your stepfather''s body spasms, his cock filling the condom with his sperm.'
-						gs 'arousal', 'vaginal', 10, 'sub', 'incest'
+					act 'Take his load on your face':
+						cls
+						if npc_rel['A28'] < 100: npc_rel['A28'] += 2
+						fatherSuck += 1
+						sexpartkno = 1
+						spafinloc = 11
 						gs 'cum_manage'
+						facial += 1
+						gs 'stat'
+						gar_rand1 = rand(0,100)
+						if gar_rand1 < 49:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial0,<<rand(0,8)>>.jpg"></center>'
+						if gar_rand1 => 50:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial0,<<rand(0,8)>>.jpg"></center>'
+						'You stop sucking on your stepfather''s cock just as he reaches orgasm, and a jet of sperm immediately hits you in the face. You squeeze your eyes shut for fear of getting cum in your eyes and feel another jet of hot sperm land on your face.'
+
+						gs 'arousal', 'bj', 10, 'sub', 'incest'
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Move away':gt 'gargazel'
 					end
-					gs 'arousal', 'end'
+				end
+
+				act 'Bend over, leaning against the Gazelle':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.1,<<rand(0,2)>>.jpg"></center>'
+					'Your stepfather grabs you and pulls you up from your knees, turning you to face the Gazelle. You plant your hands on the car, and arch your back to give him easier access to your ass and pussy. Once you''re in position, he begins caressing your pussy and then slams his dick in.'
+
+					gs 'arousal', 'vaginal', 10, 'sub', 'incest'
 					gs 'stat'
 
-					act 'Move away':gt 'gargazel'
+					gs 'dinSex', 'wear_condom'
+					gs 'dinsex','vaginal_sex',10
+					act 'Continue':
+						cla
+						*clr
+						gs 'stat'
+						sexpartkno = 1
+						if npc_rel['A28'] < 100:npc_rel['A28'] += 3
+						if fathersex = 0:guy += 1
+						FatherSex += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.cum1,0.jpg"></center>'
+						if protect = 0:
+							'After a thorough fucking, you feel your stepfather''s cock begin to throb within you. Your stepfather''s body spasms, his cock filling your pussy with his sperm.'
+							gs 'arousal', 'vaginal', 10, 'sub', 'incest'
+							gs 'cum_manage'
+							gs 'cuminsidereact', 'your stepfather'
+						else
+							'After a thorough fucking, you feel your stepfather''s cock begin to throb within you. Your stepfather''s body spasms, his cock filling the condom with his sperm.'
+							gs 'arousal', 'vaginal', 10, 'sub', 'incest'
+							gs 'cum_manage'
+						end
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Move away':gt 'gargazel'
+					end
 				end
 			end
 		end
+	else
+		act 'Seduce your stepfather (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -372,141 +411,177 @@ if fatherdrunk=1:
 		!scandal stepfather
 		'You approach your stepfather and uncle Misha and try to ask if you can join them, but your stepfather cuts you off before you can even finish your sentence. "<<$pcs_nickname>>, get out of here! This is a no bitch zone!" he shouts, laughing drunkenly as he waves you off. Uncle Misha finds your stepfather''s degrading talk hilarious, and joins in. You''re clearly not welcome in the garage.'
 		if sorryday!daystart:
-			act 'Persist and ask if you can join them':
-				cla
-				menu_off = 1
-				gs 'stat'
-				'You try to get your stepfather to let you join them but he''s equally persistent in telling you to get lost, being quite rude about it too. He really doesn''t like you at all.'
-				act 'Move away':gt 'gargazel'
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Persist and ask if you can join them (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					menu_off = 1
+					gs 'stat'
+					'You try to get your stepfather to let you join them but he''s equally persistent in telling you to get lost, being quite rude about it too. He really doesn''t like you at all.'
+					act 'Move away':gt 'gargazel'
+				end
+			else
+				act 'Persist and ask if you can join them (<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 'Move away':gt 'gargazel'
 	elseif npc_rel['A28']>=20 and npc_rel['A28']<40:
 		!strained relations
 		'You ask your stepfather if you can join them, but he''ll have none of it. "<<$pcs_nickname>>, isn''t it past your bedtime? *Hic!* Shoo, go home! *Hic!*"'
 		if sorryday!daystart:
-			act 'Try to persuade him':
-				cla
-				menu_off = 1
-				gs 'stat'
-				'You do your best, but your stepfather remains adamant and sends you home.'
-				act 'Move away':gt 'gargazel'
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Try to persuade him (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					cla
+					menu_off = 1
+					gs 'stat'
+					'You do your best, but your stepfather remains adamant and sends you home.'
+					act 'Move away':gt 'gargazel'
+				end
+			else
+				act 'Try to persuade 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 'Move away':gt 'gargazel'
 	elseif npc_rel['A28'] >=40:
 		if pcs_apprnc + (npc_rel['A28']/10) <= 60:
 			gs 'dinfather', 'gardrunkchat'
 		else
 			!good relations and Messrs attractive
-			talkrand=rand(0,100)
-			if talkrand>=20:gs 'dinfather', 'gardrunkchat'
-			if talkrand<20:
+			talkrand = rand(0,100)
+			if talkrand >= 20: gs 'dinfather', 'gardrunkchat'
+			if talkrand < 20:
 				'You relax and have some drinks with the guys, happy to just sit back and listen to the funny stories they exchange.'
-				if npc_rel['A28']>=40 and npc_rel['A28']<60:FatherMolest = RAND (1,8)
-				if npc_rel['A28']>=60 and npc_rel['A28']<80:FatherMolest = RAND (1,4)
-				if npc_rel['A28']>=80:FatherMolest = RAND (1,2)
+				if npc_rel['A28']>=40 and npc_rel['A28']<60:FatherMolest = rand(1,8)
+				if npc_rel['A28']>=60 and npc_rel['A28']<80:FatherMolest = rand(1,4)
+				if npc_rel['A28']>=80:FatherMolest = rand(1,2)
 				if FatherMolest=1:
 					'You can''t help but notice that your uncle Misha is staring at you the whole time. You feel like he''s not just undressing you in his mind, but that he''s fucking you in all sorts of positions with reckless abandon.'
 					 if pcs_horny >= 50 and sosedknow=1:
-						act 'Show him your breasts':
-							cls
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim33.jpg"></center>'
-							'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing uncle Misha with an amazing view of your <<$titsize>> breasts.'
-
-							if (pcs_apprnc + (npc_rel['A54']/10)) < 60:mishalust = 2
-							if (pcs_apprnc + (npc_rel['A54']/10)) >= 60 and (pcs_apprnc + (npc_rel['A54']/10)) < 120:mishalust = Rand (1,4)
-							if (pcs_apprnc + (npc_rel['A54']/10)) >= 120 and (pcs_apprnc + (npc_rel['A54']/10)) < 200:mishalust = Rand (1,2)
-							if (pcs_apprnc + (npc_rel['A54']/10)) >= 200:mishaLust = 1
-							if mishaLust>=2:
-								pcs_horny -= RAND(1,5)
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Show him your breasts (<<will_cost>> Willpower)':
+								cls
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flash', 5
+								gs 'arousal', 'end'
 								gs 'stat'
-								'Uncle Misha is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. You''re happy he at least had enough decency to not clue in your stepfather, who happened to have his back turned against you.'
-							else
-								'You try to be discrete so your stepfather doesn''t notice what you just did, and uncle Misha is quite flustered by the show you just gave him. He stumbles over his words while your stepfather talks to him about bumpers, as you smile mischievously and give uncle Misha a wink when your stepfather looks away.'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim33.jpg"></center>'
+								'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing uncle Misha with an amazing view of your <<$titsize>> breasts.'
+
+								if (pcs_apprnc + (npc_rel['A54']/10)) < 60: mishalust = 2
+								if (pcs_apprnc + (npc_rel['A54']/10)) >= 60 and (pcs_apprnc + (npc_rel['A54']/10)) < 120: mishalust = rand(1,4)
+								if (pcs_apprnc + (npc_rel['A54']/10)) >= 120 and (pcs_apprnc + (npc_rel['A54']/10)) < 200: mishalust = rand(1,2)
+								if (pcs_apprnc + (npc_rel['A54']/10)) >= 200: mishaLust = 1
+								if mishaLust>=2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									'Uncle Misha is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. You''re happy he at least had enough decency to not clue in your stepfather, who happened to have his back turned against you.'
+								else
+									'You try to be discrete so your stepfather doesn''t notice what you just did, and uncle Misha is quite flustered by the show you just gave him. He stumbles over his words while your stepfather talks to him about bumpers, as you smile mischievously and give uncle Misha a wink when your stepfather looks away.'
+								end
+								act 'Move away':gt $loc, $metka
 							end
-							act 'Move away':gt $loc, $metka
+						else
+							act 'Show him your breasts (<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 pcs_horny >= 60 or TouchedByFather=1:
-						act 'Get their attention by dropping your bottle':
-							cls
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-							gs 'stat'
-							'Even though you''re horny and want the guys to notice you, they are paying more attention to their booze and their conversation. You can change that. Making sure it doesn''t break, you ''accidentally'' drop your bottle and bend over to pick it up without bending your knees, giving them a spectacular view of your ass. You make a show of trying to reduce the spillage, wiping the floor while staying in your current position.'
-
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust>=2:
-								pcs_horny -= RAND(1,5)
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Get their attention by dropping your bottle (<<will_cost>> Willpower)':
+								cls
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flash', 5
+								gs 'arousal', 'end'
 								gs 'stat'
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim35.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Uncle Misha just has a smug grin on his face.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Neither of them seem to have noticed you''re not wearing panties.'
-							else
-								if $pantyworntype ! 'none':
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim37.jpg"></center>'
-									'You stick your ass out as much as you can, showing off your ass as much as you can. As you turn around, you notice that both your stepfather and uncle''s gazes are glued to your ass. You simply smile and return to the table as they blubber and try to find excuses.'
-									act 'Tease them some more':
-										cls
-										gs 'arousal', 'flash', 5
-										gs 'arousal', 'end'
-										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim38.jpg"></center>'
-										'You sit back down, still having their full attention. You try to excuse your behavior: "I''m sorry guys, my clothes rub my pussy raw, bending over normally makes me feel very uncomfortable."'
-										act 'Show them your pussy when they ask':
+								'Even though you''re horny and want the guys to notice you, they are paying more attention to their booze and their conversation. You can change that. Making sure it doesn''t break, you ''accidentally'' drop your bottle and bend over to pick it up without bending your knees, giving them a spectacular view of your ass. You make a show of trying to reduce the spillage, wiping the floor while staying in your current position.'
+
+								if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120: fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200: fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather = 1: fatherLust = 1
+								if fatherLust >= 2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim35.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Uncle Misha just has a smug grin on his face.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Neither of them seem to have noticed you''re not wearing panties.'
+								else
+									if $pantyworntype ! 'none':
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim37.jpg"></center>'
+										'You stick your ass out as much as you can, showing off your ass as much as you can. As you turn around, you notice that both your stepfather and uncle''s gazes are glued to your ass. You simply smile and return to the table as they blubber and try to find excuses.'
+										act 'Tease them some more':
 											cls
 											gs 'arousal', 'flash', 5
 											gs 'arousal', 'end'
 											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim39.jpg"></center>'
-											'Uncle Misha is onto your act, and decides to push you to your limits. He smiles and says: "Oh really, <<$pcs_nickname>>? Why don''t you show us, maybe we can help you. Isn''t that right, Vladimir?" Too turned on to decline, you pull your panties to the side and show them your pussy. It''s really not all that sore, but your arousal has coloured it nice and red and it makes your pussy lips look a bit more puffy. The guys didn''t think you would actually follow through with this, and are flabbergasted when you do.'
-											act 'Move away':gt $loc, $metka
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim38.jpg"></center>'
+											'You sit back down, still having their full attention. You try to excuse your behavior: "I''m sorry guys, my clothes rub my pussy raw, bending over normally makes me feel very uncomfortable."'
+											act 'Show them your pussy when they ask':
+												cls
+												gs 'arousal', 'flash', 5
+												gs 'arousal', 'end'
+												gs 'stat'
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim39.jpg"></center>'
+												'Uncle Misha is onto your act, and decides to push you to your limits. He smiles and says: "Oh really, <<$pcs_nickname>>? Why don''t you show us, maybe we can help you. Isn''t that right, Vladimir?" Too turned on to decline, you pull your panties to the side and show them your pussy. It''s really not all that sore, but your arousal has coloured it nice and red and it makes your pussy lips look a bit more puffy. The guys didn''t think you would actually follow through with this, and are flabbergasted when you do.'
+												act 'Move away':gt $loc, $metka
+											end
 										end
+									elseif $pantyworntype = 'none':
+										cls
+										gs 'arousal', 'flash', 5
+										gs 'arousal', 'flash', 5
+										gs 'arousal', 'vaginal_finger', 5, 'exhibitionism', 'rough'
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim40.jpg"></center>'
+										'Slightly disappointed, you move away from the table. Lost in your own thoughts, you don''t notice your uncle Misha''s legs and trip over them. Since you''re not wearing any underwear, you''re giving your uncle one hell of a show as you fall down onto your hands and knees. He immediately reaches out and runs his fingers over your wet pussy lips. He fingers you briefly, then returning his fingers to his nose to take a deep whiff. "You have nice holes, <<$pcs_nickname>>, young and juicy..." Realizing he won''t do anything more with your stepfather right there in the room, you get up and fix your clothes before sitting back down at the table.'
+										gs 'arousal', 'end'
+										minut -= 10
+										gs 'stat'
 									end
-								elseif $pantyworntype = 'none':
-									cls
-									gs 'arousal', 'flash', 5
-									gs 'arousal', 'flash', 5
-									gs 'arousal', 'vaginal_finger', 5, 'exhibitionism', 'rough'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim40.jpg"></center>'
-									'Slightly disappointed, you move away from the table. Lost in your own thoughts, you don''t notice your uncle Misha''s legs and trip over them. Since you''re not wearing any underwear, you''re giving your uncle one hell of a show as you fall down onto your hands and knees. He immediately reaches out and runs his fingers over your wet pussy lips. He fingers you briefly, then returning his fingers to his nose to take a deep whiff. "You have nice holes, <<$pcs_nickname>>, young and juicy..." Realizing he won''t do anything more with your stepfather right there in the room, you get up and fix your clothes before sitting back down at the table.'
-									gs 'arousal', 'end'
-									minut -= 10
-									gs 'stat'
 								end
+								act 'Continue':gt $loc, $metka
 							end
-							act 'Continue':gt $loc, $metka
+						else
+							act 'Get their attention by dropping your bottle (<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 pcs_horny >= 75 or TouchedByFather=1:
-						act 'Spread your legs':
-							cls
-							minut+=5
-							pcs_horny += RAND(1,5)
-							'You, pretending to not notice, slowly spread your legs while you talk with the guys.'
-
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust>=2:
-								pcs_horny -= RAND(1,5)
-								gs 'stat'
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim31.jpg"></center>' & 'Trying to direct Uncle Misha''s attention to something across the room, your stepfather signals you to cover yourself up with agitated hand movements.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim52.jpg"></center>' & 'Your stepfather notices what you''re trying to do. After he distracts uncle Misha for long enough, he turns to you and whispers: "<<$pcs_nickname>>, don''t... just don''t. You have no idea what you''re getting yourself into." Intimidated by the gravity of his voice, you do as he says and cover up.'
-							else
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim20.jpg"></center>' & 'Your stepfather realizes what you''re up to and pulls you closer to him, desire burning in his eyes. He runs his hands over your ass cheeks and thighs, petting and kneading them, and then pushes your panties to the side. Two of his fingers are exploring your sphincter, rubbing and teasing you. "Is there something you want, <<$pcs_nickname>>?" he asks with a smug grin on his face, knowing he turned the tables on you. All you can do is whimper in response. He pulls away his hand just in time, before uncle Misha notices what''s going on.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim25.jpg"></center>' & 'Noticing your stepfather''s blush, you realize at least one person at the table noticed you''re not wearing any underwear. When your uncle Misha looks away, he quickly reaches for you and fingers your wet pussy. A needy moan escapes your lips as he pulls his hand way, and he quickly starts a conversation about wind shield wipers. Your uncle Misha has no idea what just went down.'
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Spread your legs (<<will_cost>> Willpower)':
+								cls
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								minut += 5
+								pcs_horny += rand(1,5)
+								'You, pretending to not notice, slowly spread your legs while you talk with the guys.'
+
+								if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120: fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200: fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather = 1: fatherLust = 1
+								if fatherLust >= 2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim31.jpg"></center>' & 'Trying to direct Uncle Misha''s attention to something across the room, your stepfather signals you to cover yourself up with agitated hand movements.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim52.jpg"></center>' & 'Your stepfather notices what you''re trying to do. After he distracts uncle Misha for long enough, he turns to you and whispers: "<<$pcs_nickname>>, don''t... just don''t. You have no idea what you''re getting yourself into." Intimidated by the gravity of his voice, you do as he says and cover up.'
+								else
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim20.jpg"></center>' & 'Your stepfather realizes what you''re up to and pulls you closer to him, desire burning in his eyes. He runs his hands over your ass cheeks and thighs, petting and kneading them, and then pushes your panties to the side. Two of his fingers are exploring your sphincter, rubbing and teasing you. "Is there something you want, <<$pcs_nickname>>?" he asks with a smug grin on his face, knowing he turned the tables on you. All you can do is whimper in response. He pulls away his hand just in time, before uncle Misha notices what''s going on.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim25.jpg"></center>' & 'Noticing your stepfather''s blush, you realize at least one person at the table noticed you''re not wearing any underwear. When your uncle Misha looks away, he quickly reaches for you and fingers your wet pussy. A needy moan escapes your lips as he pulls his hand way, and he quickly starts a conversation about wind shield wipers. Your uncle Misha has no idea what just went down.'
+								end
+								act 'Continue':gt $loc, $metka
 							end
-							act 'Continue':gt $loc, $metka
+						else
+							act '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>'
 						end
 					end
 				else
-				gs 'dinfather', 'gardrunkchat'
+					gs 'dinfather', 'gardrunkchat'
 				end
 			end
 		end

+ 5 - 5
locations/gargazel.qsrc

@@ -2,12 +2,12 @@
 
 CLOSE ALL
 $metka = $ARGS[0]
-$loc = $CURLOC
+$loc = $curloc
 $menu_loc = 'gargazel'
 $menu_arg = ''
 menu_off = 0
 $location_type = 'secluded'
-fatherdrunk=0
+fatherdrunk = 0
 clr
 gs 'stat'
 '<center><h4>Garage</h4></center>'
@@ -26,9 +26,9 @@ if father_go = 1 and hour >= 16 and hour < 20:
 	'Your <a href="exec:gt ''garfather''">stepfather</a> is in the garage, working on his Gazelle pickup truck.'
 end
 
-if father_go=1 and hour>=20 and hour<21:
+if father_go = 1 and hour >= 20 and hour < 21:
 	'Your <a href="exec:gt ''garfather''">stepfather and uncle Misha</a> are in the garage, drinking vodka.'
-	set fatherdrunk=1
+	fatherdrunk = 1
 end
 
 if YouCanGar > 0:
@@ -37,7 +37,7 @@ if YouCanGar > 0:
 	if tovarL >= 30:
 		'You already have too much stored at home and do not have any more space.'
 	elseif tovarL < 30:
-		perenGarTov = 30-tovarL
+		perenGarTov = 30 - tovarL
 		'You can bring <<perenGarTov>> trinkets home and store them somewhere, until you have time to collect and sell them at the train station.'
 
 		if GarTorgItem > 0:

+ 68 - 55
locations/glake.qsrc

@@ -93,20 +93,26 @@ if month >= 5 and month <= 9:
 	end
 
 	if $clothingworntype ! 'nude' and (pcs_inhib > 30 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
-		act'Strip naked':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			inhib_exp += rand(1,2)
-			gs 'underwear', 'remove'
-			gs 'clothing', 'strip'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/strip.jpg"></center>'
-			'Without hesitation, despite the fact other people are around, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the lake or just lie down in the sand and do some sunbathing.'
+		gs 'willpower', 'exhib', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Strip naked (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				menu_off = 1
+				minut += 5
+				inhib_exp += rand(1,2)
+				gs 'underwear', 'remove'
+				gs 'clothing', 'strip'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/strip.jpg"></center>'
+				'Without hesitation, despite the fact other people are around, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the lake or just lie down in the sand and do some sunbathing.'
 
-			act'Continue':gt'glake'
+				act'Continue':gt'glake'
+			end
+		else
+			act 'Strip naked (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif $clothingworntype = 'nude':
-		act'Put your clothes back on':
+		act 'Put your clothes back on':
 			*clr & cla
 			menu_off = 1
 			minut+=5
@@ -114,7 +120,6 @@ if month >= 5 and month <= 9:
 			if nudelake <= 3:
 				minut += 5
 				pcs_mood -= 5
-				pcs_willpwr -= 5
 				inhib_exp += rand(1,3)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/noclothes.jpg"></center>'
 				'You return to the place where you thought you put your clothes to get dressed... except you can''t find them. Oh crap, you can''t find them! You desperately search the beach for a while, while a few passers-by look amused at the naked girl running around the beach. When you can''t find them, you panic and run all the way home... hopefully they''ll turn up.'
@@ -122,7 +127,6 @@ if month >= 5 and month <= 9:
 			elseif nudelake = 4:
 				minut += 5
 				pcs_mood -= 5
-				pcs_willpwr -= 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
 				'You return to the place where you thought you put your clothes to get dressed... except you can''t find them. Oh crap, you can''t find them! You desperately search the beach for a while, while a few passers-by look amused at the naked girl running around the beach. Eventually a man approaches you. You can tell his eyes are darting over your body as he asks: "Is there a problem, sweetheart? You seem upset..."'
 				if bag = 1:
@@ -154,7 +158,7 @@ if month >= 5 and month <= 9:
 						'He shakes his head and you can see a slight bulge forming in his pants the more he looks at your naked body. "No sorry, but I might be willing to trade the clothes..." He trails off suggestively and with the way he is looking at you, you have no doubt what he has in mind.'
 						'But it never hurts to see. "What did you have in mind?"'
 						'He grins a bit. "Well how about we get in my car and you let me fuck you and then you can have the clothes."'
-						gs 'willpower', 'sex', 'resist'
+						gs 'willpower', 'prostitution', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Refuse and run home naked (<<will_cost>> Willpower)':
 								gs 'willpower', 'pay', 'resist'
@@ -166,27 +170,33 @@ if month >= 5 and month <= 9:
 						act 'Agree to have sex': gt 'glake', 'car_sex'
 					end
 				end
-				act 'Suggest alternative payment':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
-					'3000 <b>₽</b>... you know it''s a fair price for him to ask, but you don''t want to pay 3000 <b>₽</b> right now! This is not how you planned for your day to go. Too afraid to look him in the eye when you ask, you suggest: "Is there... is there some other way I can pay you? 3000 <b>₽</b> is a lot of money."'
-					'He''s been gawking at your naked body the whole time you''ve been talking, and your suggestion seems to be exactly what he wanted to hear. He grins: "I can think of one way..."'
-					'The growing bulge in his pants does an excellent job of telling exactly what he''s thinking.'
-					act 'Agree to have sex': gt 'glake', 'car_sex'
-					if money >= 3000:
-						act 'Pay 3,000 <b>₽</b>':
-							*clr & cla
-							money -= 3000
-							exercise[1] = 1
-							exerciseS[1] = 0
-							exerciseH[1] = 100
-							exerciseB[1] = pcs_hips
-							gs 'clothing', 'wear', 'exercise', 1
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
-							'You don''t want to have sex with him... but you also don''t want to go home naked! Not seeing any other option, you decide to pay him the 3,000 <b>₽</b> after all. You quickly put on the clothes as he hands them over, feeling relieved in the knowledge that at least you don''t have to walk through town in the nude. Now that you''re clothed, you feel more confident in searching the beach a bit more; hopefully your clothes will turn up after all.'
-							act 'Continue': gt 'glake'
+				gs 'willpower', 'prostitution', 'self'
+				if will_cost <= pcs_willpwr:
+					act 'Suggest alternative payment (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'self'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
+						'3000 <b>₽</b>... you know it''s a fair price for him to ask, but you don''t want to pay 3000 <b>₽</b> right now! This is not how you planned for your day to go. Too afraid to look him in the eye when you ask, you suggest: "Is there... is there some other way I can pay you? 3000 <b>₽</b> is a lot of money."'
+						'He''s been gawking at your naked body the whole time you''ve been talking, and your suggestion seems to be exactly what he wanted to hear. He grins: "I can think of one way..."'
+						'The growing bulge in his pants does an excellent job of telling exactly what he''s thinking.'
+						act 'Agree to have sex': gt 'glake', 'car_sex'
+						if money >= 3000:
+							act 'Pay 3,000 <b>₽</b>':
+								*clr & cla
+								money -= 3000
+								exercise[1] = 1
+								exerciseS[1] = 0
+								exerciseH[1] = 100
+								exerciseB[1] = pcs_hips
+								gs 'clothing', 'wear', 'exercise', 1
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
+								'You don''t want to have sex with him... but you also don''t want to go home naked! Not seeing any other option, you decide to pay him the 3,000 <b>₽</b> after all. You quickly put on the clothes as he hands them over, feeling relieved in the knowledge that at least you don''t have to walk through town in the nude. Now that you''re clothed, you feel more confident in searching the beach a bit more; hopefully your clothes will turn up after all.'
+								act 'Continue': gt 'glake'
+							end
 						end
 					end
+				else
+					act 'Suggest alternative payment (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			else
 				gs 'clothing', 'wear_last_worn'
@@ -203,7 +213,6 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		*clr & cla
 		menu_off = 1
 		minut += 30
-		pcs_willpwr += 5
 		pcs_mood += 5
 		gs'stat'
 
@@ -234,7 +243,6 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			gs 'cum_cleanup'
 			minut += 30
 			pcs_mood += 5
-			pcs_willpwr += 5
 			if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
 			if pcs_stren < 30: stren_exp += 1
 			fat -= 1
@@ -243,10 +251,10 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 				inhib_exp += rand(1,2)
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/swim.jpg"></center>'
-				if pcs_inhib < 50:inhib_exp += rand(1,2)
+				if pcs_inhib < 50: inhib_exp += rand(1,2)
 			end
 			'You swim and play in the lake, feeling refreshed and invigorated by the clean lake water.'
-			if $clothingworntype = 'nude' and rand(0,1):pcs_willpwr -= 5 & pcs_mood -= 5 & 'After a few minutes, you feel the piercing gaze of several nearby women on you. They''re making an effort of whispering to one another, yet loud enough so you can hear them: "Look at that <<$pcs_lastname>> slut! She has no decency whatsoever, shamelessly flaunting her naked body like that!" The men at the lake are much more appreciative, and openly stare at your attractive body. You can see bulges forming in the shorts of some of them.'
+			if $clothingworntype = 'nude' and rand(0,1): pcs_mood -= 5 & 'After a few minutes, you feel the piercing gaze of several nearby women on you. They''re making an effort of whispering to one another, yet loud enough so you can hear them: "Look at that <<$pcs_lastname>> slut! She has no decency whatsoever, shamelessly flaunting her naked body like that!" The men at the lake are much more appreciative, and openly stare at your attractive body. You can see bulges forming in the shorts of some of them.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 			act 'Get out of the water':gt'glake'
 		end
@@ -319,8 +327,8 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 									'Damn, that voice startled you. You look behind you and you see the tattooed younger man behind you. He has tattoos over his whole body as well, most notably several tombs and skulls on his chest. He stares you down with a stone cold look on his face.'
 									'The bald man smiles and puts his hand on your chest as if he owns it, roughly squeezing your tit through your swimsuit.'
 									'"So... how much?"'
-									act 'Resist':gt 'LakeBoyDy', 'slap'
-									act 'Move away':gt 'LakeBoyDy', 'go'
+									act 'Resist': gs 'LakeBoyDy', 'slap'
+									act 'Move away': gt 'LakeBoyDy', 'go'
 
 								end
 							end
@@ -339,7 +347,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 									'You try to ignore them anyway, closing your eyes again. You feel the blade of grass continuously teasing your body, and after a few minutes his sweaty hand is pawing at your breasts through your swimsuit.'
 									'He whispers in your ear: "Come with me baby, I''ll make you feel good. You won''t regret it". His groping becomes more insistent and he''s roughly pinching your nipples now, and the outline of them slowly but surely becomes visible through your swimsuit.'
-									act 'Resist':gt 'LakeBoyDy', 'slap'
+									act 'Resist': gs 'LakeBoyDy', 'slap'
 								end
 							end
 
@@ -446,20 +454,26 @@ if $ARGS[0] = 'nude_home':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/homenude.jpg"></center>'
 	'You cover yourself up as best you can and go through the woods, you use the woods to get as close as you can to your apartment. Luckily no one else seems to be wandering the woods right now and no one spots you. Now though you are at the edge of the woods, so you have decided if you want to sneak the rest of the way and hope no one see''s you are just make a run for it and hope no one recognizes you.'
 	
-	act 'Run home':
-		*clr & cla
-		minut += 7
-		gs 'fame', 'pav', 'sex', 5
-		inhib_exp += rand(2,4)
-		if month < 3 or month = 12:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/runhomenakedw.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/runhomenaked.jpg"></center>'
+	gs 'willpower', 'exhib', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Run home (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'self'
+			minut += 7
+			gs 'fame', 'pav', 'sex', 5
+			inhib_exp += rand(2,4)
+			if month < 3 or month = 12:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/runhomenakedw.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/runhomenaked.jpg"></center>'
+			end
+			'You decided to just get this over with and make a run for it. You use you hands to cover yourself as best you can, looking away from people. Sometimes you have to use your hands to cover you face in the hopes no one recognizes you. Several people gasp, more than a few people, mostly older women chastise you for being such a whore. Some of the men whistle and more than a few people take your picture, you really hope none of those pictures show your face. Finally after what seems forever you make it to the apartment complex.'
+			gs 'arousal', 'flash', 3, 'exhibitionism'
+			gs 'stat'
+			act 'Continue to complex': gt 'pavaptcourtev', 'naked_aptcomplex'
 		end
-		'You decided to just get this over with and make a run for it. You use you hands to cover yourself as best you can, looking away from people. Sometimes you have to use your hands to cover you face in the hopes no one recognizes you. Several people gasp, more than a few people, mostly older women chastise you for being such a whore. Some of the men whistle and more than a few people take your picture, you really hope none of those pictures show your face. Finally after what seems forever you make it to the apartment complex.'
-		gs 'arousal', 'foreplay', 3, 'exhibitionism'
-		gs 'stat'
-		act 'Continue to complex': gt 'pavaptcourtev', 'naked_aptcomplex'
+	else
+		act 'Run home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
 	act 'Sneak home':
@@ -469,7 +483,7 @@ if $ARGS[0] = 'nude_home':
 		inhib_exp += rand(1,3)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/sneakhomenaked.jpg"></center>'
 		'You decided it would be better to take your time and sneak home, doing your best to not be seen. You use you hands to cover yourself as best you can, using cover as often as you, can. Hiding behind trees, parked cars, ducking down alleyways and when that doesn''t work you wait till you don''t see anyone and dart across open stretches of ground. Once or twice you think someone might have seen you, but you hope you wasn''t recognized, if you was seen. Finally after what seems forever you make it to the apartment complex.'
-		gs 'arousal', 'foreplay', 10, 'exhibitionism'
+		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'stat'
 		act 'Continue to complex': gt 'pavaptcourtev', 'naked_aptcomplex'
 	end
@@ -489,7 +503,6 @@ end
 if $ARGS[0] = 'skating':
 	*clr & cla
 	menu_off = 1
-	pcs_willpwr += 5
 	fat -= 1
 	gs 'sweat', 'add', 10
 	stren_exp += 1

+ 2 - 1
locations/preCUST.qsrc

@@ -554,7 +554,8 @@ if $ARGS[0] = 'Done':
 	gs 'din_van'
 	gs 'din_bad'
 	gs 'dinSex'
-	gs 'dinBoroda'
+	!! KEY! I merged 'dinBoroda' with 'clener' and removed the dynamics. This line was at the end of dinBoroda, so I moved it here just in case. Sicaa
+	rikudootvet = 1415
 	gs 'BanSexType'
 
 	gs 'outdoors', 'weather'

+ 8 - 14
locations/train.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = 'communal_village':
 	$metka = 'village'
 	minut += 10
 	menu_off = 1
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 10 minutes, the train stops at the small station near the village of Gadukino.'
@@ -149,7 +149,7 @@ if $ARGS[0] = 'communal_oldtown':
 	minut += 20
 	menu_off = 1
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'After 20 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'communal_pavlovsk':
 	minut += 25
 	menu_off = 1
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 	'After 5 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
@@ -282,8 +282,6 @@ if $ARGS[0] = 'village_centre':
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
-	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) <= 20: gt 'train', 'events'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/cityplat.jpg" ></center>'
 	'After 25 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view.'
 	act 'Get off the train':
@@ -300,8 +298,6 @@ if $ARGS[0] = 'village_ind':
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
-	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) <= 20: gt 'train', 'events'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
 	'After 20 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
@@ -315,9 +311,8 @@ if $ARGS[0] = 'village_communal':
 	$metka = 'communal'
 	minut += 10
 	menu_off = 1
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
-	if rand(1, 100) < 20: gt 'train', 'events'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
 	'After 10 minutes you arrive at an old railway platform near the communal village.'
 	act 'Get off the train':
@@ -331,9 +326,8 @@ if $ARGS[0] = 'village_oldtown':
 	$metka = 'oldtown'
 	minut += 10
 	menu_off = 1
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
-	if rand(1, 100) < 20: gt 'train', 'events'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'After 10 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
 	act 'Get off the train':
@@ -351,7 +345,7 @@ if $ARGS[0] = 'village_pavlovsk':
 	minut += 15
 	menu_off = 1
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 	'After 15 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
@@ -511,7 +505,7 @@ if $ARGS[0] = 'oldtown_village':
 	$metka = 'village'
 	minut += 10
 	menu_off = 1
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 10 minutes, the train stops at the small station near the village of Gadukino.'
@@ -527,7 +521,7 @@ if $ARGS[0] = 'oldtown_pavlovsk':
 	minut += 5
 	menu_off = 1
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 	'After 5 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'

+ 1 - 1
locations/train_incidental.qsrc

@@ -407,7 +407,7 @@ if $ARGS[0] = 'breastfeedthebaby':
 							if tits <=4:
 								'He wipes his mouth off and looks at you: They don''t look like it, but there quiet the amount of milk inside your breasts...'
 							else
-								'He wipes his mouth off and looks at you: There is quiet the amount of milk inside your breasts...'
+								'He wipes his mouth off and looks at you: There is quite the amount of milk inside your breasts...'
 							end
 						else
 							if tits <=4:

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