Преглед изворни кода

Merge branch 'dev' into willpower

Christine пре 5 година
родитељ
комит
cf559ba638

+ 3 - 3
locations/ParChurch.qsrc

@@ -412,15 +412,15 @@ if $ARGS[0] = 'tease':
 		if kirillsex ! 0:
 			'"Very nice, <<$pcs_nickname>>." Father Kirill whispers as he reaches out and caresses your firm breasts before pulling your top back into place, covering you once again. "Follow me."'
 			act 'Follow him': gt 'ParChurch2', 'sex'
-			gs 'willpower', 'sex'
+			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Leave the church (<<will_cost>> Willpower)':
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					gt 'ParChurch' , 'start'
 				end
 			else
-				'<br>You don''t have enough willpower to refuse.'
+				act 'Leave the church (<<will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			'"Very nice, <<$pcs_nickname>>." Father Kirill whispers with a smile as he reaches out and softly caresses your breasts before pulling your top back into place, covering you up once again.' 

+ 15 - 15
locations/ParChurch2.qsrc

@@ -218,11 +218,11 @@ if $ARGS[0] = 'confession':
 				'You feel yourself grow concerned maybe there is something to this after all. "How can we do that father?"'
 				'He licks his lips a moment. "I will give of myself and absorb your lust, so that you have no desire to lay your hands upon others."'
 				act 'Let the father slake your lust with his body': gt 'ParChurch2', 'hj'
-				gs 'willpower', 'hj'
+				gs 'willpower', 'hj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to give the father a hand job (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
 						'You shake your head. "I don''t think that is a good idea father, perhaps just a prayer of absolution instead."'
@@ -235,7 +235,7 @@ if $ARGS[0] = 'confession':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to refuse.'
+					act 'Refuse to give the father a hand job (<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 'Finish':
@@ -282,10 +282,10 @@ if $ARGS[0] = 'confession':
 				'You feel yourself grow concerned maybe their is something to this after all. "How can we do that father?"'
 				'He licks his lips a moment. "I will give of myself and absorb your lust, so that you have no desire to take the penis of others into your mouth."'
 				act 'Let the father slake your lust with his body': gt 'ParChurch2', 'bj'
-				gs 'willpower', 'bj'
+				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to give the father a blow job (<<will_cost>> Willpower)':
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
 						'You shake your head. "I don''t think that is a good idea father, perhaps just a prayer of absolution instead."'
@@ -298,7 +298,7 @@ if $ARGS[0] = 'confession':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to refuse.'
+					act 'Refuse to give the father a blow job (<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 'Finish':
@@ -345,10 +345,10 @@ if $ARGS[0] = 'confession':
 				'You feel yourself grow concerned maybe their is something to this after all. "How can we do that father?"'
 				'He licks his lips a moment. "I will give of myself and absorb your lust, so that you have no desire to let others perform sodomy upon your body."'
 				act 'Let the father slake your lust with his body': gt 'ParChurch2', 'anal'
-				gs 'willpower', 'anal'
+				gs 'willpower', 'anal', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to let the father fuck your ass (<<will_cost>> Willpower)':
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
 						'You shake your head. "I don''t think that is a good idea father, perhaps just a prayer of absolution instead."'
@@ -361,7 +361,7 @@ if $ARGS[0] = 'confession':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to refuse.'
+					act 'Refuse to let the father fuck your ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
 			act 'Finish':
@@ -408,10 +408,10 @@ if $ARGS[0] = 'confession':
 				'You feel yourself grow concerned maybe their is something to this after all. "How can we do that father?"'
 				'He licks his lips a moment. "I will give of myself and absorb your lust, so that you have no desire to lay with others."'
 				act 'Let the father slake your lust with his body': gt 'ParChurch2', 'sex'
-				gs 'willpower', 'sex'
+				gs 'willpower', 'sex', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to let the father fuck you (<<will_cost>> Willpower)':
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
 						'You shake your head. "I don''t think that is a good idea father, perhaps just a prayer of absolution instead."'
@@ -424,7 +424,7 @@ if $ARGS[0] = 'confession':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to refuse.'
+					act 'Refuse to let the father 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
 			end
 			act 'Finish':
@@ -511,10 +511,10 @@ if $ARGS[0] = 'confession':
 				'You feel yourself grow concerned maybe their is something to this after all. "How can we do that father?"'
 				'He licks his lips a moment. "I will pray as you slake your lust and absorb your sin, freeing you from it."'
 				act 'Do as the father commands': gt 'ParChurch2', 'mast'
-				gs 'willpower', 'exhib'
+				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to masturbate in front of the father (<<will_cost>> Willpower)':
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
 						'You shake your head. "I don''t think that is a good idea father, perhaps just a prayer of absolution instead."'
@@ -527,7 +527,7 @@ if $ARGS[0] = 'confession':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to refuse.'
+					act 'Refuse to masturbate in front of the father (<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 'Finish':

+ 124 - 125
locations/gschool_events.qsrc

@@ -236,12 +236,12 @@ if $ARGS[0] = 'break_events':
 			gs 'gschool_events', 'leave_break_events'
 		end
 
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'exhib', 'self'
 		if PCloSkirt > 0 and will_cost <= pcs_willpwr:
 			act 'Lift your skirt (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'exhib'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'exhib', 'self'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				grupvalue[1] += 2
 				grupvalue[2] += 1
@@ -256,7 +256,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		elseif PCloSkirt > 0 and will_cost > pcs_willpwr:
-			'<br>You don''t have enough willpower to bring yourself to life your skirt.'
+			act 'Lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		if rand (0,2) = 0:
@@ -264,12 +264,12 @@ if $ARGS[0] = 'break_events':
 		else
 			gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 0, 0, 0
 
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap the boy (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'misc'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'misc', 'self', 'medium'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					grupvalue[1] += 1
 					grupvalue[2] += 2
@@ -280,15 +280,15 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 				end
 			else
-				'<br>You don''t have enough willpower to slap the boy.'
+				act 'Slap the boy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Tease the boy (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'misc'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					grupvalue[1] += 3
 					grupvalue[4] += 1
@@ -298,7 +298,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 				end
 			else
-				'<br>You don''t have enough willpower to tease him.'
+				act 'Tease the boy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 	elseif break_rand = 2 and hot > 5 and PCloSkirt > 0:
@@ -325,12 +325,12 @@ if $ARGS[0] = 'break_events':
 
 		if $pantyworntype ! 'none':
 			if pcs_inhib < 50: inhib_exp += 2
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
-				act 'Own it':
+				act 'Own it (<<will_cost>> Willpower)':
 					cla
 					if pcs_inhib < 60: inhib_exp += 4
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'fame', 'pav', 'sex', 1
 					gs 'exhibitionism', 1
 					gs 'stat'
@@ -338,17 +338,17 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 				end
 			else
-				'<br>You don''t have enough willpower to take of your skirt.'
+				act 'Own it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			if pcs_inhib < 60: inhib_exp += 4
 
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'Bend down (<<will_cost>> Willpower)':
 					cla & *nl
 					if pcs_inhib < 70: inhib_exp += 5
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'fame', 'pav', 'sex', 3
 					gs 'exhibitionism', 2
 					gs 'stat'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 				end
 			else
-				'<br>You don''t have enough willpower to flash your privat parts.'
+				act 'Bend down (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 	elseif break_rand =< 5 and pav_slut > 100 and gruptipe ! 4:
@@ -378,10 +378,11 @@ if $ARGS[0] = 'break_events':
 			*nl
 			'They put their hands around your arms and begin to guide you to the restrooms. Knowing you can''t take all of them on you follow along meekly, hoping for some miracle to save you.'
 
-			gs 'willpower', 'bj'
+			gs 'willpower', 'bj', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Threaten to scream (<<will_cost>> Willpower)':
 					cla
+					gs 'willpower', 'pay', 'resist'
 					gs 'fame', 'pav', 'sex', -1
 					npc_rel['A9'] -= 5
 					grupvalue[4] -= 5
@@ -394,7 +395,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 				end
 			else
-				'<br>You don''t have enough willpower to refuse.'
+				act 'Threaten to scream (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 
 			act 'Enter the men''s restroom':
@@ -431,15 +432,15 @@ if $ARGS[0] = 'break_events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/blowme.jpg"></center>'
 		'During the break, some guy you''ve never seen before approaches you, "Hi <<$pcs_nickname>>, right? I hear you''re the best in the school at giving blowjobs! Want to umm, want to come with me and prove it?"'
 		if pav_prostitute >= pav_sex:
-			gs 'willpower', 'prostitution'
+			gs 'willpower', 'prostitution', 'resist'
 			'He then adds, "I''ll give you 50 <b>₽</b>?"'
 		else
-			gs 'willpower', 'bj'
+			gs 'willpower', 'bj', 'resist'
 		end
 		if will_cost <= pcs_willpwr:
 			act 'Tell him to get lost (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/flipoff.mp4"></video></center>'
 				if pav_prostitute >= pav_sex:
@@ -451,7 +452,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to refuse.'
+			act 'Tell him to get lost (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		act 'Go to the men''s restroom with him':
@@ -486,16 +487,16 @@ if $ARGS[0] = 'break_events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/blowme.jpg"></center>'
 		'During the break, some guy you''ve never seen before approaches you, "Hi <<$pcs_nickname>>, right? I hear you''re the best fuck in school! Want to umm, want to come with me and prove it?"'
 		if pav_prostitute >= pav_sex:
-			gs 'willpower', 'prostitution'
+			gs 'willpower', 'prostitution', 'resist'
 			'He then adds, "I''ll give you 200 <b>₽</b>?"'
 		else
-			gs 'willpower', 'sex'
+			gs 'willpower', 'sex', 'resist'
 		end
 
 		if will_cost <= pcs_willpwr:
 			act 'Tell him to get lost (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/flipoff.mp4"></video></center>'
 				if pav_prostitute >= pav_sex:
@@ -542,12 +543,12 @@ if $ARGS[0] = 'break_events':
 			gs 'gschool_events', 'leave_break_events'
 		end
 
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Slap him across the face (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'misc'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'medium'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A152'] -= 5
 				grupvalue[1] += 1
@@ -564,17 +565,15 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to slap him.'
+			act 'Slap him across the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		gs 'willpower', 'misc'
-		will_cost = will_cost * 3/2
+		gs 'willpower', 'misc', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Kick him in the balls (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'misc'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A152'] -= 10
 				grupvalue[1] += 2
@@ -585,7 +584,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to kich him in the balls.'
+			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 'Slap him playfully':
@@ -597,12 +596,12 @@ if $ARGS[0] = 'break_events':
 			gs 'gschool_events', 'leave_break_events'
 		end
 
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Playfully lift your skirt (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'exhib'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'exhib', 'self'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A152'] += 5
 				grupvalue[1] -= 3
@@ -617,17 +616,15 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to playfully lift your skirt.'
+			act 'Playfully lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		gs 'willpower', 'exhib'
-		will_cost = will_cost * 3/2
+		gs 'willpower', 'exhib', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Taunt him (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'exhib'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'exhib', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
 				pcs_horny += 50
 				gs'stat'
 				npc_rel['A152'] += 3
@@ -647,7 +644,7 @@ if $ARGS[0] = 'break_events':
 				end
 			end
 		else
-			'<br>You don''t have enough willpower to taunt him.'
+			act 'Taunt him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif break_rand = 12 and hotcat > 5 and PCloSkirt > 0:
 		cla
@@ -666,12 +663,12 @@ if $ARGS[0] = 'break_events':
 			gs 'gschool_events', 'leave_break_events'
 		end
 
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Slap him across the face (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'misc'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'medium'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A149'] -= 5
 				grupvalue[1] += 1
@@ -688,17 +685,15 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to slap him.'
+			act 'Slap him across the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		gs 'willpower', 'misc'
-		will_cost = will_cost * 3/2
+		gs 'willpower', 'misc', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Kick him in the balls (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'misc'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A149'] -= 10
 				grupvalue[1] += 2
@@ -709,7 +704,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to kich him in the balls.'
+			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 'Slap him playfully':
@@ -721,12 +716,12 @@ if $ARGS[0] = 'break_events':
 			gs 'gschool_events', 'leave_break_events'
 		end
 
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Playfully lift your skirt (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'exhib'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'exhib', 'self'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A149'] += 5
 				grupvalue[1] -= 3
@@ -741,17 +736,15 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to playfully lift your skirt.'
+			act 'Playfully lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		gs 'willpower', 'exhib'
-		will_cost = will_cost * 3/2
+		gs 'willpower', 'exhib', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Taunt him (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'exhib'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'exhib', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
 				pcs_horny += 50
 				gs'stat'
 				npc_rel['A149'] += 3
@@ -771,7 +764,7 @@ if $ARGS[0] = 'break_events':
 				end
 			end
 		else
-			'<br>You don''t have enough willpower to taunt him.'
+			act 'Taunt him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif break_rand = 13 and hotcat > 5 and PCloSkirt > 0:
 		cla
@@ -790,12 +783,12 @@ if $ARGS[0] = 'break_events':
 			gs 'gschool_events', 'leave_break_events'
 		end
 
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Slap him across the face (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'misc'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'medium'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A157'] -= 5
 				grupvalue[1] += 1
@@ -813,7 +806,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to slap him.'
+			act 'Slap him across the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		act 'Slap him playfully':
@@ -825,12 +818,12 @@ if $ARGS[0] = 'break_events':
 			gs 'gschool_events', 'leave_break_events'
 		end
 
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Playfully lift your skirt (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'exhib'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'exhib', 'self'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A157'] += 5
 				grupvalue[1] -= 3
@@ -845,17 +838,15 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 			end
 		else
-			'<br>You don''t have enough willpower to playfully lift your skirt.'
+			act 'Playfully lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		gs 'willpower', 'exhib'
-		will_cost = will_cost * 3/2
+		gs 'willpower', 'exhib', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Taunt him (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'exhib'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'exhib', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
 				pcs_horny += 50
 				gs'stat'
 				npc_rel['A157'] += 3
@@ -875,7 +866,7 @@ if $ARGS[0] = 'break_events':
 				end
 			end
 		else
-			'<br>You don''t have enough willpower to taunt him.'
+			act 'Taunt him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif break_rand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
@@ -913,12 +904,12 @@ if $ARGS[0] = 'break_events':
 			*nl
 			'After a bit he seems emboldened by you flirting back at him and if you are not mistaken, he is sporting a raging hard-on as well. "Hey <<$pcs_nickname>>, want to go somewhere private and have some fun?"'
 			
-			gs 'willpower', 'sex'
+			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Not today (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'fame', 'pav', 'sex', 1
-					gs 'willpower', 'sex'
+					gs 'willpower', 'pay', 'sex'
 					gs 'willpower', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallflirt.jpg"></center>'
@@ -926,25 +917,23 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 				end
 			else
-				'<br>You don''t have enough willpower to tell him ''Not today''.'
+				act 'Not today (<<will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			
-			gs 'willpower', 'sex'
-			will_cost = will_cost * 3/2
+			gs 'willpower', 'sex', 'resist', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Hell no (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'fame', 'pav', 'sex', -1
-					gs 'willpower', 'sex'
-					will_cost = will_cost * 3/2
-					gs 'willpower', 'resist'
+					gs 'willpower', 'sex', 'resist', 'hard'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/flipoff.mp4"></video></center>'
 					'You can not believe he asked that, well yes you can. That seems to be the only thing boys are even remotely capable of thinking about. "No! What kind of girl do you think I am anyways? Whatever, I don''t even want to know." With that you turn and storm off, leaving him behind.'
 					gs 'gschool_events', 'leave_break_events'
 				end
 			else
-				'<br>You don''t have enough willpower to refuse.'
+				act 'Hell no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 
 			act 'Offer to suck him off':
@@ -1118,12 +1107,12 @@ if $ARGS[0] = 'follow_petka':
 			gs 'gschool_events', 'leave_break_events'
 		end
 
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'force', 'medium'
 		if will_cost <= pcs_willpwr and grupTipe = 1:
 			act 'Threaten his reputation (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'misc'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'force', 'medium'
+				gs 'willpower', 'pay', 'force'
 				gs 'stat'
 				petka_homework = 1
 				grupvalue[3] -= 5
@@ -1140,15 +1129,15 @@ if $ARGS[0] = 'follow_petka':
 				act 'Take the homework': gt 'gschool_events', 'leave_break_events2'
 			end
 		elseif will_cost > pcs_willpwr and grupTipe = 1:
-			'<br>You don''t have enough willpower to threaten his reputation.'
+			act 'Threaten his reputation (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'force', 'medium'
 		if will_cost <= pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
 			act 'Give him a swirly (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'misc'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'force', 'medium'
+				gs 'willpower', 'pay', 'force'
 				gs 'stat'
 				petka_homework = 1
 				grupvalue[3] -= 10
@@ -1176,9 +1165,19 @@ if $ARGS[0] = 'follow_petka':
 				end
 			end
 		elseif will_cost > pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
-			'<br>You don''t have enough willpower to give him a swirly.'
+			act 'Give him a swirly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		
+		gs 'willpower', 'sex', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Seduce him with sex (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'self'
+				petka_homework = 2
+				gt 'gschool_events', 'homework_sex_bribe'
+			end
+		else
+			act 'Seduce him with sex (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		act 'Seduce him with sex': petka_homework = 2 & gt 'gschool_events', 'homework_sex_bribe'
 	elseif petka_homework = 2:
 		'You follow Petka into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little eager, obviously hoping you want to repeat last time. "Do you need my homework again?" He asks you.'
 		'You nod your head. "Yes."'
@@ -1341,11 +1340,11 @@ if $ARGS[0] = 'afterschool_events':
 				'You reply. "No reason I just wanted to say hi."'
 				'She shrugs a bit as she takes a big long pull off the bottle, before offering it to you. "Want a drink?"'
 
-				gs 'willpower', 'drink'
+				gs 'willpower', 'drink', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse the drink (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						grupvalue[4] -= 1
 						npc_rel['A143'] -= 2
@@ -1355,7 +1354,7 @@ if $ARGS[0] = 'afterschool_events':
 						act 'Leave': gt 'gschool_grounds', 'main'
 					end
 				else
-					'<br>You don''t have enough willpower to resist.'
+					act 'Refuse the drink (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 
 				act 'Take a drink':
@@ -1367,11 +1366,11 @@ if $ARGS[0] = 'afterschool_events':
 					'You take the offered bottle and take a swig of it yourself, it burns as it goes down. This is some of the cheapest vodka you have ever tasted. Coughing a bit you hand it back to her, which gets a smile at of her. "Fuck that''s strong."'
 					'She takes it back and takes another long swig from the bottle. "Well I don''t drink this shit for the taste but for the effect." With that she offers you the bottle again.'
 
-					gs 'willpower', 'drink'
+					gs 'willpower', 'drink', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Refuse another the drink (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/alyona3.jpg"></center>'
 							'You shake your head no and don''t take the offered bottle. "No thanks I need to be able to walk home still."'
@@ -1380,7 +1379,7 @@ if $ARGS[0] = 'afterschool_events':
 							act 'Leave': gt 'gschool_grounds', 'main'
 						end
 					else
-						'<br>You don''t have enough willpower to resist.'
+						act 'Refuse another the drink (<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 more':
@@ -1595,11 +1594,11 @@ if $ARGS[0] = 'afterschool_events':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 		'As you are heading out of school, you see a group of gopniks ahead of you. Just before you walk past them Vitek steps in front of you blocking your path. You step away from him, pulling out of reach as you turn around. You point your finger at him. "Don''t make me hurt you, you know I will."'
 		'He laughs a bit and steps up closer again, crowding you a bit but keeps his hands to himself. "Come on <<$pcs_nickname>> you know you want to have some fun, stop acting like you are not all hot and bothered by this. We can help you with that itch."'
-		gs 'willpower', 'bj'
+		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Back off (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				grupvalue[4] += 2
 				exhibition_exp += 5
@@ -1608,7 +1607,7 @@ if $ARGS[0] = 'afterschool_events':
 				act 'Walk away': gt 'gschool_grounds', 'main'
 			end
 		else
-			'<br>You don''t have enough willpower to resist.'
+			act 'Back off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Sure why not':
 			*clr & cla
@@ -1660,19 +1659,19 @@ if $ARGS[0] = 'afterschool_events':
 			i += 1
 			jump 'rand_jock_loop'
 		else
-			gs 'willpower', 'bj'
+			gs 'willpower', 'bj', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Resist (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
 					'You manage to pull away from him, but the others are blocking you. You back up but eventually find your back against one of the walls, you turn your head away from him. The boy leans in close to you. "Just do as your told or this will be a lot worse for you."'
-					gs 'willpower', 'bj'
+					gs 'willpower', 'bj', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Threaten to scream (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
 							'"I''ll scream and when the teachers arrive I will tell him you tried to rape me." He fumes and leans in real close. "You''ll regreat this slut, I promise." With that he relents and leaves with the others going with him, all giving you looks you would rather not think about.'
@@ -1684,7 +1683,7 @@ if $ARGS[0] = 'afterschool_events':
 					act 'Go to the men''s room with them':gt 'gschool_events', 'toilet_bj'
 				end
 			else
-				'<br>You don''t have enough willpower to resist.'
+				act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Go to the men''s room with them': gt 'gschool_events', 'toilet_bj'
 		end
@@ -1838,11 +1837,11 @@ if $ARGS[0] = 'rand_scoolboy':
 				grupvalue[4] -= 1
 				gt 'gschool_events', 'leave_break_events2'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap him hard (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					npc_rel['A<<r>>'] -= 5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
@@ -1865,7 +1864,7 @@ if $ARGS[0] = 'rand_scoolboy':
 					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap him hard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif npc_rel['A<<r>>'] > 50:
 			act 'Slap him playfully':
@@ -1876,12 +1875,12 @@ if $ARGS[0] = 'rand_scoolboy':
 				'You give him a playful slap in the face. It''s not hard enough to really hurt him but enough to send a message. The other boys laugh loudly, this is the best entertainment they''ve had during the break in a long time.'
 				act 'Continue': gt 'gschool_events', 'leave_break_events2'
 			end
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'Lift your skirt (<<will_cost>> Willpower)':
 					*clr & cla
 					inhib_exp += 2
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
@@ -1890,7 +1889,7 @@ if $ARGS[0] = 'rand_scoolboy':
 					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 				end
 			else
-				'<br>You don''t have enough willpower to life your skirt.'
+				act 'Lift your skirt (<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 'Continue': gt 'gschool_events', 'leave_break_events2'
@@ -2083,19 +2082,19 @@ if $ARGS[0] = 'rand_gopnic':
 				'<<$rand_boy1>> Steps up close crowding him. "Or I will fucking kick your ass right here!" Then they start shoving each other, but before more can happen a teacher interupts. "What''s going on here, break it up all of you." With that you word a thank you to <<$rand_boy1>> and slip away.'
 				act 'Leave': gt 'gschool_events', 'leave_break_events2'
 			else
-				gs 'willpower', 'bj'
+				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Resist (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
 						'You manage to pull away from him, but the others are blocking you. You back up but eventually find your back against one of the walls, you turn your head away from him. The boy leans in close to you. "Just do as your told or this will be a lot worse for you."'
-						gs 'willpower', 'bj'
+						gs 'willpower', 'bj', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Threaten to scream (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'resist'
+								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
 								'"I''ll scream and when the teachers arrive I will tell him you tried to rape me." He fumes and leans in real close. "You''ll regreat this slut, I promise." With that he relents and leaves with the others going with him, all giving you looks you would rather not think about.'
@@ -2107,7 +2106,7 @@ if $ARGS[0] = 'rand_gopnic':
 						act 'Go to the men''s room with them':gt 'gschool_events', 'toilet_bj'
 					end
 				else
-					'<br>You don''t have enough willpower to resist.'
+					act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Go to the men''s room with them': gt 'gschool_events', 'toilet_bj'
 			end

+ 1 - 1
locations/pavResidential.qsrc

@@ -191,7 +191,7 @@ if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3)
 
 	if sosedknow = 0:
 		sosedknow = 1
-		'As you walk though Pavlovsk, someone calls out to you "<<$pcs_nickname>>!" You turn around and see uncle Misha, your neighbor. He looks at your face in amazement: "Your face looks like a mess! What is that?"'
+		'As you walk through Pavlovsk, someone calls out to you "<<$pcs_nickname>>!" You turn around and see uncle Misha, your neighbor. He looks at your face in amazement, "Your face looks like a mess! What is that?"'
 		'You blush and hesitate, trying to inconspicuously wipe the sperm off your face. It''s obviously not working; he already noticed. You see his eyes widen when he realizes what it is. "I see. Looks like you had fun", he grins as he continues on his way.'
 	else
 		'Once again you run into uncle Misha, your neighbor. He notices the sperm on your face: "Again? Looks like you''ve been busy, girl. Nice look, it suits you."'

+ 119 - 106
locations/pavaptcourtev.qsrc

@@ -305,14 +305,14 @@ if $ARGS[0] = 'events1':
 				'Then he looks at you. "Sure you can have a cigarette if you suck our dicks first."'
 				'"What? Why the fuck would I do that?" you ask him.'
 				'He snorts a laugh. "Come on, everyone knows your a cocksucker. So get down on your knees and suck us off or get lost."'
-				gs 'willpower', 'bj'
+				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Move away (<<will_cost>> Willpower)':
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gt 'pavComplex', 'start' 
 					end
 				else
-					'You don''t have enough willpower to refuse.'
+					act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Get down on your knees':gt 'pavaptcourtev', 'smokeblowjob'
 			else
@@ -556,14 +556,14 @@ if $ARGS[0] = 'events2':
 				'Then he looks at you. "Sure you can have a cigarette if you suck our dicks first."'
 				'"What? Why the fuck would I do that?" you ask him'
 				'He snorts a laugh. "Come on, everyone knows your a cocksucker. So get down on your knees and suck us off or get lost."'
-				gs 'willpower', 'bj'
+				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Move away (<<will_cost>> Willpower)':
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gt 'pavComplex', 'start'
 					end
 				else
-					'You don''t have enough willpower to refuse.'
+					act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Get down on your knees':gt 'pavaptcourtev', 'smokeblowjob'
 			else
@@ -637,14 +637,14 @@ if $ARGS[0] = 'male_gopnik_beer':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeer.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the boys talking about their latest ventures, which range from vandalizing, beating some guy up, to gang banging some slut. Occasionally you comment and as well, but you mostly just listen to them.'
-	gs 'willpower', 'drink'
+	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Stop drinking and leave (<<will_cost>> Willpower)':
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gt 'pavComplex', 'start'
 		end
 	else
-		'You don''t have enough willpower to stop drinking and leave.'
+		act 'Stop drinking 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 more':
@@ -654,14 +654,14 @@ if $ARGS[0] = 'male_gopnik_beer':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 		'You grab another beer from the collection the boys have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-		gs 'willpower', 'drink'
+		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Stop drinking and leave (<<will_cost>> Willpower)': 
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gt 'pavComplex', 'start'
 			end
 		else
-			'You don''t have enough willpower to stop drinking and leave.'
+			act 'Stop drinking 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 even more':
 			*clr & cla
@@ -677,14 +677,14 @@ if $ARGS[0] = 'male_gopnik_beer':
 				act 'Stop drinking and leave':gt 'pavComplex', 'start'
 			else
 				'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the boys have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-				gs 'willpower', 'drink'
+				gs 'willpower', 'drink', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Stop drinking and leave (<<will_cost>> Willpower)': 
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gt 'pavComplex', 'start'
 					end
 				else
-					'You don''t have enough willpower to stop drinking and leave.'
+					act 'Stop drinking 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 'Grab another beer':
 					*clr & cla
@@ -696,35 +696,39 @@ if $ARGS[0] = 'male_gopnik_beer':
 					*nl
 					'This seems to amuse them even more. "Yeah I bet you could down a beer faster than Vitek can, couldn''t you?" You give him a look wondering what he is up to but right now you feel like you could out drink anyone so you nod. "Yeah I think I could."'
 					'Vasily grins widely. "Great then how about we make a bet, if you can drink one down faster than Vitek we will buy you a case of beer, but if you lose. You got to walk around the complex completely naked. What do you say?"'
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Refuse bet(<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/dandick.jpg"></center>'
 							'You shake your head no. "No I don''t think so, I wouldn''t win so no reason for me to make that bet." You reach for another beer but Dan pulls it away before you can grab it. Then he stands up and pulls his dick out of his pants. "If you want another beer you have to suck my dick."'
-							gs 'willpower', 'bj'
+							gs 'willpower', 'bj', 'resist'
 							if will_cost <= pcs_willpwr:
 								act 'Refuse (<<will_cost>> Willpower)':
 									*clr & cla
-									gs 'willpower', 'resist'
+									gs 'willpower', 'bj', 'resist'
+									gs 'willpower', 'pay', 'resist'
 									'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
 									'You shake your head no. "I''m not sucking your dick for a beer Dan."'
 									'He laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to suck his dick for a beer you sigh and leave them.'
 									act 'Move away':gt 'pavComplex', 'start'
 								end
 							else
-								'You don''t have enough willpower to refuse.'
+								act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 							act 'Agree': gt 'pavaptcourtev', 'suck3stooges'
-							gs 'willpower', 'drink'
+							
+							gs 'willpower', 'drink', 'force', 'hard'
 							if grupTipe = 4 and will_cost <= pcs_willpwr:
 								act 'Threaten Dan (<<will_cost>> Willpower)':
 									*clr & cla
 									npc_rel['A10'] -= 2
 									grupvalue[4] += 1
 									gs 'drugs', 'alcohol', 'beer'
-									gs 'willpower', 'force'
+									gs 'willpower', 'drink', 'force', 'hard'
+									gs 'willpower', 'pay', 'force'
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/dandick.jpg"></center>'
 									'You smile to Dan and reach over and grab his dick, but instead of stroking it, you dig your nails deeply into it, making him squirm and yell. Trying to pull away which only makes it hurt more. "Fuck <<$pcs_nickname>> let go before you rip my dick off!" Vitek and Vasily howl in laughter at this.'
@@ -734,11 +738,11 @@ if $ARGS[0] = 'male_gopnik_beer':
 									act 'Move away':gt 'pavComplex', 'start'
 								end
 							elseif grupTipe = 4 and will_cost > pcs_willpwr:
-								'You don''t have enough willpower to threaten Dan.'
+								act 'Threaten Dan (<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
-						'You don''t have enough willpower to refuse.'
+						act 'Refuse bet(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Make bet':
 						*clr & cla
@@ -750,11 +754,11 @@ if $ARGS[0] = 'male_gopnik_beer':
 						'Vasily laughs. "Okay, strip and pay up <<$pcs_nickname>>."'
 						'You give him a slight glare. "You cheated."'
 						'Holding up his hands. "We never said you couldn''t do something to make the other lose. So stop whining and pay up."'
-						gs 'willpower', 'exhib'
+						gs 'willpower', 'exhib', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Refuse (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'resist'
+								gs 'willpower', 'pay', 'resist'
 								npc_rel['A9'] -= 2
 								npc_rel['A10'] -= 2
 								npc_rel['A11'] -= 2
@@ -767,6 +771,8 @@ if $ARGS[0] = 'male_gopnik_beer':
 								'You know they will get over it eventually, most likely. You also know their is no point arguing with them, so you leave them to grumble about you welshing on your bet.'
 								act 'Move away':gt 'pavComplex', 'start'
 							end
+						else
+							act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 						act 'Payup':
 							*clr & cla
@@ -804,14 +810,14 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeerg' + rand(1,2) + '.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the girls talking about their latest ventures, which range from vandalizing, beating some girl up, bulling some of the nerds and outcasts, or what boys they find cute. Occasionally you comment and as well, but you mostly just listen to them.'
-	gs 'willpower', 'drink'
+	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Stop drinking and leave (<<will_cost>> Willpower)': 
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gt 'pavComplex', 'start'
 		end
 	else
-		'You don''t have enough willpower to stop drinking and leave.'
+		act 'Stop drinking 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 more':
 		*clr & cla
@@ -820,14 +826,14 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 		'You grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-		gs 'willpower', 'drink'
+		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Stop drinking and leave (<<will_cost>> Willpower)':
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gt 'pavComplex', 'start' 
 			end
 		else
-			'You don''t have enough willpower to stop drinking and leave.'
+			act 'Stop drinking 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 even more':
 			*clr & cla
@@ -836,14 +842,14 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 			'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-			gs 'willpower', 'drink'
+			gs 'willpower', 'drink', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Stop drinking and leave (<<will_cost>> Willpower)': 
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gt 'pavComplex', 'start'
 				end
 			else
-				'You don''t have enough willpower to stop drinking and leave.'
+				act 'Stop drinking 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 'Grab another beer':
 				*clr & cla
@@ -855,6 +861,57 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 				*nl
 				'This seems to amuse them even more. "Yeah I bet you could down a beer faster than Alyona can, couldn''t you?" You give her a look wondering what she is up to but right now you feel like you could out drink anyone so you nod. "Yeah I think I could."'
 				'Lena grins widely. "Great then how about we make a bet, if you can out down one faster than Alyona, Lera will walk around the complex naked, but if you lose. You got to walk around the complex completely naked. What do you say?" Lera gives Lena a look of surprise but Lena just nods and Lera doesn''t say anything.'
+
+				gs 'willpower', 'exhib', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse bet (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
+						'You shake your head no. "No I don''t think so, I wouldn''t win so no reason for me to make that bet." You reach for another beer but Lera pulls it away before you can grab it. Then he stands up and pulls her pants down enough to show off her clit. "If you want another beer you have to eat me <<$pcs_nickname>>." She says with a smirk. The other girls perk up at this and seem interested in what you''re going to do.' 
+						gs 'willpower', 'cuni', 'resist'
+						if will_cost <= pcs_willpwr:
+							act 'Refuse (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'cuni', 'resist'
+								gs 'willpower', 'pay', 'resist'
+								'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
+								'You shake your head no. "I''m not licking your pussy for a beer Lera."'
+								'She laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to lick her pussy for a beer you sigh and leave them.'
+								act 'Move away':gt 'pavComplex', 'start'
+							end
+						else
+							act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+						act 'Agree':gt 'pavaptcourtev', 'eatlera'
+						gs 'willpower', 'drink', 'force', 'hard'
+						if grupTipe = 4 and will_cost <= pcs_willpwr:
+							act 'Threaten Lera (<<will_cost>> Willpower)':
+								*clr & cla
+								npc_rel['A21'] -= 2
+								grupvalue[4] += 1
+								minut += 5
+								gs 'drugs', 'alcohol', 'beer'
+								gs 'willpower', 'drink', 'force', 'hard'
+								gs 'willpower', 'pay', 'force'
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
+								'You smile to Lera and reach over and pinch her clit between your index finger and thumb, which makes her squeal in pain, she grabs your arm with her hands. Trying to pull your hand away only makes it hurt more. "Fuck <<$pcs_nickname>> let go before you rip my clit off!" The other girls howl in laughter at this.'
+								*nl
+								'You give her a sadist little smile. "Give me a beer and I will let go." She gives you a dirty look but winces as you dig your nails in even harder, with that he quickly hands you another beer. You take your time taking another drink before releasing her.'
+								*nl
+								'She pulls her pants back up and spends the next several minutes complaining about how much her clit hurts. With the last of the beers drank, the girls get up and tell each other and you night. Then they each go their own way.'
+								act 'Move away':gt 'pavComplex', 'start'
+							end
+						elseif grupTipe = 4 and will_cost > pcs_willpwr:
+							act 'Threaten Lera (<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
+					act 'Refuse bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+
+				
 				act 'Make bet':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
@@ -865,11 +922,11 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 					'They all laugh, while Lera taunts. "Okay, strip and pay up <<$pcs_nickname>>."'
 					'You give him a slight glare. "You cheated."'
 					'Holding up her hands. "We never said you couldn''t do something to make the other lose. So stop whining and pay up."'
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Refuse (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							npc_rel['A20'] -= 3
 							npc_rel['A21'] -= 3
 							npc_rel['A44'] -= 3
@@ -884,7 +941,7 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 							act 'Move away':gt 'pavComplex', 'start'
 						end
 					else
-						'You don''t have enough willpower to refuse paying.'
+						act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Payup':
 						*clr & cla
@@ -907,50 +964,6 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 						act 'Go home':gt 'pavaptcourtev', 'homenaked'
 					end
 				end
-				gs 'willpower', 'exhib'
-				if will_cost <= pcs_willpwr:
-					act 'Refuse bet':
-						*clr & cla
-						gs 'willpower', 'resist'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
-						'You shake your head no. "No I don''t think so, I wouldn''t win so no reason for me to make that bet." You reach for another beer but Lera pulls it away before you can grab it. Then he stands up and pulls her pants down enough to show off her clit. "If you want another beer you have to eat me <<$pcs_nickname>>." She says with a smirk. The other girls perk up at this and seem interested in what you''re going to do.' 
-						gs 'willpower', 'cuni'
-						if will_cost <= pcs_willpwr:
-							act 'Refuse (<<will_cost>> Willpower)':
-								*clr & cla
-								gs 'willpower', 'resist'
-								'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
-								'You shake your head no. "I''m not licking your pussy for a beer Lera."'
-								'She laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to lick her pussy for a beer you sigh and leave them.'
-								act 'Move away':gt 'pavComplex', 'start'
-							end
-						else
-							'You don''t have enough willpower to refuse.'
-						end
-						act 'Agree':gt 'pavaptcourtev', 'eatlera'
-						gs 'willpower', 'drink'
-						if grupTipe = 4 and will_cost <= pcs_willpwr:
-							act 'Threaten Lera (<<will_cost>> Willpower)':
-								*clr & cla
-								npc_rel['A21'] -= 2
-								grupvalue[4] += 1
-								minut += 5
-								gs 'drugs', 'alcohol', 'beer'
-								gs 'willpower', 'force'
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
-								'You smile to Lera and reach over and pinch her clit between your index finger and thumb, which makes her squeal in pain, she grabs your arm with her hands. Trying to pull your hand away only makes it hurt more. "Fuck <<$pcs_nickname>> let go before you rip my clit off!" The other girls howl in laughter at this.'
-								*nl
-								'You give her a sadist little smile. "Give me a beer and I will let go." She gives you a dirty look but winces as you dig your nails in even harder, with that he quickly hands you another beer. You take your time taking another drink before releasing her.'
-								*nl
-								'She pulls her pants back up and spends the next several minutes complaining about how much her clit hurts. With the last of the beers drank, the girls get up and tell each other and you night. Then they each go their own way.'
-								act 'Move away':gt 'pavComplex', 'start'
-							end
-						elseif grupTipe = 4 and will_cost > pcs_willpwr:
-							'You don''t have enough willpower to threaten Lera.'
-						end
-					end
-				end
 			end
 		end
 	end
@@ -967,14 +980,14 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeerg' + rand(1,2) + '.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the girls talking about their latest ventures, which range from vandalizing, beating some girl up, bulling some of the nerds and outcasts, gossip about other girls, which ones are sluts and the like, or what boys they find cute. Occasionally you comment and as well, but you mostly just listen to them.'
-	gs 'willpower', 'drink'
+	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Stop drinking and leave (<<will_cost>> Willpower)': 
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gt 'pavComplex', 'start'
 		end
 	else
-		'You don''t have enough willpower to stop drinking and leave.'
+		act 'Stop drinking 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 more':
 		*clr & cla
@@ -983,14 +996,14 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 		'You grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-		gs 'willpower', 'drink'
+		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Stop drinking and leave (<<will_cost>> Willpower)':
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gt 'pavComplex', 'start' 
 			end
 		else
-			'You don''t have enough willpower to stop drinking and leave.'
+			act 'Stop drinking 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 even more':
 			*clr & cla
@@ -999,14 +1012,14 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 			'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
-			gs 'willpower', 'drink'
+			gs 'willpower', 'drink', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Stop drinking and leave (<<will_cost>> Willpower)':
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gt 'pavComplex', 'start'
 				end
 			else
-				'You don''t have enough willpower to stop drinking and leave.'
+				act 'Stop drinking 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 'Grab another beer':
 				*clr & cla
@@ -1015,14 +1028,14 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 				'Now you are feeling pretty drunk, the girls seem to be amused by just how drunk you are. They exchange a few words that you can''t quite make out. Then Lena speaks up. "Hey <<$pcs_nickname>> have another." She says as she hands you another beer.'
-				gs 'willpower', 'drink'
+				gs 'willpower', 'drink', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Stop drinking and leave (<<will_cost>> Willpower)':
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gt 'pavComplex', 'start' 
 					end
 				else
-					'You don''t have enough willpower to stop drinking and leave.'
+					act 'Stop drinking 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 'Keep drinking':
 					*clr & cla
@@ -1031,11 +1044,11 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 					'They keep passing you beers now before you even finish the previous one and encouraging you to drink faster.'
-					gs 'willpower', 'drink'
+					gs 'willpower', 'drink', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Had enough(<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							npc_rel['A20'] -= 1
 							npc_rel['A21'] -= 1
 							npc_rel['A24'] -= 1
@@ -1047,7 +1060,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 							act 'Move away':gt 'pavComplex', 'start'
 						end
 					else
-						'You don''t have enough willpower to stop drinking and leave.'
+						act 'Had enough(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Try to keep up':
 						*clr & cla
@@ -1060,11 +1073,11 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 						'You are completely wasted now, yet they still keep handing your beers and encouraging you to drink up.'
-						gs 'willpower', 'drink'
+						gs 'willpower', 'drink', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Had enough(<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'resist'
+								gs 'willpower', 'pay', 'resist'
 								npc_rel['A20'] -= 1
 								npc_rel['A21'] -= 1
 								npc_rel['A24'] -= 1
@@ -1076,7 +1089,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 								act 'Move away':gt 'pavComplex', 'start'
 							end
 						else
-							'You don''t have enough willpower to stop drinking and leave.'
+							act 'Had enough(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 						act 'Keep going':
 							*clr & cla
@@ -1137,19 +1150,19 @@ if $ARGS[0] = 'follownush':
 				'You return the kiss and soon your hands are roaming all over each others bodies, before long she starts pulling her clothes off and encouraging you to do the same.'
 				gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
 				gs 'stat'
-				gs 'willpower', 'sex'
+				gs 'willpower', 'sex', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'This is going to far(<<will_cost>> Willpower)':
 						*clr & cla
 						npc_rel['A144'] -= 1
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/complex/hey.jpg"></center>'
 						'You pull back from the kiss breaking it and pull back till her hands are no longer on you. "Uh sorry, but this is too public."'
 						'She rolls her eyes slightly. "Yeah whatever, anyways I should get going." With that she gets up and straightens up her clothes as she heads upstairs. Leaving you behind, with nothing to do but return to the courtyard.'
 						act 'Leave':gt 'pavComplex', 'start'
 					end
 				else
-					'You don''t have enough willpower to stop stop and leave.'
+					act 'This is going to far(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Undress':
 					*clr & cla
@@ -1474,11 +1487,11 @@ if $ARGS[0] = 'two_boys':
 	'You turn around and see '+iif(pavapt_boyrand = 1, 'Adrik and Petr', 'Yakov and Mikhail')+', standing behind you. One of them taking your picture with his phone, while the other walks over and leans against your apartment door, so you open it. "Please guys, I just need to get inside. Please don''t share those pictures."'
 	'The one taking the pictures laughs and keeps taking them, while his friends leers at you, looking over your whole body. "Well if you are going to run around like a whore, we should treat you like one. So how about you come over here and let us fuck you and we will keep your secret and you can be our little whore, what do you say?"'
 	gs 'stat'
-	gs 'willpower', 'gangbang'
+	gs 'willpower', 'gangbang', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Tell them no and go home(<<will_cost>> Willpower)':
 			*clr & cla
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			pav_sex += 4
 			minut += 1
 			gs 'exhibitionism', 4
@@ -1499,7 +1512,7 @@ if $ARGS[0] = 'two_boys':
 			act 'Stay home': gt 'bedrPar'
 		end
 	else
-		'You don''t have enough willpower to refuse.'
+		act 'Tell them no and go 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 'Agree':
 		*clr & cla

+ 17 - 7
locations/willpower.qsrc

@@ -8,16 +8,20 @@
 !!Example 1: Sveta is forcing somebody to perform a blowjob: gs 'willpower', 'bj', 'force'
 !!Example 2: Sveta is resisting doing drugs: gs 'willpower', 'drugs', 'resist'
 
+!!You can modify the difficulty of the check with adding an additional argument at the end. You can either add an 'easy' or a 'hard' to modify the difficulty.
+!!Example 1: Sveta is resisting doing drugs, a weak outcast is pressuring her to use them: gs 'willpower', 'drugs', 'resist', 'easy'
+!!Example 2: Sveta is resisting doing drugs, a group of gopniks are pressuring her to use them: gs 'willpower', 'drugs', 'resist', 'hard'
+
 !!There are two special cases: 'misc' and 'skill'
 
+!!'skill': Bridging a gap in skill for doing something, for succeeding when not quite meeting the required skill/attribute: gs 'willpower', '<skill>_lvl'
+!!Example for 'skill': gs 'willpower', 'pcs_makupskl_lvl' for a willpower check regarding something with pcs_makupskl_lvl (you can also apply 'easy' or 'hard' difficulty to a skill check)
+
 !!'misc': Use this 'action' if no other 'action' fits the scene. You can set three difficulty levels for this check 'easy', 'medium', 'hard' (Difficulty is only for 'misc' checks)
 !!To call 'misc' do the following: gs 'willpower', 'misc', 'type', 'difficulty'
 !!Example 1 for 'misc': Sveta wants to bring herself to slap a weak looking nerd: gs 'willpower', 'misc', 'self', 'easy'
 !!Example 2 for 'misc': Sveta wants to force Artem to go to Vitek and call him an asshole: gs 'willpower', 'misc', 'force', 'hard'
 
-!!'skill': Bridging a gap in skill for doing something, for succeeding when not quite meeting the required skill/attribute: gs 'willpower', '<skill>_lvl'
-!!Example for 'skill': gs 'willpower', 'pcs_makupskl_lvl' for a willpower check regarding something with pcs_makupskl_lvl
-
 !!After Sveta has taken the willpower action the cost must be paid with: gs 'willpower', 'pay', 'type'
 !!Example: Sveta has to pay for resisting to do a blowjob: gs 'willpower', 'pay', 'resist'
 
@@ -37,7 +41,7 @@
 			act 'Next action': gt 'farawayistan'
 		end
 	else
-		'<br>You don''t have enough willpower to kick him in the balls.'
+		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	
 }
 
@@ -56,7 +60,7 @@
 			act 'Next action': gt 'farawayistan'
 		end
 	else
-		'<br>You don''t have enough willpower to kick him in the balls.'
+		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	
 	
 	gs 'willpower', 'misc', 'self', 'medium'
@@ -72,7 +76,7 @@
 			act 'Next action': gt 'farawayistan'
 		end
 	else
-		'<br>You don''t have enough willpower to kick him in the balls.'
+		act 'Slap him across the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
 }
 
@@ -577,7 +581,13 @@ if $ARGS[0] = 'dnd':
 	end
 end
 
-if $ARGS[0] = 'pay':
+if $ARGS[0] ! 'pay' and $ARGS[0] ! 'misc' and $ARGS[2] ! '':
+	if $ARGS[2] = 'easy':
+		will_cost = will_cost * 2/3
+	elseif $ARGS[2] = 'hard':
+		will_cost = will_cost * 3/2
+	end
+elseif $ARGS[0] = 'pay':
 	if will_cost < 1: will_cost = 1
 	pcs_willpwr -= will_cost
 	if $ARGS[1] = 'force':