27 Commits 3a1b54f8e1 ... 87a6a0198f

Author SHA1 Message Date
  KevinSmarts 87a6a0198f Merge remote-tracking branch 'julzor/master' 5 years ago
  KevinSmarts 9fca771a7f Merge remote-tracking branch 'Sicaa/master' 5 years ago
  KevinSmarts 93f6929016 Merge remote-tracking branch 'Sicaa/master' 5 years ago
  Sicaa 97d665bc60 [fixed] modifications to earlier VoltrenerSexShower fix 5 years ago
  julzor 929f4e67f8 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  Sicaa 34c0a39acb [added] exhibitionist underwear status messages 5 years ago
  Sicaa 615a5a1f6c [fixed] VoltrenerShowerSex events no longer hide preceding scenes 5 years ago
  KevinSmarts 62a3080ea2 Merge remote-tracking branch 'julzor/master' 5 years ago
  julzor 69cb4d32e8 [fixed] setting is blocked until $menu_loc was set 5 years ago
  KevinSmarts 631f2e5917 [fixed] typos found by analyser 5 years ago
  julzor 6e3da78b08 [fixed] text not showing in gschool_lessonsev3 5 years ago
  julzor 1d36abb598 [fixed] errors picked up by the analyser 5 years ago
  julzor 27d8a91304 [fixed] willpower update 5 years ago
  julzor bfba5be14b Merge branch 'master' of https://git.catrenelle.com/Deroc/glife 5 years ago
  Deroc a5dba13e1e [fixed] Willpower seeding, anushka & gschool_lunch 5 years ago
  julzor 615994b825 [fixed] willpower update 5 years ago
  julzor a37c008725 [fixes] willpower updates 5 years ago
  julzor b6072044a6 [fixed] updated willpower checks in gschool_lessonsev3 5 years ago
  julzor e0544f308a [fixed] more willpower updates 5 years ago
  julzor 0d5cd231dc Merge branch 'master' of https://git.catrenelle.com/Deroc/glife 5 years ago
  julzor 44486ac218 [fixed] updated willpower in gschool_chats3 5 years ago
  Deroc 7b071f8f7b [fixed] more willpower seeding, gschool_detention 5 years ago
  julzor 78daf09923 Merge branch 'master' of https://git.catrenelle.com/Deroc/glife 5 years ago
  julzor 7781482a7e [fixed] more willpower updates 5 years ago
  Deroc 3041f013ba [fixed] willpower seeding in sny.qsrc 5 years ago
  julzor 50b3d5965d [fixed] updated willpower code in gschool_break 5 years ago
  julzor eeef03e123 [fixed] updated willpower calls in gschool_girls_bathroom and gschool_lessons2 5 years ago

+ 1 - 1
locations/ParChurch.qsrc

@@ -420,7 +420,7 @@ if $ARGS[0] = 'tease':
 					gt 'ParChurch' , 'start'
 				end
 			else
-				act 'Leave the church (<<will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Leave the church (<br><font color="red"><<will_cost>> Willpower</font>)': '<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.' 

+ 24 - 24
locations/anushapt.qsrc

@@ -147,14 +147,14 @@ if $ARGS[0] = 'home':
 				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
 				'As you get down to Anushka''s bedroom door you can hear voices inside. One of them her and the others obviously a guy. You can''t quite make out what they are saying. You lean against the door to hear better and you hear the guy say. "Turn around and let me see that fine ass of yours."'
 				
-				gs 'willpower', 'exhib'
+				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Leave them in peace and leave the apartment (<<will_cost>> Willpower)': 
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gt 'pavComplex','start'
 					end
 				else
-					'You don''t have enough willpower to resist the temptation.'
+					act 'Leave them in peace and leave the apartment (<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 peek':
 					*clr & cla
@@ -190,14 +190,14 @@ if $ARGS[0] = 'home':
 				AnushkaLoc = 2
 				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
 				'As you get down to Anushka''s bedroom door you can hear voices inside. One of them her and the others obviously a guy. You can''t quite make out what they are saying. You lean against the door to hear better and you hear the guy say. "You wanna fuck?"'
-				gs 'willpower', 'exhib'
+				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Leave them in peace and leave the apartment (<<will_cost>> Willpower)':
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gt 'pavComplex','start'
 					end
 				else
-					'You don''t have enough willpower to resist the temptation.'
+					act 'Leave them in peace and leave the apartment (<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 peek':
 					*clr & cla
@@ -230,14 +230,14 @@ if $ARGS[0] = 'home':
 				AnushkaLoc = 2
 				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
 				'As you get down to Anushka''s bedroom door you can hear voices inside. One of them her and the others obviously a guy. You can''t quite make out what they are saying. You lean against the door to hear better and you hear the guy say. "God your so beautiful."'
-				gs 'willpower', 'exhib'
+				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Leave them in peace and leave the apartment (<<will_cost>> Willpower)': 
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gt 'pavComplex','start'
 					end
 				else
-					'You don''t have enough willpower to resist the temptation.'
+					act 'Leave them in peace and leave the apartment (<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 peek':
 					*clr & cla
@@ -484,22 +484,22 @@ if $ARGS[0] = 'computer':
 			npc_rel['A144'] += 1
 			'She hit the nail right on the head, and given how open she is about everything, you don''t feel like it''s necessary to lie to her about it; so you nod. "Yeah, I guess I am."'
 			'Anushka''s smile broadens and lust flares up in her eyes. "We could watch some together, if you want..."'
-			act 'You don''t want to':
-				*clr & cla
-				'As appealing as watching porn sounds right now, you''re not in the mood to watch it with her, at least not right now.'
-				'"Nah, I''d really rather do something else right now," you say.'
-				'Anushka shrugs. "Alright, that''s cool." She seems to be rubbing her legs together, though - maybe even the idea of watching porn with you got her a little worked up.'
-				act 'Find something else to do':gt 'anushapt','anushroom'
-			end
-			gs 'willpower', 'exhib'
+			
+			gs 'willpower', 'misc', 'resist', 'hard'
 			if will_cost <= pcs_willpwr:
-				act 'Agree to watch porn (<<will_cost>> Willpower)': 
-					gs 'willpower', 'force'
-					gt 'anushapt','agreeporn'
+				act 'You don''t want to (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					'As appealing as watching porn sounds right now, you''re not in the mood to watch it with her, at least not right now.'
+					'"Nah, I''d really rather do something else right now," you say.'
+					'Anushka shrugs. "Alright, that''s cool." She seems to be rubbing her legs together, though - maybe even the idea of watching porn with you got her a little worked up.'
+					act 'Find something else to do':gt 'anushapt','anushroom'
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				act 'You don''t want to (<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 to watch porn': gt 'anushapt','agreeporn'
 		end
 	elseif AnushkaCompUse > 0 and AnushkaLoc ! 2:
 		*clr & cla
@@ -1895,11 +1895,11 @@ if $ARGS[0] = 'nushshower':
 				'"Yes when I want to, now go on get out of here." She says while making a shooing motion with one of her hands.'
 				'You know deep down she really doesn''t care, she loves showing off her body to much, but maybe you should give her some privacy.'
 				act 'Go wait for her': gt 'anushapt', 'shower_wait'
-				gs 'willpower', 'exhib'
+				gs 'willpower', 'exhib', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Show me a little skin (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'force'
+						gs 'willpower', 'pay', 'force'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/photo2.jpg"></center>'
 						'You move around to get in a better spot. "Don''t be like that, show me a little skin. Come on you know you want to." You say in a teasing tone.'
 						'She smiles a bit that quickly turns into a smirk as she turns her back to you and drops off the towel some to show off her back.'
@@ -1955,7 +1955,7 @@ if $ARGS[0] = 'nushshower':
 						end
 					end
 				else
-					'You don''t have enough willpower to refuse.'
+					act 'Show me a little skin (<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

+ 24 - 19
locations/anushka.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'plan':
 	*nl
 	'You look at the pills, turning them this way and that uncertainly, and look up at the two of them again. "What exactly will these do to him?"'
 	'Valentin answers before Anushka can. "Make him tired, is all. He will sleep for a few hours and feel a little groggy for the rest of the day but nothing serious - we''re just gonna make detention a bit less boring, <<$pcs_nickname>>, we''re not trying to kill him. So, you going to do it or not?"'
-	gs 'willpower', 'crime'
+	gs 'willpower', 'crime', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'This is WAY too sketchy - Refuse (<<will_cost>> Willpower)':
 			*clr & cla
@@ -22,7 +22,8 @@ if $ARGS[0] = 'plan':
 			npc_rel['A158'] -= 2
 			grupvalue[4] -= 3
 			Anushka_toilet = -1
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/detention/detention.jpg"></center>'
 			'You shake your head and hand back the pills. "Sorry, guys, but I can''t be part of that. It just... does''nt feel right."'
@@ -32,7 +33,7 @@ if $ARGS[0] = 'plan':
 			act 'Go home': gt 'gschool_detention', 'end'
 		end
 	else
-		'You don''t have enough willpower to refuse.'
+		act 'This is WAY too sketchy - Refuse (<font color="red"><<will_cost>> Willpower</font)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 	end
 	act 'Well, they did say it''s harmless - Agree':
 		*clr & cla
@@ -60,7 +61,7 @@ if $ARGS[0] = 'plan':
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/detention/sex/det3sum.jpg"></center>'
 			'Once the teacher starts snoring, Valentin gets up. "Come on, let''s go." Anushka follows suit and pulls you up as well. You wander down the halls ''til the three of you reach the teachers'' lounge. Valentin pulls some lockpicks from his pocket and expertly uses them to unlock the door. You and your companions head inside quickly and he locks the door behind you. While he does, Anushka pulls you towards a big leather couch. You both flop down on the comfy couch and Valentin sits down between you a few seconds later. He pulls a small flask from his jacket pocket and takes a quick gulp from it before passing it to Anushka, who takes a healthy swig and passes it to you.'
-			gs 'willpower', 'drink'
+			gs 'willpower', 'drink', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'No thanks (<<will_cost>> Willpower)':
 					*clr & cla
@@ -68,7 +69,7 @@ if $ARGS[0] = 'plan':
 					npc_rel['A158'] -= 1
 					grupvalue[4] -= 1
 					minut += 3
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/detention/sex/det3sum.jpg"></center>'
@@ -77,12 +78,13 @@ if $ARGS[0] = 'plan':
 					gs 'stat'
 					if hotcat >= 6:
 						'As Anushka and Valentin make out she reaches down to close her hand around his cock, immediately starting to jerk him. After she has him good and hard, she reaches toward you with both hands, grabs your head and pushes you down into his lap.'
-						gs 'willpower', 'bj'
+						gs 'willpower', 'bj', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Pull away (<<will_cost>> Willpower)':
 								*clr & cla
 								npc_rel['A158'] -= 1
-								gs 'willpower', 'resist'
+								gs 'willpower', 'pay', 'resist'
+								gs 'stat'
 								'<center><img src="images/locations/pavlovsk/school/detention/sex/det3sum.jpg"></center>'
 								'Before your face gets too close to his cock you pull away, Anushka doesn''t really try to stop you when she feels you resist. "Sorry guys, but I just wanted out of detention, I don''t want to have a orgy with the two of you."'
 								'Anushka seems completely unfazed and before you even finish speaking she lowers her head and starts sucking Valentin''s cock.'
@@ -92,7 +94,7 @@ if $ARGS[0] = 'plan':
 								act 'Go home': gt 'gschool_detention', 'end'
 							end
 						else
-							'You don''t have enough willpower to refuse.'
+							act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 						end
 						act 'Suck him':
 							*clr & cla
@@ -111,7 +113,7 @@ if $ARGS[0] = 'plan':
 					end
 				end
 			else
-				'<br>You don''t have enough willpower to refuse.'
+				act 'No thanks (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 			end
 			act 'Take a drink':
 				*clr & cla
@@ -119,6 +121,7 @@ if $ARGS[0] = 'plan':
 				npc_rel['A158'] += 1
 				grupvalue[4] += 1
 				minut += 3
+				joint += 1
 				gs 'drugs', 'alcohol',  'moonshine', 1
 				gs 'drugs', 'joint'
 				gs 'stat'
@@ -128,13 +131,14 @@ if $ARGS[0] = 'plan':
 				*nl
 				gs 'stat'
 				if hotcat >= 6:
-					'As Anushka and Valentin make out she reaches down to close her hand around his cock, immediately starting to jerk him. After she has him good and hard, she reaches toward you with both hands, grabs your head and pushes you down into his lap.'			
-					gs 'willpower', 'bj'
+					'As Anushka and Valentin make out she reaches down to close her hand around his cock, immediately starting to jerk him. After she has him good and hard, she reaches towards you with both hands, grabs your head and pushes you down into his lap.'			
+					gs 'willpower', 'bj', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Pull away (<<will_cost>> Willpower)':
 							*clr & cla
 							npc_rel['A158'] -= 1
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
 							'<center><img src="images/locations/pavlovsk/school/detention/sex/det3sum.jpg"></center>'
 							'Before your face gets too close to his cock you pull away, Anushka doesn''t really try to stop you when she feels you resist. "Sorry guys, but I just wanted out of detention, I don''t want to have a orgy with the two of you."'
 							'Anushka seems completely unfazed and before you even finish speaking she lowers her head and starts sucking Valentin''s cock.'
@@ -144,7 +148,7 @@ if $ARGS[0] = 'plan':
 							act 'Go home': gt 'gschool_detention', 'end'
 						end
 					else
-						'You don''t have enough willpower to refuse.'
+						act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 					end
 					act 'Suck him':
 						*clr & cla
@@ -377,11 +381,12 @@ if $ARGS[0] = 'temptation':
 				'"Sorry I just can''t." Then you turn and head back to your table in detention. You just can''t. The rest of detention passes very slowly, you don''t see her for the rest of it.'
 				act 'Go home':minut += 15 & gt 'gschool_grounds', 'main'
 			end
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'I would like to but... (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/getnaked.jpg"></center>'
 					'You blush a little at the thought and bite your lip, it could be fun and you actually would like to, but what if you got caught? "I don''t know Nush, what if we get caught?"'
@@ -390,7 +395,7 @@ if $ARGS[0] = 'temptation':
 					act 'Get Naked': gt 'anushka', 'naked'
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				act 'I would like to but... (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 			end
 			act 'Get Naked': gt 'anushka', 'naked'
 		end
@@ -431,12 +436,12 @@ if $ARGS[0] = 'naked':
 				'You smile and take it from her, taking a long drag from the joint. Maybe it will help take your mind off the thought of getting caught naked in a classroom by the school janitor. You pass it back and forth between you as you make small talk, listening to the machine steadily getting closer.'
 				act 'Wait for the janitor to pass': anushLimitedQuestions = 4 & gt 'anushka', 'chatwhilewaiting'
 			end
-			gs 'willpower', 'drugs'
+			gs 'willpower', 'drugs', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Decline (<<will_cost>> Willpower)':
 					*clr & cla
 					npc_rel['A144'] -= 1
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/hiding.jpg"></center>'
@@ -444,7 +449,7 @@ if $ARGS[0] = 'naked':
 					act 'Wait for the janitor to pass': anushLimitedQuestions = 4 & gt 'anushka', 'chatwhilewaiting'
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				act 'Decline (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 			end
 		end
 	end

+ 6 - 6
locations/anushkaev1.qsrc

@@ -568,11 +568,11 @@ if $ARGS[0] = 'couch_strapon_give':
 			act 'Fuck her': gt 'anushkaev1','couch_fuck_her'
 			act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass'
 		end
-		gs 'willpower', 'cuni'
+		gs 'willpower', 'cuni', 'force'
 		if will_cost <= pcs_willpwr:
 			act 'Sit on her face (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'force'
+				gs 'willpower', 'pay', 'force'
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap4.jpg"></center>'
 				'You use her hair to pull her head back, she gives you a questioning look. You just keep leaning forward and pulling her hair back until she has to lay on her back. Once on her back, you trail your tongue up her stomach, across her breasts to her face, before you raise back up. You scoot forward and straddle her face, lowering your twat down against her face. She starts darting her tongue into your wet pussy, while you ride and rub your clit against her face.'
 				gs 'arousal', 'cuni', 3, 'lesbian'
@@ -588,7 +588,7 @@ if $ARGS[0] = 'couch_strapon_give':
 				end
 			end
 		else
-			'You lack the willpower to force her to lick you.'
+			act 'Sit on her face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 end
@@ -638,11 +638,11 @@ if $ARGS[0] = 'couch_fuck_her_ass':
 		gs 'stat'
 		act 'Finish': gt 'anushkaev1','couch_strap_finish'
 	end
-	gs 'willpower', 'anal'
+	gs 'willpower', 'anal', 'force'
 	if will_cost <= pcs_willpwr:
 		act 'Fuck her ass hard (<<will_cost>> Willpower)':
 			*clr & cla
-			gs 'willpower', 'force'
+			gs 'willpower', 'pay', 'force'
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap9.jpg"></center>'
 			'"Oh you want me to <b>FUCK</b> your ass, I''ll fuck your ass like the dirty anal slut you are." You say as you take a really hard grip on her hips and slam the strapon balls deep into her ass and start really pounding her ass as hard and fast as you can. You can feel her try to pull away some and you see her gripping the back of the couch hard. But you don''t let her pull away, you jerk back on her hips, not allowing her to escape the fucking you are giving her.'
@@ -679,7 +679,7 @@ if $ARGS[0] = 'couch_fuck_her_ass':
 			end
 		end
 	else
-		'You don''t have enough willpower to make yourself fuck her even harder.'
+		act 'Fuck her ass hard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 	

+ 29 - 26
locations/gdksport.qsrc

@@ -971,17 +971,16 @@ if $ARGS[0] = 'shower':
 		end
 	else
 		'You enter the women''s shower and turning the water on begin to lather your body with a washcloth. After you rinsed off the soap, you washed your hair with shampoo. Next you rinsed out the shampoo out of your hair and feel completely clean.'
-		if (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0:
-			if VoltrenerVoyeur = 0:
-				gt 'VoltrenerSexShower', '0'
-			elseif VoltrenerVoyeur = 1:
-				gt 'VoltrenerSexShower', '1'
-			elseif VoltrenerVoyeur = 2 and IvanShowerYes = 0:
-				gt 'VoltrenerSexShower', '2'
-			end
-		end
+		if (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0 and VoltrenerVoyeur = 0:
+			act 'Continue': gt 'VoltrenerSexShower', '0'
+		elseif (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0 and VoltrenerVoyeur = 1:
+			act 'Continue': gt 'VoltrenerSexShower', '1'
+		elseif (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0 and VoltrenerVoyeur = 2 and IvanShowerYes = 0:
+			act 'Continue': gt 'VoltrenerSexShower', '2'
+		else
 			'After your shower, you get dressed.'
-		act 'Get out of the shower':gt 'gdksport', 'start'
+			act 'Get out of the shower':gt 'gdksport', 'start'
+		end
 	end
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 end
@@ -1073,24 +1072,28 @@ if $ARGS[0] = 'ShowerWithIvan':
 						minut -= 5
 						gs 'stat'
 
-						if VoltrenerVoyeur = 3:gt 'VoltrenerSexShower', '3'
-						if VoltrenerVoyeur = 4:gt 'VoltrenerSexShower', '4'
-						if VoltrenerVoyeur = 5:gt 'VoltrenerSexShower', '5'
-
-						if pcs_horny >= 100:
-							if stat['anal'] >= 10 and orgasm > 0:
-								pcs_mood += 20
-								$orgasm_or = 'custom'
-								$orgasm_txt = 'Your whole body contracts and then you cry out in orgasm.'
+						if VoltrenerVoyeur = 3:
+							act 'Continue': gt 'VoltrenerSexShower', '3'
+						elseif VoltrenerVoyeur = 4:
+							act 'Continue': gt 'VoltrenerSexShower', '4'
+						elseif VoltrenerVoyeur = 5:
+							act 'Continue': gt 'VoltrenerSexShower', '5'
+						else
+							if pcs_horny >= 100:
+								if stat['anal'] >= 10 and orgasm > 0:
+									pcs_mood += 20
+									$orgasm_or = 'custom'
+									$orgasm_txt = 'Your whole body contracts and then you cry out in orgasm.'
+								end
 							end
+							'Your moans of pleasure start to turn into grunts of pain. Apparently sensing your growing discomfort he makes one more powerful thrust with a grunt. His body spasms against yours as you feel him cumming in your ass. Once he is done he pulls out of your ass and goes back to showering, he quickly finishes up and starts to get dressed.'
+							'He watches you as you get dressed. "That was great <<$pcs_nickname>>, we should do that again sometime." Without waiting for a reply he leaves the shower.'
+							cumspclnt = 1
+							gs 'cum_cleanup'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Get out of the shower':gt 'gdksport', 'start'
 						end
-						'Your moans of pleasure start to turn into grunts of pain. Apparently sensing your growing discomfort he makes one more powerful thrust with a grunt. His body spasms against yours as you feel him cumming in your ass. Once he is done he pulls out of your ass and goes back to showering, he quickly finishes up and starts to get dressed.'
-						'He watches you as you get dressed. "That was great <<$pcs_nickname>>, we should do that again sometime." Without waiting for a reply he leaves the shower.'
-						cumspclnt = 1
-						gs 'cum_cleanup'
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Get out of the shower':gt 'gdksport', 'start'
 					end
 				end
 			end

+ 4 - 4
locations/glake.qsrc

@@ -154,14 +154,14 @@ 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'
+						gs 'willpower', 'sex', 'resist'
 						if will_cost <= pcs_willpwr:
-							act 'Refuse and run home naked: (<<will_cost>> Willpower)':
-								gs 'willpower', 'resist'
+							act 'Refuse and run home naked (<<will_cost>> Willpower)':
+								gs 'willpower', 'pay', 'resist'
 								gt 'glake', 'nude_home'
 							end
 						else
-							'You don''t have enough willpower to refuse.'
+							act 'Refuse and run home naked (<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 to have sex': gt 'glake', 'car_sex'
 					end

+ 65 - 47
locations/gschool_boys_bathroom.qsrc

@@ -150,11 +150,11 @@ if $ARGS[0] = 'boy2':
 	'You look up at him and smile, "Hey Radomir, just cutting class. Needed a break, you know?"'
 	if hotcat >= 5:
 		'He nods his head a bit. "Sure, sure, I gotcha. Glad to find you here, I was afraid I might get bored," he says as he moves into the stall with you, grabs your wrist tightly and pulls you up. You haven''t even processed what he''s doing when you feel his lips on yours as he drags you out of the stall with him.'
-		gs 'willpower', 'sex'
+		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Stop him (<<will_cost>> willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big39.jpg"></center>'
 				'You turn your head, but he just takes it as an invitation to nuzzle your neck instead. You try and push him off, but he is way stronger than you are. "Radomir, no, I don''t want to."'
@@ -165,12 +165,14 @@ if $ARGS[0] = 'boy2':
 				if gruptipe = 4:'As he finds and rubs your clit '+iif($pantyworntype ! 'nude', 'through your panties','')+', he whispers: "If you''re an obedient little bitch, I will put in a good word with the rest. Who knows, maybe I could get you fully accepted."'
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
-				gs 'willpower', 'sex'
+				
+				gs 'willpower', 'sex', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
 					act 'Slap him (<<will_cost>> willpower)':
-						gs 'willpower', 'resist'
 						*clr & cla
 						npc_rel['A154'] -= 5
+						gs 'willpower', 'sex', 'resist', 'hard'
+						gs 'willpower', 'pay', 'resist'
 						gs 'arousal', 'end'
 						gs 'stat'
 						'You push him away again and this time, you gain just enough room to slap him. He stops, a bit surprised at first that you slapped him, but then he slaps you back. "What the fuck?! Don''t you dare slap me, bitch!"'
@@ -182,22 +184,36 @@ if $ARGS[0] = 'boy2':
 						act 'Go to class':gt 'gschool_lessons', 'short_break'
 					end
 				else
-					'<br>You don''t have enough willpower to slap him.'
+					act 'Slap 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 'I said no':
-					*clr & cla
-					'You shove him back a step. "I said no, stop please." He backs up a step and puts his hands up. "Fine, what the fuck ever. But then why the fuck are you in the boys bathroom, if not to get fucked like a slut?"'
-					'You really don''t know why you came in here instead of the girls bathroom, but you did. "Because girls can be bitchy and I didn''t feel like dealing with it." He calms down a bit and then shrugs.'
-					'"Yeah okay, I guess. Anyways, I got more important things to do." With that he walks out.'
-					if school_bunk = 0:
-						act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
-					else
-						act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
+				
+				gs 'willpower', 'sex', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'I said ''no'' (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'sex', 'resist'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						'You shove him back a step. "I said no, stop please." He backs up a step and puts his hands up. "Fine, what the fuck ever. But then why the fuck are you in the boys bathroom, if not to get fucked like a slut?"'
+						'You really don''t know why you came in here instead of the girls bathroom, but you did. "Because girls can be bitchy and I didn''t feel like dealing with it." He calms down a bit and then shrugs.'
+						'"Yeah okay, I guess. Anyways, I got more important things to do." With that he walks out.'
+						if school_bunk = 0:
+							act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
+						else
+							act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
+						end
 					end
+				else
+					act 'I said no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				if gruptipe = 4:
-					act 'Back the fuck off':
+				
+				gs 'willpower', 'sex', 'resist'
+				if gruptipe = 4 and will_cost <= pcs_willpwr:
+					act 'Back the fuck off (<<will_cost>> Willpower)':
 						*clr & cla
+						gs 'willpower', 'sex', 'resist'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
 						'You turn spinning you both around a bit and then you shove him hard against the counter, "Back the fuck off, Radomir, or I''ll be wearing your balls as earrings." He laughs a bit at that but raises his hands up, as if to surrender.'
 						'"Yeah yeah, I was just playing, girl. No need to get all bitchy. Anyways if you don''t want to play, there are other bitches dying to take a ride. Catch you later, <<$pcs_nickname>>." He pauses to check himself in the mirror and straighten up his hair before walking out like nothing happened.'
 						if school_bunk = 0:
@@ -206,11 +222,14 @@ if $ARGS[0] = 'boy2':
 							act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
 						end
 					end
+				elseif gruptipe = 4 and will_cost > pcs_willpwr:
+					act 'Back the 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
+				
 				act 'Submit to him':gt 'gschool_boys_bathroom', 'boy2_sub'
 			end
 		else
-			'<br>You don''t have enough willpower to stop him.'
+			act 'Stop 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 'Have fun':
 			*clr & cla
@@ -224,21 +243,20 @@ if $ARGS[0] = 'boy2':
 		end
 	else
 		'He nods his head a bit. "Sure sure, I gotcha. Hey, do you have a smoke?" he asks as he seems to search his pockets for a pack of cigarettes.'
-		if siga = 0:
-			act 'No':
-				*clr & cla
-				npc_rel['A154'] -= 1
-				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big39.jpg"></center>'
-				'You shake your head no, "No, sorry."'
-				'He looks a bit annoyed and heads for the door, kicking the trash can as he goes. "Fuck! What a fucked up day." With that he walks out.'
-				if school_bunk = 0:
-					act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
-				else
-					act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
-				end
+		act 'No':
+			*clr & cla
+			npc_rel['A154'] -= 1
+			'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big39.jpg"></center>'
+			'You shake your head no, "No, sorry."'
+			'He looks a bit annoyed and heads for the door, kicking the trash can as he goes. "Fuck! What a fucked up day." With that he walks out.'
+			if school_bunk = 0:
+				act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
+			else
+				act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
 			end
-		elseif siga > 0:
+		end
+		if siga > 0:
 			act 'Yes':
 				*clr & cla
 				gs 'drugs','smoke'
@@ -325,11 +343,11 @@ if $ARGS[0] = 'boy3':
 	*nl
 	if hotcat >= 6:
 		'Lazar sets the folder aside. "I was studying the playbook for this week''s game, but I''d be up for some fun and stress relief," he says with a lustful grin. You''re wondering what he means by ''stress relief,'' when he suddenly moves towards you. He quickly starts kissing you and grabbing at your breasts and ass.'
-		gs 'willpower', 'sex'
+		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr: 
 			act 'Stop him (<<will_cost>> willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 				'You use your hands to pry his off of your body and step back from the kiss, "Sorry, Lazar, but that''s not what I meant."'
@@ -340,11 +358,11 @@ if $ARGS[0] = 'boy3':
 				'You pause for a moment, realizing why he thought you wanted to have sex. "I... Look, girls can really be catty at times, like super-annoying and bitchy, and I just wasn''t in the mood for that. So, I thought, hiding in here would be more relaxing, you know?"'
 				*nl
 				'He grins and steps close again, so close that you can feel his breath on your cheeks. "I know a great way to relax, and it sure beats talking..." There''s something appealing about him, a charm that is hard to resist, and you notice that he''s leaning in for another kiss...'
-				gs 'willpower', 'sex'
+				gs 'willpower', 'sex', 'resist'
 				if will_cost <= pcs_willpwr:
-					act '"I said, ''no''" (<<will_cost>> willpower)':
+					act 'I said, ''no'' (<<will_cost>> willpower)':
 						*clr & cla
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 						'You put your hand up and stop him again, "Look, seriously, I just wanted to talk. But if you''d rather not..." You trail off and make telling motions towards your things in the stall and the bathroom door.'
@@ -355,12 +373,12 @@ if $ARGS[0] = 'boy3':
 						act 'Go to class':gt 'gschool_lessons', 'short_break'
 					end
 				else
-					'<br>You don''t have a enough willpower to resist him.'
+					act 'I said, ''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 'Return the kiss':gt 'gschool_boys_bathroom', 'boy3_kiss'
 			end
 		else
-			'<br>You don''t have a enough willpower to stop him.'
+			act 'Stop 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 'Return the kiss':gt 'gschool_boys_bathroom', 'boy3_kiss'
 	else
@@ -734,11 +752,11 @@ if $ARGS[0] = 'boy6':
 		'After a couple of minutes, you hear several boy''s voices and recognize several of them as gopniks from your class. Several stall doors slam open, their echo loud as thunder and just as startling, and one of them says, "Man, you sure?" There is a pause in the noise as another answers, "I''m telling you, I saw her come in here just after the bell rang." A few more doors of stalls slam open until, suddenly, your door is the one to slam. You see Dan standing there, grinning at you, "Found her. You was right." He steps in and grabs you around the waist, dragging you out of the stall.'
 		*nl
 		'The other boys quickly move over. Within moments, you find yourself in the middle of five of your gopnik classmates, all leering at you lustfully. You know exactly what they are thinking and what they want. You doubt you can reason with them... but perhaps you could scream? Maybe someone would hear you; or maybe it would only piss them off. You could also try and make a run for it.'
-		gs 'willpower', 'sex'
+		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Run out (<<will_cost>> willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				runout = rand(1,4)
 				if runout = 1:
 					'<center><b><font color="maroon">School Hall</font></b></center>'
@@ -759,21 +777,21 @@ if $ARGS[0] = 'boy6':
 				end
 			end
 		else
-			'<br>You don''t have enough willpower to resist him.'
+			act 'Run out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Submit': gt 'gschool_boys_bathroom', 'boy6_sub'
 	elseif gruptipe = 4 and hotcat >= 5:
 		'After a couple of minutes, you hear several boy''s voices and recognize several of them as gopniks from your class. Several stall doors slam open, their echo loud as thunder and just as startling, and one of them says, "Man, you sure?" There is a pause in the noise as another answers, "I''m telling you, I saw her come in here just after the bell rang." A few more doors of stalls slam open until, suddenly, your door is the one to slam. You see Dan standing there, grinning at you. "Found her. You was right." He steps in and grabs you around the waist, dragging you out of the stall.'
 		*nl
 		'The other boys quickly move over. Within moments, you find yourself in the middle of five of your gopnik classmates, all leering at you lustfully. Vitek roughly grabs and squeezes one of your tits. "Come on, <<$pcs_nickname>>, let''s have some fun. You know you want to... and so do we. Isn''t that right?" he asks the others who nod their heads yes and start pawing at you as well. You could still get out of this and make them stop, you know that - the gopniks are a rowdy bunch but they''re not complete assholes or rapists - but if you make them stop, they''ll become angry. That makes giving in and seeing where this goes an option you seriously consider; it could genuinely be fun and would certainly make them like you more if you submitted to their desires. That''s how it works, right?'
-		gs 'willpower', 'sex'
+		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act '"Not today" (<<will_cost>> willpower)':
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gt 'gschool_boys_bathroom', 'boy6_not'
 			end
 		else
-			'<br>You don''t have enough willpower to resist them.'
+			act '"Not today" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Submit': gt 'gschool_boys_bathroom', 'boy6_sub'
 	elseif gruptipe = 4 and hotcat < 5:
@@ -806,11 +824,11 @@ if $ARGS[0] = 'boy6_not':
 	'Once near the door, you finally manage break out of the circle of them, your clothes half pulled off, but you are getting a little annoyed with them now and they can clearly hear that when you cry out, "I said enough! Back the fuck up, all of you, now!" With that, all of them stop, but Vitek, who has been silently watching you struggle for the last minute or two, shoves you towards the door, his eyes hard, "Then get the fuck out of here, and don''t come trying to hang out with us." You are looking at him incredulity - he seriously would ''cast you out'', just because you wouldn''t have sex with all of them? He couldn''t possibly be serious... right?'
 	*nl
 	'It''s not too late; you could still submit to their desires, if you wanted to... or you could stand your ground and leave. After all, Vitek might not mean that about hanging out with them. It is always hard to tell with gopniks.'
-	gs 'willpower', 'sex'
+	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Leave (<<will_cost>> willpower)':
 			cla
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			grupvalue[4] +=1
 			'<center><b><font color="maroon">School Hall</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall02.jpg"></center>'
@@ -818,7 +836,7 @@ if $ARGS[0] = 'boy6_not':
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	else
-		'<br>You don''t have enough willpower to resist them.'
+		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
 	act 'Give in': gt 'gschool_boys_bathroom', 'boy6_sub'
 end

+ 40 - 40
locations/gschool_break.qsrc

@@ -218,11 +218,11 @@ if $ARGS[0] = 'girls_restroom_events':
 		elseif grupTipe = 1 or grupTipe = 2:
 			'As you enter the bathroom, you see Lena standing in the corner. She watches you as you come in, then narrows her eyes a little. You notice her watching you and decide to ask what''s up. "You ok Lena? You are looking a bit flushed."'
 			'She gives you a evil little smile. "No that bitch Lera got me all worked up and then got herself in trouble, leaving me here with blue balls. So why don''t you come over here and eat my pussy like a good little girl." She says as she spreads her legs slightly.'
-			gs 'willpower', 'sex'
+			gs 'willpower', 'sex', 'resist'
 			if will_cost < pcs_willpwr:
 				act 'Tell her no (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					npc_rel['A20'] -= 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
@@ -240,17 +240,17 @@ if $ARGS[0] = 'girls_restroom_events':
 					end
 				end
 			else
-				'<br>You don''t have enough willpower to refuse.'
+				act 'Tell her 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 'Agree': gt 'gschool_break', 'lena_dom'
 		elseif grupTipe = 3 or grupTipe = 5:
 			'As you enter the bathroom, you see Lena standing in the corner. She watches you as you come in, then narrows her eyes a little. You notice her watching you and decided to ask what''s up. "You ok Lena? You are looking a bit flushed."'
 			'She gives you a evil little smile. "No that bitch Lera got me all worked up and then got herself in trouble, leaving me here with blue balls. So get over here and get on your knees and eat my pussy, before I beat you ass and make you do it." She says, as she spreads her legs slightly.'
-			gs 'willpower', 'cuni'
+			gs 'willpower', 'cuni', 'resist'
 			if will_cost < pcs_willpwr:
 				act 'Tell her no (<<will_cost>> willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					npc_rel['A20'] -= 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
@@ -259,22 +259,22 @@ if $ARGS[0] = 'girls_restroom_events':
 					'You know these gopnik girls are dangerous, most of them like to fight for fun and many of them carry knives. Not sure how serious she is about this, you know that you are far enough away that you can just dash out of the restroom, but she might come after you later, or you could do what she says and lick her pussy.'
 					act 'Submit': gt 'gschool_break', 'lena_dom'
 !!ToDo: Add in a option to fight once we revamp fighting (nutluck)
-					gs 'willpower', 'cuni'
+					gs 'willpower', 'cuni', 'resist'
 					if will_cost < pcs_willpwr:
 						act 'Make a run for it (<<will_cost>> willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
 							'You turn and run for the door. As you make it to the door you hear Lena call after you. "You can run all you want bitch, I will find you and kick your ass, eventually"'
 							act 'Continue': gt 'gschool_lessons', 'short_break'
 						end
 					else
-						'<br> You don''t have enough willpower to refuse.'
+						act 'Make a run for it (<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
-				'<br> You don''t have enough willpower to refuse.'
+				act 'Tell her 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 'Submit': gt 'gschool_break', 'lena_dom'
 		else
@@ -309,12 +309,12 @@ if $ARGS[0] = 'girls_restroom_events':
 		else
 			'As you walk in, you see a group of gopnik girls, all talking. Obviously up to something by the way they are acting, they turn almost as one to glare at you and you feel a chill run down your spine. You picked the wrong time to come to the bathroom, you know Lena, Lera, Paulina, and Ekaterina but the other ones are from your brothers class. Paulina takes a step towards you and in a menacing tone. "Leave now!" You know you should leave, you are no match for this many girls and if they decided to kick your ass or worse you won''t be able to stop them or escape, but you are also tired of the gopniks acting like they run the school and the rules don''t apply to them.'
 			act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost < pcs_willpwr:
 				act 'Refuse (<<will_cost>> willpower)':
 					*clr & cla
 					uniform_steal_day = daystart
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
 					if pav_slut > 75:
@@ -425,7 +425,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					end
 				end
 			else
-				'<br>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
 		end
 	else
@@ -639,15 +639,15 @@ if $ARGS[0] = 'boys_restroom_events':
 				'He shrugs a little. "What about her? She is ok with me getting something on the side. So you going to come over here and suck it or just stare at it all day?" Blushing a little at his comment, you are unsure. Should you suck his dick or maybe you should just leave.'
 				gs 'arousal', 'voyeur', 2, 'unknown'
 				gs 'stat'
-				gs 'willpower', 'bj'
+				gs 'willpower', 'bj', 'resist'
 				if will_cost < pcs_willpwr:
 					act 'Don''t suck his dick and leave (<<will_cost>> willpower)':
 						gs 'arousal', 'end'
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gt 'gschool_lessons', 'short_break'
 					end
 				else
-					'<br>You don''t have enough willpower to resist him.'
+					act 'Don''t suck his dick 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 'Get on knees':
 					*clr & cla
@@ -665,11 +665,11 @@ if $ARGS[0] = 'boys_restroom_events':
 						gs 'stat'
 						act 'Let him cum on your face': gt 'gschool_break', 'andrey_cum'
 					end
-					gs 'willpower', 'sex'
+					gs 'willpower', 'sex', 'force'
 					if will_cost < pcs_willpwr:
 						act 'I want to be on top (<<will_cost>> willpower)':
 							*clr & cla
-							gs 'willpower', 'force'
+							gs 'willpower', 'pay', 'force'
 							gs 'boyStat', 'A147'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/andrey2.jpg"></center>'
 							'You get up and put your hand on his chest. "How about you lay down and let me ride you like the wild stallon you are?" He grins a bit at that and lays down on his back. You straddle him and slowly lower yourself down, grabbing his dick to line it up, you slowly impale yourself on his <<dick>>cm <<$dick_girth>> dick. You feel it slowly slide inside your pussy as you lower yourself down, filling you up. Then you at first slowly start to ride him, picking up speed, as it starts feeling better and better.'
@@ -687,7 +687,7 @@ if $ARGS[0] = 'boys_restroom_events':
 							end
 						end
 					else
-						'<br>You don''t have enough willpower to be on top.'
+						act 'I want to be on top (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Turn around':
 						*clr & cla
@@ -717,12 +717,12 @@ if $ARGS[0] = 'boys_restroom_events':
 			'He laughs a bit. "Are you sure that is all you wanted? Are you sure you weren''t craving a cock up your ass? If so I could totally help you out with that." He says with a wink.'
 			'You cock your head to one side. "So you just want me to turn around and let you shove your dick up my ass?" You ask with one brow slightly arched.'
 			'"Well no, you can suck it a bit first to get it nice and wet, so it slides in easier." He says with a confident grin.'
-			gs 'willpower', 'anal'
+			gs 'willpower', 'anal', 'resist'
 			if will_cost < pcs_willpwr:
 				act 'Decline his offer (<<will_cost>> willpower)':
 					*clr & cla
 					menu_off = 0
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/ivan1.jpg"></center>'
 					'You shake your head no. "Uh, no thanks, I definitely didn''t come here looking for that."'
@@ -730,7 +730,7 @@ if $ARGS[0] = 'boys_restroom_events':
 					gs 'gschool_break', 'restroom_actions'
 				end
 			else
-				'<br>You don''t have enough willpower to resist.'
+				act 'Decline his offer (<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 and get on knees':
 				*clr & cla
@@ -802,11 +802,11 @@ if $ARGS[0] = 'boys_restroom_events':
 			
 			act 'Sneak away and leave':	gs 'arousal', 'end' & gt 'gschool_lessons', 'short_break'
 
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost < pcs_willpwr:
-				act 'Push the stall door open':
+				act 'Push the stall door open (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/alylav1.jpg"></center>'
 					if grupTipe < 5 and hotcat >= 6:
@@ -861,18 +861,18 @@ if $ARGS[0] = 'boys_restroom_events':
 							'You bite your lower lip feeling pretty turned on watching Alyona suck Lavrenti''s cock. "Maybe I can join you guys, if you don''t mind?"'
 							'Lavrenti gets a huge grin on his face. "Fuck yeah, I love fucking two bitches at the same time."'
 							act 'Join them': gt 'gschool_break', 'join_alylav'
-							gs 'willpower', 'sex'
+							gs 'willpower', 'sex', 'resist'
 							if will_cost < pcs_willpwr:
 								act 'I just want to suck your dick (<<will_cost>> willpower)':
 									*clr & cla
-									gs 'willpower', 'resist'
+									gs 'willpower', 'pay', 'resist'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/alylav1.jpg"></center>'
 									'You shake your head. "I just wanted to suck your dick not fuck."'
 									'Alyona rolls her eyes and Lavrenti waves you away. "Bah, if are not all in then get lost!" With that he closes the stall door, blocking your view. Knowing better than to try and spy again you leave before things get worse.'
 									act 'Continue your break': gt 'gschool_lessons', 'short_break'
 								end
 							else
-								'<br>You don''t have enough willpower to only give him a blowjob.'
+								act 'I just want to suck your dick (<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 'I can suck your dick better than her':
@@ -886,11 +886,11 @@ if $ARGS[0] = 'boys_restroom_events':
 							'Lavrenti looks at Alyona. "Don''t be like that, you can have a go next.". With that she moves past you and shoves you hard against the back of the stall. "Fuck both of you." With that she leaves the stall, leaving you to sit down on the toilet seat. As you do, you find Lavrenti''s cock in your face. Using one hand you stroke the shaft of his dick while you suck on the head, bobbing your head up and down in motion with your hand. He pulls open your shirt to fondle your titties. A few minutes pass, when he says: "Get up, I want to get that pussy of yours all wet so I can fuck it."'
 							gs 'arousal', 'bj', 3, 'dom'
 							gs 'stat'
-							gs 'willpower', 'sex'
+							gs 'willpower', 'sex', 'resist'
 							if will_cost < pcs_willpwr:
 								act 'Just give him a blowjob (<<will_cost>> willpower)':
 									*clr & cla
-									gs 'willpower', 'resist'
+									gs 'willpower', 'pay', 'resist'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/alylav5.jpg"></center>'
 									'You stop sucking his dick just long enough to reply, leaving your hand to keep stroking him as you do. "I just want to suck you off." With that you go back to sucking his dick, you don''t know if he is disappointed or not, though you don''t know of any boy that would be disappointed at getting a blowjob.'
 									*nl
@@ -905,7 +905,7 @@ if $ARGS[0] = 'boys_restroom_events':
 									act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
 								end
 							else
-								'<br>You don''t have enough willpower to only give him a blowjob.'
+								act 'Just give him a blowjob (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 							act 'Spread your legs':
 								*clr & cla
@@ -950,7 +950,7 @@ if $ARGS[0] = 'boys_restroom_events':
 					end
 				end
 			else
-				'<br>You don''t have enough willpower to open the door.'
+				act 'Push the stall door open (<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
@@ -1094,11 +1094,11 @@ if $ARGS[0] = 'smoke2':
 										gs 'arousal', 'foreplay', 2, 'sub'
 										gs 'stat'
 										
-										gs 'willpower', 'misc'
+										gs 'willpower', 'misc', 'resist', 'medium'
 										if will_cost < pcs_willpwr:
 											act 'No (<<will_cost>> Willpower)':
 												*clr & cla
-												gs 'willpower', 'resist'
+												gs 'willpower', 'pay', 'resist'
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo10.jpg"></center>'
 												'You snort a laugh. "You think a little spanking is going to set me on the straight and narrow, please!"'
@@ -1121,11 +1121,11 @@ if $ARGS[0] = 'smoke2':
 															act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
 														else
 															'She pulls her feet away from you, while still holding you by the hair. "So have you had enough?"'
-															gs 'willpower', 'misc'
+															gs 'willpower', 'misc', 'resist', 'medium'
 															if will_cost < pcs_willpwr:
 																act 'Screw you bitch (<<will_cost>> Willpower)':
 																	*clr & cla
-																	gs 'willpower', 'resist'
+																	gs 'willpower', 'pay', 'resist'
 																	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo13.jpg"></center>'
 																	'"Screw you bitch!" You tell her defiantly. Her nostrils flare and she gives you a hard glare.'
 																	'"What are you mouthing me for, you little bitch. I''m not the one that is going to get screwed here." She says, as she takes off her skirt and pulls off her panties. She then forces you to strip down as well. Once you are naked and still on your knees, she turns her butt towards your face and grabs you by the hair, pulling your hair between her ass checks, she uses the meter stick to smack one of your boobs, not too hard, but hard enough that it hurts. "Lick!" Not wanting to get smacked in the tit again, you start to lick her ass.'
@@ -1169,7 +1169,7 @@ if $ARGS[0] = 'smoke2':
 																	end
 																end
 															else
-																'<br>You don''t have enough willpower to say ''no'' to her.'
+																act 'Screw you bitch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 															end
 															act 'Yes':
 																*clr & cla
@@ -1185,7 +1185,7 @@ if $ARGS[0] = 'smoke2':
 												end
 											end
 										else
-											'<br>You don''t have enough willpower to say ''no'' to her.'
+											act '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 'Yes':
@@ -1380,10 +1380,10 @@ if $ARGS[0] = 'naked_bathroom':
 					end
 				end
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost < pcs_willpwr:
 				act 'Tell her a lie (<<will_cost>> Willpower)':
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					*clr & cla
 					gs 'exhibitionism', 3
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/officenaked.jpg"></center>'
@@ -1423,7 +1423,7 @@ if $ARGS[0] = 'naked_bathroom':
 					end
 				end
 			else
-				'<br>You don''t have enough willpower to bring yourself to tell her a lie.'
+				act 'Tell her a lie (<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

+ 3 - 3
locations/gschool_chats1.qsrc

@@ -23,14 +23,14 @@ if $ARGS[0] = 'dimka':
 			cla
 			'You bite your lower lip nervously and look down, as you shake you head. "No, just give me a little more time and I will have it please?" You beg him.'
 			'He sighs. "I like you <<$pcs_nickname>>, I do. But I can''t just let you slide, how about you pay me a little interest and you can pay me later." The way he says it, it leaves you no doubt exactly what he considers <i>interest</i> and it isn''t money.'
-			gs 'willpower', 'sex'
+			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse (<<will_cost>> Willpower)':
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>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 'Go with Dimka': gt 'gschool_chats1', 'dimka_sex'
 		end		

+ 3 - 3
locations/gschool_chats3.qsrc

@@ -18,11 +18,11 @@ if $ARGS[0] = 'vitek':
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
 
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'force', 'hard'
 		if wil_cost >= pcs_willpwr and pcs_dom > 0:
 			act 'Argue that it''s not true (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'force'
+				gs 'willpower', 'pay', 'force'
 				sub += 5
 				if pav_sex > 100: pav_sex = 100
 				if pav_prostitute > 100: pav_prostitute = 100
@@ -32,7 +32,7 @@ if $ARGS[0] = 'vitek':
 				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
 		elseif wil_cost < pcs_willpwr:
-			'You don''t have enough willpower to argue against it.'
+			act 'Argue that it''s not true (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A9'] += 1

+ 29 - 23
locations/gschool_detention.qsrc

@@ -84,11 +84,12 @@ if $ARGS[0] = 'wedgie':
 	gs 'gschool_detention', 'back_down'
 	gs 'gschool_detention', 'return_favor', 'random'
 	
-	gs 'willpower', 'misc'
+	gs 'willpower', 'misc', 'self', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Smack her (<<will_cost>> Willpower)':
 			*clr & cla
-			gs 'willpower', 'force', 'self'
+			gs 'willpower', 'pay', 'self'
+			gs 'stat'
 			grupvalue[4] += 1
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/slap.jpg"></center>'
@@ -99,7 +100,7 @@ if $ARGS[0] = 'wedgie':
 			act 'Take the offer': gt 'gschool_detention', 'offer'
 		end
 	else
-		'<br>You don''t have enough willpower to hit her.'
+		act 'Smack her (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to hit her.</font>'
 	end
 end
 
@@ -236,13 +237,14 @@ if $ARGS[0] = 'sitting_events':
 			'As tempting as it is, you decided against it. You''re just not that kind of girl, after a bit you give up and starting playing on your phone again.'
 			act 'Go home': gt 'gschool_detention', 'end'
 		end
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Yes (<<will_cost>> willpower)':
 				*clr & cla
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'pay', 'self'
 				pav_sex += 1
 				gs 'exhibitionism', 1
+				gs 'stat'
 				inhib_exp += rand(1,3)
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/detsitflash.mp4"></video></center>'
@@ -250,7 +252,7 @@ if $ARGS[0] = 'sitting_events':
 				act 'Go home': gt 'gschool_detention', 'end'
 			end
 		else
-			'<br>You don''t have enough willpower to do it.'
+			act 'Yes (<font color="red"><<will_cost>> willpower</font>)':'<br><font color="red">You don''t have enough willpower to do it.</font>'
 		end
 	end
 end
@@ -433,11 +435,11 @@ if $ARGS[0] = 'Help Friends in need':
 	'You share a table with <<$rand_girl>> and <<$rand_boy>>. Before long, he is flirting for all he is worth with her and going by her giggles at several things he says, he''s striking the right tone. The teacher shushes them a few times but doesn''t really make much of an effort to silence them. <<$rand_boy>> leans in and whisper something to her that earns him a half hearted smack on the shoulder and you overhear her calling him "bad" - her smile and the way she plays with her hair suggests that she likes "bad".'
 	*nl
 	'They have a whispered argument or discussion - you are not sure which - but when they are done, they both look around and you can tell they are up to something. <<$rand_girl>> leans over to you and whispers: "Can you distract Mr <<$rand_teacher>> for us, so we can slip away?" Both of them give you pleading looks.'
-	gs 'willpower', 'misc'
+	gs 'willpower', 'misc', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'No (<<will_cost>> Willpower)':
 			cla & *clr
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detflirt.jpg"></center>'
@@ -447,7 +449,7 @@ if $ARGS[0] = 'Help Friends in need':
 			act 'Go home': gt 'gschool_detention', 'end'
 		end
 	else
-		'<br>You don''t have enough willpower to say ''no''.'
+		act 'No (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to say ''no''.</font>'
 	end
 	act 'Yes':
 		cla & *clr
@@ -521,11 +523,12 @@ if $ARGS[0] = 'strange':
 				$orgasm_or = 'no'
 				gs 'arousal', 'cuni', 10, 'dom'
 				gs 'stat'
-				gs 'willpower', 'cuni'
+				gs 'willpower', 'cuni', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Glaze his face (<<will_cost>> willpower)':
 						*clr & cla
-						gs 'willpower', 'force'
+						gs 'willpower', 'pay', 'force'
+						gs 'stat'
 						npc_rel['A152'] -= 5
 						'<center><b><font color="maroon">Detention</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/detlick2.jpg"></center>'
@@ -545,7 +548,7 @@ if $ARGS[0] = 'strange':
 						act 'Go home': gt 'gschool_detention', 'end'
 					end
 				else
-					'<br>You don''t have enough willpower to force him to keep going.'
+					act 'Glaze his face (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to force him to keep going.</font>'
 				end
 				act 'Suck his cock':
 					*clr & cla
@@ -694,11 +697,12 @@ if $ARGS[0] = 'company2':
 	'He laughs a bit, "Yeah, I''ve seen your name on the detention sheet, so I knew you had been a bad girl and would be here." Then his expression gets more serious and he talks softly so no one can overhear him. "I have been wanting to talk to you about the other day, you know, in the bathroom?" He flushes a little bit as he says that.'
 	'You grin - it is funny watching him getting a little embarrassed about it. "What about it? I had fun. Didn''t you?", you ask, feigning indignance to tease him.'
 	'He looks slightly panicked as he reassures you. "No, no, no. It''s not that, I had fun, it was great! I, um... well, I was just wondering if you wanted to meet me after detention?"'
-	gs 'willpower', 'sex'
+	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> willpower)':
 			*clr & cla
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay','resist'
+			gs 'stat'
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/marcusflirt.jpg"></center>'
 			'You shake your head. "Sorry Marcus, I don''t have time today."'
@@ -709,7 +713,7 @@ if $ARGS[0] = 'company2':
 			act 'Go home': gt 'gschool_detention', 'end'
 		end
 	else
-		'<br>You don''t have enough willpower to resist.'
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
 	end
 	act 'Agree':
 		*clr & cla
@@ -812,33 +816,35 @@ if $ARGS[0] = 'Ivanov':
 	'"Miss <<$Surename>>, it''s time that you repay me for keeping your cutting class secret." Turning in your chair, you see his dick sticking out of his pants; the bastard already had sex with you for his silence and now he expects you to keep getting him off!'
 	*nl
 	'The wheels are turning in your head: On one hand, it''s not like you haven''t already let him have his way with you, so your reluctance at the thought probably isn''t as strong as it should be. But that doesn''t change the fact that he is blackmailing you, and who''s to say where that leads you or when he''ll be satisfied? Should you submit or make a stand?'
-	gs 'willpower', 'sex'
+	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Tell him to "fuck off" (<<will_cost>> willpower)':
 			*clr & cla
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/fuckoff.jpg"></center>'
 			'You flip him off and stand up. "Fuck you, I already gave you what you wanted to be silent." You take a few steps toward the door but then stop dead in your tracks when you hear your own voice, offering Mr Ivanov a fuck if he doesn''t tell on you. The bastard recorded you in the bathroom?! You turn around to see him holding his phone, a hard, triumphant look meeting yours as he answers the silent question: "That''s right, I recorded our little chat. I knew you were going to offer sex - right from the first time you entered my class, I knew you were a little whore, and I was right, wasn''t I? So, now, you are going to be my little whore anytime I want, or else I will get you expelled for trying to have sex with one of your teachers... and I''ll make sure your parents will hear about it, too. Just imagine how disappointed they''ll be how their daughter turned out."'
 			*nl
 			'You are completely stunned, shock and fear burning and boiling in your chest like fire and acid. Telling your parents? Getting you expelled from school? You knew he was a twisted motherfucker, but this? You had no idea he was the kind of scum who would threaten to destroy your life so he could own you. A part of you tries to stay rational and thinks that he would get in as much trouble as you, if not more, if the school found out. Problem is, you can''t <b>prove</b> that you had sex, that he took you up on your offer, that he fucked a student. The only recording of the event is his and he''s probably smart enough to cut it so it only has you soliciting him. Would they really expel you? You don''t know.'
-			act 'You can''t take that risk - Suck his cock': gt 'gschool_detention', 'Ivanov_suck'
-			gs 'willpower', 'sex'
+			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
-				act 'You won''t let him blackmail you - "Fuck you, asshole!" (<<will_cost>> willpower)':
+				act 'You won''t let him blackmail you - "Fuck you, asshole!" (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/fuckoff.jpg"></center>'
 					'You gather all of your courage in one defiant smirk and flip him off again. "Fuck you, asshole. You hear me? FUCK YOU!!! Do what you gotta do, but I will make sure they know you fucked me and tried to blackmail me, and then we''ll see if they let you keep your job." With that, you walk out and go back towards the library, your heart pounding against your ribs. Several minutes later, Mr Ivanov returns to detention as well and sits back down behind his desk. He doesn''t say anything to you for the rest of the detention, leaving you to contemplate in silence whether your decision was the right one or not. When the bell rings, you quickly gather your stuff and head home.'
 					act 'Go home': gt 'gschool_detention', 'end'
 				end
 			else
-				'<br>You don''t have enough willpower to resist.'
+				act 'You won''t let him blackmail you - "Fuck you, asshole!" (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
 			end
+			act 'You can''t take that risk - Suck his cock': gt 'gschool_detention', 'Ivanov_suck'
 		end
 	else
-		'<br>You don''t have enough willpower to resist.'
+		act 'Tell him to "fuck off" (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
 	end
 	act 'Suck his cock': gt 'gschool_detention', 'Ivanov_suck'
 end

+ 2 - 2
locations/gschool_events.qsrc

@@ -909,8 +909,8 @@ if $ARGS[0] = 'break_events':
 				act 'Not today (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'fame', 'pav', 'sex', 1
-					gs 'willpower', 'pay', 'sex'
-					gs 'willpower', 'resist'
+					gs 'willpower', 'sex', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallflirt.jpg"></center>'
 					'You pause for a bit, acting like you are giving his suggestion some serious thought, just to fuck with him, until you realize you''re not pretending: you really are considering it! Damn, maybe you are a bit of a slut. After a few moments you shake your head. "You seem nice but I hardly know you, maybe some other time, but now I need to run. Talk to you later." With that you hurry off leaving him unsure if this was a good or bad thing.'

+ 30 - 12
locations/gschool_girls_bathroom.qsrc

@@ -108,11 +108,11 @@ if $ARGS[0] = 'girl2':
 	'"Hi <<$pcs_nickname>>, you cutting class?" she asks while looking at you from the mirror.'
 	'"Yeah, I couldn''t take another boring class, I needed a little fun," you tell her with a smile.'
 	'Sonia turns around and looks at you for a moment, biting her lower lip. You can tell by the way the look in her eyes that she''s considering something; her mind made up, she walks up to you, gives you a kiss and whispers seductively into your ear: "I know what we could do for fun..."'
-	gs 'willpower', 'sex'
+	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Stop her (<<will_cost>> willpower)':
 			*clr & cla
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			npc_rel['A25'] += 10
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
@@ -128,7 +128,7 @@ if $ARGS[0] = 'girl2':
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	else
-		'<br>You don''t have enough willpower to stop her.'
+		act 'Stop her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Return the kiss':
 		*clr & cla
@@ -185,12 +185,12 @@ if $ARGS[0] = 'girl3':
 		*nl
 		'Lena leans in a bit, taking a closer look at you. "Is that right? Are you a scared little bunny, <<$pcs_nickname>>?" Without waiting for you to answer, she glances at Lera. "I bet she thinks she''s a bad girl, for cutting class. How about we show her what happens to bad little girls?" She starts laughing and Lera joins in. You are not sure how you feel about this; they are a lot of fun, but their idea of fun can also be pretty damn mean. Part of you is strangely excited, but you are also worried about what comes next.'
 	end
-	gs 'willpower', 'sex'
+	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Try to run out (<<will_cost>> willpower)':
 			$location_type = 'public_indoors'
 			*clr & cla
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			runout = rand(1,4)
 			if runout = 1:
 				'<center><b><font color="maroon">School Hall</font></b></center>'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'girl3':
 			end
 		end
 	else
-		'<br>You don''t have enough willpower to get away from her.'
+		act 'Try to run out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Protest':
 		*clr & cla
@@ -220,12 +220,12 @@ if $ARGS[0] = 'girl3':
 		*nl
 		'Lera leans in close and blows smoke in your face while Lena says: "Oh, you want to have some fun, huh? Ok, we can have some fun with you." Glancing and smirking at Lera as she speaks, both of them grab ahold of you from each side and you''re starting to wish you had just kept your mouth shut.'
 		act 'Submit': gt 'gschool_girls_bathroom', 'toy bunny'
-		gs 'willpower', 'sex'
+		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Try to run out (<<will_cost>> willpower)':
 				$location_type = 'public_indoors'
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				runout = rand(1,4)
 				if runout = 1:
 					'<center><b><font color="maroon">School Hall</font></b></center>'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'girl3':
 				end
 			end
 		else
-			'<br>You don''t have enough willpower to get away from her.'
+			act 'Try to run out (<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 'Bad girl':
@@ -256,12 +256,12 @@ if $ARGS[0] = 'girl3':
 		*nl
 		'"Is that so, bunny? You a bad girl now? Why don''t we show you what real bad girls are like," Lena says as she steps close and grabs your arm; Lera quickly follows suit on your other side. "We''re going to have some fun with you, little bunny." Lera promises with a mean grin.'
 		act 'Submit': gt 'gschool_girls_bathroom', 'toy bunny'
-		gs 'willpower', 'sex'
+		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Try to run out (<<will_cost>> willpower)':
 				$location_type = 'public_indoors'
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				runout = rand(1,4)
 				if runout = 1:
 					'<center><b><font color="maroon">School Hall</font></b></center>'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'girl3':
 				end
 			end	
 		else
-			'<br>You don''t have enough willpower to get away from her.'
+			act 'Try to run out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 
@@ -575,6 +575,24 @@ if $ARGS[0] = 'company3':
 				act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
 			end
 		end
+	else
+		gs 'willpower', 'misc', 'self', 'hard'
+		if will_cost <= pcs_willpwr:	
+			act 'Wait and resist masturbating (<<will_cost>> Willpower)':
+				cla & *nl
+				gs 'willpower', 'pay', 'self'
+				gs 'arousal', 'end'
+				gs 'stat'
+				'You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
+				if school_bunk = 0:
+					act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+				else
+					act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+				end
+			end
+		else
+			act 'Wait and resist masturbating (<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 'Masturbate':
 		*clr & cla

+ 131 - 122
locations/gschool_lessons1.qsrc

@@ -183,10 +183,12 @@ if $ARGS[0] = 'math':
 					'Mr. Tsarev says, "You don''t know do you? Then at least try to pay attention. Many things that we need in life require some effort from us all. It''s not always fun but some of the things we learn making life easier in the future, leading to even more pleasant times." Not knowing what to say, you simply nod as Anatoly turns around and continues his lesson. You sit through the rest of the lesson in silence, while your mind drifts elsewhere. You can''t focus on the lesson at all.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessonsev2', 'math'
 				end
+				
+				gs 'willpower', 'misc', 'self', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Give him an attitude (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'force', 'self'
+						gs 'willpower', 'pay', 'self'
 						pcs_grades -= rand(1,2)
 						demerit +=5
 						grupvalue[1] +=1
@@ -197,12 +199,11 @@ if $ARGS[0] = 'math':
 						*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 						'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" You answer boldly. The whole class bursts into laughter, and Anatoly has a rough time getting everyone to quiet down. "Miss <<$pcs_lastname>>, do you find this kind of behavior amusing? or are you just seeking attention? Try to answer this question for yourself while to head off to the principal''s office." Anatoly then points to the door.'
 						
-						act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
-						gs 'willpower', 'misc'
+						gs 'willpower', 'misc', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:	
 							act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'resist'
+								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
 								pcs_grades -= rand(0,1)
 								demerit +=5
@@ -219,11 +220,12 @@ if $ARGS[0] = 'math':
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						else
-							'<br>You don''t have enough willpower to stay inside the classroom.'
-						end					
+							act 'Don''t leave the classroom (<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 principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					end
 				else
-					'<br>You don''t have enough willpower to give him an attidude.'
+					act 'Give him an attitude (<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
@@ -295,11 +297,11 @@ if $ARGS[0] = 'math':
 					'You turn off your phone then put it away. Mr. Tsarev give you an approving nod before continuing with today''s lesson.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'math'
 				end
-				gs 'willpower', 'misc'
+				gs 'willpower', 'misc', 'self', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Keep using your phone (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'force', 'self'
+						gs 'willpower', 'pay', 'self'
 						pcs_grades -= 1
 						grupvalue[4] +=1
 						grupvalue[3] -= 1
@@ -318,12 +320,12 @@ if $ARGS[0] = 'math':
 							'Anatoly extends his hand then says, "What is so important on there that you need to disrupt my lesson? Hand it over." You realize that Anatoly is not messing around and decide that it''s not worth the conflict, so you silently hand your phone to Mr. Tsarev. As Anatoly walks back to the front of the class, he says, "I''m holding onto your phone for now, Miss <<$pcs_lastname>>. You can have it back after class."'
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
-						gs 'willpower', 'exhib'
+						gs 'willpower', 'exhib', 'self'
 						if will_cost <= pcs_willpwr:
 							act 'Take photos under your skirt (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'exhib'
-								gs 'willpower', 'force', 'self'
+								gs 'willpower', 'exhib', 'self'
+								gs 'willpower', 'pay', 'self'
 								gs 'stat'
 								if $pantyworntype ! 'none':
 									gs 'exhibitionism', 1
@@ -342,14 +344,14 @@ if $ARGS[0] = 'math':
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						else
-							'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+							act 'Take photos under 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', 'misc'
+						gs 'willpower', 'misc', 'self', 'medium'
 						if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 							act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'misc'
-								gs 'willpower', 'force', 'self'
+								gs 'willpower', 'misc', 'self', 'medium'
+								gs 'willpower', 'pay', 'self'
 								gs'stat'
 								demerit += 5
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
@@ -361,11 +363,11 @@ if $ARGS[0] = 'math':
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-							'<br>You don''t have enough willpower to hide your phone in your bra.'
+							act 'Hide the phone in your bra (<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
-					'<br>You don''t have enough willpower to keep using your phone.'
+					act 'Keep using your phone (<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
@@ -427,11 +429,11 @@ if $ARGS[0] = 'russian':
 				'You''re pretty sure you know what Mr. Yenotin has in mind and you don''t want to get in trouble so you straighten up in your chair. "Sorry." The teacher gives you one final look, knowing he has you beaten. You do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit +=5
 					grupvalue[1] +=1
@@ -441,11 +443,11 @@ if $ARGS[0] = 'russian':
 					'"I''ll try to... Can''t you make the lesson more fun instead? Atleast throw in some fun facts or do some funny voices. If you continue on like this, I''m sure it won''t take to long before I''m back to where we started!" you answer boldly.'
 					'The whole class bursts into loud laughter, and Mr. Yenotin tries his hardest getting everyone to quiet down.'
 					'"Now you''ve done it <<$pcs_lastname>>, you probably want a reaction from me, but don''t worry I already have a punishment in mind."'
-					gs 'willpower', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'What''s the worst you could do? (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'pay', 'self'
 							pcs_grades -= rand(1,3)
 							demerit +=5
 							grupvalue[4] +=1
@@ -455,10 +457,12 @@ if $ARGS[0] = 'russian':
 							'Your teacher just smirks and shakes his head, and after a while just decides to continue his classes. Obviously, you don''t learn anything today. As he turns his back to you, you flip him off...'
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
+					else
+						act 'What''s the worst you could do? (<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
-				'<br>You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -520,11 +524,12 @@ if $ARGS[0] = 'russian':
 				'You decide not to aggravate the situation and put your phone away. Mr. Yenotin looks at you gratefully as they continues the class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
 					pcs_grades -= rand(0,1)
 					grupvalue[3] -= 1
 					grupvalue[4] +=1
@@ -541,12 +546,12 @@ if $ARGS[0] = 'russian':
 						'While his back is turned to you, you flip him off as that''s the only thing you can resort to.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -563,14 +568,14 @@ if $ARGS[0] = 'russian':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
@@ -580,11 +585,11 @@ if $ARGS[0] = 'russian':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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
-				'<br>You don''t have enough willpower to keep using your phone.'
+				act 'Keep using your phone (<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
@@ -658,11 +663,11 @@ if $ARGS[0] = 'literature':
 				'"Sorry, Ms. Braakman." You mumble quietly as you sit up straight and refocus on the lesson. Satisfied, Ms. Braakman returns to teaching with a small smile.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit +=5
@@ -686,7 +691,7 @@ if $ARGS[0] = 'literature':
 					end
 				end
 			else
-				'<<br>>You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -738,11 +743,11 @@ if $ARGS[0] = 'literature':
 				'You decide not to aggravate the situation and put your phone away. You can see Ms. Braakman isn''t happy, but she''s willing to let it go for now and goes back to teaching the class without reprimanding you.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'literature'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					pcs_grades -= rand(1,2)
 					grupvalue[4] +=1
 					demerit += 5
@@ -756,12 +761,12 @@ if $ARGS[0] = 'literature':
 						'Realizing that this isn''t worth the fight, you hand over your phone without argument. "You can have this back after class." Ms. Braakman says as she walks back to the blackboard.'
 						act '...': gt 'gschool_lessonsev3', 'getphone'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -785,14 +790,14 @@ if $ARGS[0] = 'literature':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'literature'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							demerit += 5
 							pcs_horny += 15
 							gs 'stat'
@@ -810,9 +815,11 @@ if $ARGS[0] = 'literature':
 							act '...': gt 'gschool_lessonsev3', 'getphone'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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 'Keep using your phone (<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
@@ -946,11 +953,11 @@ if $ARGS[0] = 'english':
 					'"Sorry, Ms. Braakman." You mumble quietly as you sit up straight and refocus on the lesson. Satisfied, Ms. Braakman returns to teaching with a small smile.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
-				gs 'willpower', 'misc'
+				gs 'willpower', 'misc', 'self', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Be a smart ass (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'force', 'self'
+						gs 'willpower', 'pay', 'self'
 						gs 'stat'
 						pcs_grades -= rand(1,2)
 						demerit +=5
@@ -973,7 +980,7 @@ if $ARGS[0] = 'english':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to be a smart ass.'
+					act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			elseif rand(1,3) = 1:
 				*clr
@@ -1027,11 +1034,12 @@ if $ARGS[0] = 'english':
 					'You decide not to aggravate the situation and put your phone away. You can see Ms. Braakman isn''t happy, but she''s willing to let it go for now and goes back to teaching the class without reprimanding you.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'english'
 				end
-				gs 'willpower', 'misc'
+				gs 'willpower', 'misc', 'self', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Keep using your phone (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'force', 'self'
+						gs 'willpower', 'pay', 'self'
+						gs 'stat'
 						pcs_grades -= rand(1,2)
 						grupvalue[3] -= 1
 						grupvalue[4] +=1
@@ -1046,12 +1054,12 @@ if $ARGS[0] = 'english':
 							'Realizing that this isn''t worth the fight, you hand over your phone without argument. "You can have this back after class." Ms. Braakman says as she walks back to the blackboard.'
 							act '...': gt 'gschool_lessonsev3', 'getphone'
 						end
-						gs 'willpower', 'exhib'
+						gs 'willpower', 'exhib', 'self'
 						if will_cost <= pcs_willpwr:
 							act 'Take photos under your skirt (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'exhib'
-								gs 'willpower', 'force', 'self'
+								gs 'willpower', 'exhib', 'self'
+								gs 'willpower', 'pay', 'self'
 								gs 'stat'
 								if $pantyworntype ! 'none':
 									gs 'exhibitionism', 1
@@ -1077,14 +1085,14 @@ if $ARGS[0] = 'english':
 								end
 							end
 						else
-							'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+							act 'Take photos under 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', 'misc'
+						gs 'willpower', 'misc', 'self', 'medium'
 						if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 							act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'misc'
-								gs 'willpower', 'force', 'self'
+								gs 'willpower', 'misc', 'self', 'medium'
+								gs 'willpower', 'pay', 'self'
 								demerit += 5
 								pcs_horny += 15
 								gs 'stat'
@@ -1101,11 +1109,11 @@ if $ARGS[0] = 'english':
 								act '...': gt 'gschool_lessonsev3', 'getphone'
 							end
 						elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-							'<br>You don''t have enough willpower to hide your phone in your bra.'
+							act 'Hide the phone in your bra (<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
-					'<br>You don''t have enough willpower to keep using your phone.'
+					act 'Keep using your phone (<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
@@ -1167,11 +1175,11 @@ if $ARGS[0] = 'geography':
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." Mrs. Sokoloff gives you one final stern look and then goes back teaching the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit +=5
@@ -1183,11 +1191,11 @@ if $ARGS[0] = 'geography':
 					'The whole class bursts into loud laughter, and Mrs. Sokoloff has a rough time getting everyone to quiet down.'
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'				
-					gs 'willpower', 'misc'
+					gs 'willpower', 'misc', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:	
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							pcs_grades -= rand(0,1)
 							demerit +=5
@@ -1199,11 +1207,11 @@ if $ARGS[0] = 'geography':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					else
-						'<br>You don''t have enough willpower to stay inside the classroom.'
+						act 'Don''t leave the classroom (<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
-				'<br> You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -1259,11 +1267,11 @@ if $ARGS[0] = 'geography':
 				'You decide not to aggravate the situation and put your phone away. Mrs. Sokoloff looks at you angerly as she continues the class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					pcs_grades -= rand(1,2)
 					grupvalue[3] -= 1
 					grupvalue[4] += 1
@@ -1279,12 +1287,12 @@ if $ARGS[0] = 'geography':
 						'As she walk back to the front of the class, she says, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -1302,14 +1310,15 @@ if $ARGS[0] = 'geography':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
@@ -1320,11 +1329,11 @@ if $ARGS[0] = 'geography':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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
-				'<br>You don''t have enough willpower to keep using your phone.'
+				act 'Keep using your phone (<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
@@ -1385,11 +1394,11 @@ if $ARGS[0] = 'history':
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." Mrs. Sokoloff gives you one final stern look and then goes back teaching the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit +=5
@@ -1401,11 +1410,11 @@ if $ARGS[0] = 'history':
 					'The whole class bursts into loud laughter, and Mrs. Sokoloff has a rough time getting everyone to quiet down.'
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
-					gs 'willpower', 'misc'
+					gs 'willpower', 'misc', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:	
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							pcs_grades -= rand(0,1)
 							demerit +=5
@@ -1417,11 +1426,11 @@ if $ARGS[0] = 'history':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					else
-						'<br>You don''t have enough willpower to stay inside the classroom.'
+						act 'Don''t leave the classroom (<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
-				'<br>You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -1478,11 +1487,11 @@ if $ARGS[0] = 'history':
 				'You decide not to aggravate the situation and put your phone away. Mrs. Sokoloff looks at you angerly as she continues the class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					pcs_grades -= rand(1,2)
 					grupvalue[4] += 1
 					grupvalue[3] -= 1
@@ -1498,12 +1507,12 @@ if $ARGS[0] = 'history':
 						'As she walk back to the front of the class, she say, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -1521,14 +1530,14 @@ if $ARGS[0] = 'history':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
@@ -1539,11 +1548,11 @@ if $ARGS[0] = 'history':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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
-				'<br>You don''t have enough willpower to keep using your phone.'
+				act 'Keep using your phone (<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
@@ -1600,11 +1609,11 @@ if $ARGS[0] = 'biology':
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." Miss Orlov gives a friend smile and nod at your apology and then goes back to teaching the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit +=5
@@ -1614,12 +1623,12 @@ if $ARGS[0] = 'biology':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 					'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" you answer boldly.'
 					'The whole class bursts into loud laughter, Miss Orlov seems a bit stunned by your comment, after a moment to regain her composure she quietly asks you "Miss <<$pcs_lastname>>, please leave class and report to the principal."'
-					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
-					gs 'willpower', 'misc'
+					act 'Go to principal''s office': demerit += 10 + school_bunk * 5 & gt 'gschool_office', 'principal'
+					gs 'willpower', 'misc', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:	
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							pcs_grades -= rand(0,1)
 							demerit +=5
@@ -1631,11 +1640,11 @@ if $ARGS[0] = 'biology':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 						end
 					else
-						'<br>You don''t have enough willpower to stay inside the classroom.'
+						act 'Don''t leave the classroom (<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
-				'<br>You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -1693,11 +1702,11 @@ if $ARGS[0] = 'biology':
 				'You decide not to aggravate the situation and put your phone away. Miss Orlov gives you appreciative smile before continue with the lesson.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					pcs_grades -= rand(1,2)
 					grupvalue[3] -= 1
 					grupvalue[4] += 1
@@ -1713,12 +1722,12 @@ if $ARGS[0] = 'biology':
 						'Miss Orlov extends his hand then says, "What is so important on there that you need to disrupt my lesson? Hand it over." You realize that Miss Orlov is not messing around and decide that it''s not worth the conflict, so you silently hand your phone to Miss Orlov. As he walks back to the front of the class, he says, "I''m holding onto your phone for now, Miss <<$pcs_lastname>>. You can have it back after class."'
 						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -1736,14 +1745,14 @@ if $ARGS[0] = 'biology':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
@@ -1754,11 +1763,11 @@ if $ARGS[0] = 'biology':
 							act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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
-				'<br>You don''t have enough willpower to keep using your phone.'
+				act 'Keep using your phone (<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
@@ -1806,12 +1815,12 @@ if $ARGS[0] = 'literature_late':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latel1.jpg"></center>'
 		if lit_late_counter > 15:
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_lastname>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'pain', 2, 'ears', 'twist'
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					demerit += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
@@ -1819,7 +1828,7 @@ if $ARGS[0] = 'literature_late':
 					act 'Go to principal''s office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>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 'Do as she says':
 				*clr & cla
@@ -1875,12 +1884,12 @@ if $ARGS[0] = 'literature_late':
 		elseif lit_late_counter > 10:
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_lastname>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'pain', 2, 'ears', 'twist'
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					demerit += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
@@ -1888,7 +1897,7 @@ if $ARGS[0] = 'literature_late':
 					act 'Go to principal''s office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>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 'Do as she says':
@@ -1932,12 +1941,12 @@ if $ARGS[0] = 'literature_late':
 		elseif lit_late_counter > 5:
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_lastname>>, I warned you I would not tolerate this. Now come up here right now young lady!" She says as she points in front of her desk.'
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'resist', 'pay'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'pain', 2, 'ears', 'twist'
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					demerit += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
@@ -1945,7 +1954,7 @@ if $ARGS[0] = 'literature_late':
 					act 'Go to principal''s office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>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 'Do as she says':

+ 100 - 97
locations/gschool_lessons2.qsrc

@@ -64,11 +64,11 @@ if $ARGS[0] = 'computer':
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." Mr. Ivanov gives you one final look and then goes back to teaching the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit += 1
@@ -79,11 +79,11 @@ if $ARGS[0] = 'computer':
 					'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" you answer boldly.'
 					'The whole class bursts into loud laughter, Mr. turns and gives the rest of class a hard look. "Silence now!" Then he turns back to you.'
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
-					gs 'willpower', 'misc'
+					gs 'willpower', 'misc', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							pcs_grades -= rand(0,1)
 							demerit += 1
@@ -92,28 +92,28 @@ if $ARGS[0] = 'computer':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
 							'"What good would that do? Are you trying to get me to start smoking to pass the time? I''m not interrupting your classes, just leave me alone. I''m having some... girl problems. Would you like me to talk about those instead?" you answer brashly, not having any intentions of getting up.'
 							'He leans in close to you. "Get out of my classroom right now or I will drag you out!"'
-							gs 'willpower', 'misc'
+							gs 'willpower', 'misc', 'resist', 'medium'
 							if will_cost <= pcs_willpwr:
 								act 'Refuse (<<will_cost>> Willpower)':
 									cla
-									gs 'willpower', 'resist'
+									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
 									pcs_grades -= rand(1,2)
 									'You cross your arms as if daring him to lay a hand on you. Well he calls your bluff, he grabs you by the ear and twists it painfully. He then grabs your arm and yanks you out of your chair so violently, you fall to the ground on your knees. He doesn''t help you up or wait, he just starts dragging you by the ear, as he painfully twists it. It takes you a couple of tries to regain your feet he is dragging you so fast. Just as you reach the door you manage to get back on your feet. He doesn''t stop their, he drags you all the way to the offices and pushes you inside.'
-									act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
+									act 'Go to principal''s office': demerit += 10 + school_bunk * 5 & gt 'gschool_office', 'principal'
 								end
 							else
-								'<br>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 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
+							act 'Go to principal''s office': demerit += 10 + school_bunk * 5 & gt 'gschool_office', 'principal'
 						end
 					else
-						'<br>You don''t have enough willpower to stay inside the classroom.'
+						act 'Don''t leave the classroom (<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 principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
+					act 'Go to principal''s office': demerit += 10 + school_bunk * 5 & gt 'gschool_office', 'principal'
 				end
 			else
-				'<br> You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -165,11 +165,11 @@ if $ARGS[0] = 'computer':
 				'You decide not to aggravate the situation and put your phone away. Mr. Ivanov gives you one final hard look before continue with the lesson.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					pcs_grades -= rand(1,2)
 					grupvalue[1] += 1
 					grupvalue[4] += 1
@@ -186,12 +186,12 @@ if $ARGS[0] = 'computer':
 						'As he walk back to the front of the class, he says, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -214,26 +214,28 @@ if $ARGS[0] = 'computer':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
 							'You deftly shove the phone in your bra, and smile fiendishly as you see the indecisiveness on your teacher''s face.'
 							'You pretend it''s a perfectly normal place to store your phone, and use your cute voice as you tell him, "Is there a problem, Mr. Ivanov? Go ahead, take my phone if you don''t think I should have it." You thrust your chest forward as you encourage him, giving him a nice view of your cleavage - the outline of your phone very visible through the fabric.'
 							'His eyes narrow slightly. "Go to the Principals now!"'
-							act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
+							act 'Go to principal''s office': demerit += 10 + school_bunk * 5 & gt 'gschool_office', 'principal'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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 'Keep using your phone (<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
@@ -288,11 +290,11 @@ if $ARGS[0] = 'science':
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." Miss Orlov gives a friend smile and nod at your apology and then goes back to teaching the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit += 1
@@ -303,11 +305,11 @@ if $ARGS[0] = 'science':
 					'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" you answer boldly.'
 					'The whole class bursts into loud laughter, Miss Orlov seems a bit stunned by your comment, after a moment to regain her composure she quietly asks you "Miss <<$pcs_lastname>>, please leave class and report to the principal."'
 					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
-					gs 'willpower', 'misc'
+					gs 'willpower', 'misc', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							pcs_grades -= rand(0,1)
 							demerit += 1
@@ -319,11 +321,11 @@ if $ARGS[0] = 'science':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					else
-						'<br>You don''t have enough willpower to stay inside the classroom.'
+						act 'Don''t leave the classroom (<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
-				'<br> You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -375,22 +377,22 @@ if $ARGS[0] = 'science':
 				'You decide not to aggravate the situation and put your phone away. Miss Orlov gives you appreciative smile before continue with the lesson.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					pcs_grades -= rand(1,2)
 					grupvalue[4] += 1
 					demerit += 5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 					'Even though Miss Orlov saw you use your phone. You don''t care and just keep browsing the internet. Realizing you still won''t put the phone away, Miss Orlov walks over to your desk.'
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -407,14 +409,14 @@ if $ARGS[0] = 'science':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
@@ -425,11 +427,11 @@ if $ARGS[0] = 'science':
 							act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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
-				'<br>You don''t have enough willpower to keep using your phone.'
+				act 'Keep using your phone (<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
@@ -490,11 +492,11 @@ if $ARGS[0] = 'music':
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." The teacher gives you one final look and then goes back to teacher the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit += 1
@@ -505,12 +507,12 @@ if $ARGS[0] = 'music':
 					'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" you answer boldly.'
 					'The whole class bursts into loud laughter, and Mr. Vasilyev has a rough time getting everyone to quiet down.'
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
-					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
-					gs 'willpower', 'misc'
+					act 'Go to principal''s office': demerit += 10 + school_bunk * 5 & gt 'gschool_office', 'principal'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							pcs_grades -= rand(0,1)
 							demerit += 1
@@ -522,11 +524,11 @@ if $ARGS[0] = 'music':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					else
-						'<br>You don''t have enough willpower to stay inside the classroom.'
+						act 'Don''t leave the classroom (<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
-				'<br> You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -577,11 +579,11 @@ if $ARGS[0] = 'music':
 				'You decide not to aggravate the situation and put your phone away. Mr. Vasilyev looks at you gratefully as they continues the class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					pcs_grades -= rand(1,2)
 					grupvalue[1] += 1
 					grupvalue[4] += 1
@@ -598,12 +600,12 @@ if $ARGS[0] = 'music':
 						'As they walk back to the front of the class, they say, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -622,12 +624,12 @@ if $ARGS[0] = 'music':
 					else
 						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
 					end
-					gs 'willpower', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
 							'You deftly shove the phone in your bra, and smile fiendishly as you see the indecisiveness on your teacher''s face.'
@@ -636,11 +638,11 @@ if $ARGS[0] = 'music':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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
-				'<br>You don''t have enough willpower to keep using your phone.'
+				act 'Keep using your phone (<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
@@ -718,11 +720,11 @@ if $ARGS[0] = 'art':
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." The teacher gives you one final look and then goes back to teacher the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit += 1
@@ -733,12 +735,12 @@ if $ARGS[0] = 'art':
 					'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" you answer boldly.'
 					'The whole class bursts into loud laughter, and Mr. Vasilyev has a rough time getting everyone to quiet down.'
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
-					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
-					gs 'willpower', 'misc'
+					act 'Go to principal''s office': demerit += 10 + school_bunk * 5 & gt 'gschool_office', 'principal'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'resist'
+							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							pcs_grades -= rand(0,1)
 							demerit += 1
@@ -750,11 +752,11 @@ if $ARGS[0] = 'art':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					else
-						'<br>You don''t have enough willpower to stay inside the classroom.'
+						act 'Don''t leave the classroom (<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
-				'<br> You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif rand(1,3) = 1:
 			*clr
@@ -801,11 +803,11 @@ if $ARGS[0] = 'art':
 				'You decide not to aggravate the situation and put your phone away. Mr. Vasilyev looks at you gratefully as they continues the class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					pcs_grades -= rand(1,2)
 					grupvalue[1] += 1
 					grupvalue[4] += 1
@@ -822,12 +824,12 @@ if $ARGS[0] = 'art':
 						'As they walk back to the front of the class, they say, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -844,14 +846,14 @@ if $ARGS[0] = 'art':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
 							'You deftly shove the phone in your bra, and smile fiendishly as you see the indecisiveness on your teacher''s face.'
@@ -861,11 +863,11 @@ if $ARGS[0] = 'art':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
-						'<br>You don''t have enough willpower to hide your phone in your bra.'
+						act 'Hide the phone in your bra (<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
-				'<br>You don''t have enough willpower to keep using your phone.'
+				act 'Keep using your phone (<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
@@ -922,11 +924,11 @@ if $ARGS[0] = 'shop':
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." The teacher gives you one final look and then goes back to teacher the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Be a smart ass (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					pcs_grades -= rand(1,2)
 					demerit += 1
@@ -947,7 +949,7 @@ if $ARGS[0] = 'shop':
 					end
 				end
 			else
-				'<br>You don''t have enough willpower to be a smart ass.'
+				act 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			*clr
@@ -988,10 +990,11 @@ if $ARGS[0] = 'shop':
 				'You decide not to aggravate the situation and put your phone away. Mr. Kuznetsov looks at you gratefully as they continues the class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 			end
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Keep using your phone (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					pcs_grades -= rand(1,2)
 					grupvalue[1] += 1
 					grupvalue[4] += 1
@@ -1008,12 +1011,12 @@ if $ARGS[0] = 'shop':
 						'As they walk back to the front of the class, they say, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 					end
-					gs 'willpower', 'exhib'
+					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'exhib'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'exhib', 'self'
+							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 							if $pantyworntype ! 'none':
 								gs 'exhibitionism', 1
@@ -1030,14 +1033,14 @@ if $ARGS[0] = 'shop':
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 						end
 					else
-						'<br>You don''t have enough willpower to take an upskirt foto of yourself.'
+						act 'Take photos under 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', 'misc'
+					gs 'willpower', 'misc', 'self', 'medium'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
 						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'misc'
-							gs 'willpower', 'force', 'self'
+							gs 'willpower', 'misc', 'self', 'medium'
+							gs 'willpower', 'pay', 'self'
 							demerit += 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
 							'You deftly shove the phone in your bra, and smile fiendishly as you see the indecisiveness on your teacher''s face.'
@@ -1053,11 +1056,11 @@ if $ARGS[0] = 'shop':
 							end
 						end
 					else
-						'<br>You don''t have enough willpower to keep using your phone.'
+						act 'Hide the phone in your bra (<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
-				'<br>You don''t have enough willpower to keep using your phone.'
+				act 'Keep using your phone (<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
@@ -1263,11 +1266,11 @@ if $ARGS[0] = 'postphys':
 				'You crack the door open slightly and peek in. You''re flabbergasted by what you see: Christina is on her knees in front of Mr. Pavlovich, and is sucking him off like her life depended on it.'
 				gs 'arousal', 'voyeur', 5
 				gs 'stat'
-				gs 'willpower', 'misc'
+				gs 'willpower', 'misc', 'self', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Burst into the room (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'force', 'self'
+						gs 'willpower', 'pay', 'self'
 						zverevaQW = 3
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
@@ -1280,11 +1283,11 @@ if $ARGS[0] = 'postphys':
 						'Christina obliges, rubbing his cock through his shorts as she looks you in the eye. Having regained her confidence, she parrots, "Face it bitch, you can''t prove a thing. Now get the fuck out, Mr. Pavlovich and I have more to discuss."'
 						*nl
 						'You can''t believe this but they are likely right, no one is likely to believe you. "You can''t do this, I earned my spot in the competition." He smiles a bit, leaning back in his chair. He reaches in his shorts and pulls out his cock again. "Then get over here and suck my dick." Christina looks at him and then you obviously furious, but she drops down to her knees and start sucking his dick again.'
-						gs 'willpower', 'bj'
+						gs 'willpower', 'bj', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Refuse to suck his dick (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'resist'
+								gs 'willpower', 'pay', 'resist'
 								'<center><video autoplay loop src="images/shared/sex/cum/cumf10.mp4"></video></center>'
 								'As you see Christina happily start sucking his dick again, you won''t give into his demands, you quietly close the door and leave. It looks like, despite being the better runner, you won''t be going to the regional championships.'
 								gs 'arousal', 'end'
@@ -1292,7 +1295,7 @@ if $ARGS[0] = 'postphys':
 								act 'Go and get changed': gt 'gschool_lessons2', 'postphys2'
 							end
 						else
-							'<br>You don''t have enough willpower to refuse.'
+							act 'Refuse to suck his dick (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 						act 'Give him a blowjob with Christina':
 							*clr & cla
@@ -1309,7 +1312,7 @@ if $ARGS[0] = 'postphys':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to burst into the room.'
+					act 'Burst into the room (<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 looking':
 					*clr & cla
@@ -1342,14 +1345,14 @@ if $ARGS[0] = 'postphys':
 		end
 	elseif fizrukSex > 0 and kristinaSex > 0:
 		'When the class is finished, Christina approaches you, "<<$pcs_nickname>>, sweetie, Mr. Pavlovich wants you to join me again in his office. He wants us to ''entertain him'', if you know what I mean. Want to join me?"'
-		gs 'willpower', 'bj'
+		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'No thanks (<<will_cost>> Willpower)':
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gt 'gschool_lessons2', 'postphys2'
 			end
 		else
-			'<br> You don''t have enough willpower to resist.'
+			act 'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Entertain Mr. Pavlovich with Christina':
 			*clr & cla

+ 80 - 81
locations/gschool_lessonsev1.qsrc

@@ -61,29 +61,27 @@ if $ARGS[0] = 'fiz_rand':
 
 		act 'Don''t retaliate': grupvalue[4] -= 2 & gt 'gschool_lessons2', 'postphys'
 		
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Kick him (<<will_cost>> Willpower)':
 				cla & *nl
-				gs 'willpower', 'misc'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'medium'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				grupvalue[2] +=1
 				'He starts to back up but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which just got the others laughing harder. A couple of the other girls move over to give you moral support and give the guys dirty looks. Plus they use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and twat, putting everything back in it''s proper place.'
 				act 'End of lesson':gt 'gschool_lessons2', 'postphys'
 			end
 		else
-			'<br>You don''t have enough willpower to kick him.'
+			act 'Kick him (<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 'Beat his ass (<<will_cost>> Willpower)':
 				cla & *nl
-				gs 'willpower', 'misc'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				grupvalue[4] +=1
 				demerit += 20
@@ -93,7 +91,7 @@ if $ARGS[0] = 'fiz_rand':
 				act 'Go to the principals offices': gt 'gschool_office', 'principal'
 			end
 		else
-			'<br>You don''t have enough willpower to beat him up.'
+			act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif fizperand = 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'
@@ -116,19 +114,20 @@ if $ARGS[0] = 'fiz_rand':
 			'Once you have the equipment you duck out of the room as quickly as you can, not looking back at him.'
 			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
 		end
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Tease him (<<will_cost>> Willpower)':
 				cla
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'pay', 'self'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand6.jpg"></center>'
 				'You decide to have a little fun of your own. You ''accidentally'' drop something, while he is keeping you steady. You bend over at the waist, pushing your ass back against his crotch. You grind yourself against him and you can feel him getting hard. Then you pick up the item and quickly stand up, before heading out of the room. You glance back and flash him a sweet smile, noticing he''s trying to hide the erection in his shorts. You add a bit of a extra sway to your hips as you walk away.'
 				gs 'arousal', 'foreplay', 5, 'sub'
 				gs 'arousal', 'end'
+				gs 'stat'
 				act 'End of lesson': gt 'gschool_lessons2', 'postphys'
 			end
 		else
-			'<br>You don''t have enough willpower to tease him.'
+			act 'Tease 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 fizperand = 13:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bendoverff.jpg"></center>'
@@ -211,11 +210,11 @@ if $ARGS[0] = 'biology':
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Dan, but you don''t dare now that the teacher is keeping an eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Slap Dan (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -227,7 +226,7 @@ if $ARGS[0] = 'biology':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Dan (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Embarrassed':
 				*clr & cla
@@ -284,11 +283,11 @@ if $ARGS[0] = 'biology':
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Dan, but you don''t dare now that the teacher is keeping an eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Slap Dan (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -300,7 +299,7 @@ if $ARGS[0] = 'biology':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Dan (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 7:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
@@ -394,11 +393,11 @@ if $ARGS[0] = 'biology':
 				'You quickly grasp both sides of your blouse and pull them tightly together. Lazar grins when he realizes he''s been caught, and he winks at you before turning back to face the blackboard.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -407,7 +406,7 @@ if $ARGS[0] = 'biology':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 14:
 			gs 'stat'
@@ -485,11 +484,11 @@ if $ARGS[0] = 'science':
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Andrey, but you don''t dare now that the teacher is keeping an eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Slap Andrey (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -502,7 +501,7 @@ if $ARGS[0] = 'science':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Andrey (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 7:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
@@ -571,11 +570,11 @@ if $ARGS[0] = 'science':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self', 'easy'
 			if will_cost <=  pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self', 'easy'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -586,7 +585,7 @@ if $ARGS[0] = 'science':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 11:
 			gs 'stat'
@@ -661,11 +660,11 @@ if $ARGS[0] = 'computer':
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Vasily, but you don''t dare now that the teacher is keeping an eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Slap Vasily (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -677,7 +676,7 @@ if $ARGS[0] = 'computer':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Vasily (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Embarrassed':
 				*clr & cla
@@ -734,11 +733,11 @@ if $ARGS[0] = 'computer':
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Vasily, but you don''t dare now that the teacher is keeping an eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Slap Vasily (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -750,7 +749,7 @@ if $ARGS[0] = 'computer':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Vasily (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 7:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
@@ -858,11 +857,11 @@ if $ARGS[0] = 'computer':
 				'You quickly grasp both sides of your blouse and pull them tightly together. Artem''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self', 'easy'
 			if will_cost <=  pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -872,7 +871,7 @@ if $ARGS[0] = 'computer':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 16:
 			gs 'stat'
@@ -901,23 +900,23 @@ if $ARGS[0] = 'computer':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self', 'self'
 			if will_cost <=  pcs_willpwr:
 				act 'Ignore his stares and wait for the break (<<will_cost>> Willpower)':
-					gs 'willpower', 'exhib'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'exhib', 'self'
+					gs 'willpower', 'pay', 'self'
 					gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to not straigten your skirt'
+				act 'Ignore his stares and wait for the break (<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', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Call him out (<<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
 					demerit += 5
@@ -928,15 +927,15 @@ if $ARGS[0] = 'computer':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to call him out.'
+				act 'Call him out (<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'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <=  pcs_willpwr:
 				act 'Spread your legs (<<will_cost>> willpower)':
 					*clr & cla
-					gs 'willpower', 'exhib'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'exhib', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					npc_rel['A129'] += 1
 					if $pantyworntype ! 'none':
@@ -951,15 +950,15 @@ if $ARGS[0] = 'computer':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to spread your legs.'
+				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
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'hard'
 			if will_cost <=  pcs_willpwr:
 				act 'Flip him off (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'misc'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					grupvalue[4] += 1
 					grupvalue[3] -= 1
@@ -973,7 +972,7 @@ if $ARGS[0] = 'computer':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to flip him off.'
+				act 'Flip him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			gt 'gschool_lessons', 'short_break'
@@ -1041,11 +1040,11 @@ if $ARGS[0] = 'russian':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Slap Svyatoslav (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -1057,7 +1056,7 @@ if $ARGS[0] = 'russian':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Svyatoslav (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			
 			act 'Embarrassed':
@@ -1114,11 +1113,11 @@ if $ARGS[0] = 'russian':
 				'You shake your head at the teacher, desperately wanting to turn around and strangle Svyatoslav, but you don''t dare now that the teacher is keeping an eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Slap Svyatoslav (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -1130,7 +1129,7 @@ if $ARGS[0] = 'russian':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Svyatoslav (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 8:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
@@ -1238,11 +1237,11 @@ if $ARGS[0] = 'russian':
 				'You quickly grasp both sides of your blouse and pull them tightly together. Marcus''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <=  pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -1252,7 +1251,7 @@ if $ARGS[0] = 'russian':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 17:
 			gs 'stat'
@@ -1279,11 +1278,11 @@ if $ARGS[0] = 'russian':
 			'Marcus clears his throat and begins reading. He''s painfully slow at times and his American accent doesn''t help but he does his best. As he comes to a difficult part he starts stammering and gets stuck trying to pronounce a word correctly.'
 			'While Marcus is trying to tackle the word, you hear someone snickering behind him. It''s Alyona, "M-M-Maybe you should t-t-try once again. Are you slow or something?" The rest of the class starts laughing while Marcus shamefully stares down on his desk...'
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Tell her off (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					npc_rel['A143'] -= 11
 					npc_rel['A146'] += 1
@@ -1295,7 +1294,7 @@ if $ARGS[0] = 'russian':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to tell her off.'
+				act 'Tell her 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'Join in':
@@ -1335,23 +1334,23 @@ if $ARGS[0] = 'russian':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self', 'easy'
 			if will_cost <=  pcs_willpwr:
 				act 'Ignore his stares and wait for the break (<<will_cost>> Willpower)':
-					gs 'willpower', 'exhib'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'exhib', 'self', 'easy'
+					gs 'willpower', 'pay', 'self'
 					gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to not straigten your skirt'
+				act 'Ignore his stares and wait for the break (<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', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Call him out (<<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
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirt.jpg"></center>'
@@ -1361,15 +1360,15 @@ if $ARGS[0] = 'russian':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to call him out.'
+				act 'Call him out (<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'
+			gs 'willpower', 'exhib', 'self', 'hard'
 			if will_cost <=  pcs_willpwr:
 				act 'Spread your legs (<<will_cost>> willpower)':
 					*clr & cla
-					gs 'willpower', 'exhib'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'exhib', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					npc_rel['A26'] += 1
 					if $pantyworntype ! 'none':
@@ -1384,15 +1383,15 @@ if $ARGS[0] = 'russian':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to spread your legs.'
+				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
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'hard'
 			if will_cost <=  pcs_willpwr:
 				act 'Flip him off (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'misc'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					grupvalue[4] += 10
 					grupvalue[3] -= 5
@@ -1405,7 +1404,7 @@ if $ARGS[0] = 'russian':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to flip him off.'
+				act 'Flip him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			gt 'gschool_lessons', 'short_break'

+ 47 - 49
locations/gschool_lessonsev2.qsrc

@@ -46,11 +46,11 @@ if $ARGS[0] = 'geography':
 				'You shake your head no to the teacher and desperately want to turn around and strangle Lazar, but you don''t dare with the teacher now keeping a eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap Lazar (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -62,7 +62,7 @@ if $ARGS[0] = 'geography':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Lazar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Embarrassed':
 				*clr & cla
@@ -202,11 +202,11 @@ if $ARGS[0] = 'geography':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'geography':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 12:
 			gs 'stat'
@@ -259,11 +259,11 @@ if $ARGS[0] = 'geography':
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 						
-						gs 'willpower', 'misc'
+						gs 'willpower', 'misc', 'self', 'medium'
 						if will_cost <= pcs_willpwr:
-							act 'Tell on them':
+							act 'Tell on them (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'willpower', 'force', 'self'
+								gs 'willpower', 'pay', 'self'
 								gs 'stat'
 								npc_rel['A9'] -= 2
 								npc_rel['A158'] -= 1
@@ -277,7 +277,7 @@ if $ARGS[0] = 'geography':
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						else
-							'<br>You don''t have enough willpower to tell on them.'
+							act 'Tell on 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
 				end
@@ -414,11 +414,11 @@ if $ARGS[0] = 'math':
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'Ignore his stares (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'fame', 'pav', 'sex', 1
 					gs 'exhibitionism', 1
 					gs 'stat'
@@ -429,7 +429,7 @@ if $ARGS[0] = 'math':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to not straigten your skirt'
+				act 'Ignore his stares (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 9:
 			gs 'stat'
@@ -454,40 +454,38 @@ if $ARGS[0] = 'math':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'Ignore his stares and wait for the break (<<will_cost>> Willpower)':
-					gs 'willpower', 'exhib'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'exhib', 'self'
+					gs 'willpower', 'pay', 'self'
 					gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to not straigten your skirt'
+				act 'Ignore his stares and wait for the break (<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', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Call him out (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'misc'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'misc', 'self', 'medium'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirt.jpg"></center>'
 					'He can''t be doing that! You pull your skirt over your legs so he can''t look at you any more and loudly say, "Mr. Tsarev, be careful! If you keep staring at me like that, your eyeballs might pop out of their sockets!" Loud laughter erupts in the classroom, and Mr. Tsarev is obviously embarrassed, as He opens his mouth to speak, but realizes that speaking might make things worst so he tries his best to get the class back under control before continuing the lesson, carefully avoiding your legs.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to call him out.'
+				act 'Call him out (<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 'Spread your legs (<<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'
 					gs 'stat'
 					npc_rel['A26'] += 2
 					if $pantyworntype ! 'none':
@@ -502,15 +500,15 @@ if $ARGS[0] = 'math':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to spread your legs.'
+				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
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'Flip him off (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'misc'
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'misc', 'self', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					grupvalue[4] += 1
 					grupvalue[3] -= 1
@@ -522,7 +520,7 @@ if $ARGS[0] = 'math':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to flip him off.'
+				act 'Flip him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			gt 'gschool_lessons', 'short_break'
@@ -635,11 +633,11 @@ if $ARGS[0] = 'history':
 				'You shake your head no to the teacher and desperately want to turn around and strangle Roman, but you don''t dare with the teacher now keeping a eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap Roman (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -651,7 +649,7 @@ if $ARGS[0] = 'history':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Roman (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Embarrassed':
 				*clr & cla
@@ -709,11 +707,11 @@ if $ARGS[0] = 'history':
 				'You shake your head no to the teacher and desperately want to turn around and strangle Roman, but you don''t dare with the teacher now keeping a eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap Roman (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -725,7 +723,7 @@ if $ARGS[0] = 'history':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Roman (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 6:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
@@ -820,11 +818,11 @@ if $ARGS[0] = 'history':
 				'You quickly grasp both sides of your blouse and pull them tightly together. Petka''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -833,7 +831,7 @@ if $ARGS[0] = 'history':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 13:
 			*clr & cla
@@ -909,11 +907,11 @@ if $ARGS[0] = 'shop':
 				'You shake your head no to Mr. Kuznetsov and desperately want to turn around and strangle Dan, but you don''t dare with the teacher now keeping a eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap Dan (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -925,7 +923,7 @@ if $ARGS[0] = 'shop':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Dan (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Embarrassed':
 				*clr & cla
@@ -984,11 +982,11 @@ if $ARGS[0] = 'shop':
 				'You shake your head no to the teacher and desperately want to turn around and strangle <<$rand_boy>>, but you don''t dare with the teacher now keeping a eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap <<$rand_boy>> (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -1000,7 +998,7 @@ if $ARGS[0] = 'shop':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap <<$rand_boy>> (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 7:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
@@ -1081,11 +1079,11 @@ if $ARGS[0] = 'shop':
 				'You quickly grasp both sides of your blouse and pull them tightly together. Marcus''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -1094,7 +1092,7 @@ if $ARGS[0] = 'shop':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 11:
 			gs 'stat'

+ 70 - 63
locations/gschool_lessonsev3.qsrc

@@ -39,10 +39,11 @@ if $ARGS[0] = 'literature':
 				'"It is pretty weird how he always follows Dimka around," you chime in. Lizaveta is quick to agree, and together with the other girls, you continue to mock him until Ms. Braakman finally steps in to put an end to it.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:	
 				act 'Defend Igor (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					npc_rel['A4'] += 2
 					npc_rel['A140'] -= 1
@@ -63,7 +64,7 @@ if $ARGS[0] = 'literature':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to defend Igor.'
+				act 'Defend Igor (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 3:
 			*clr & cla
@@ -106,17 +107,19 @@ if $ARGS[0] = 'literature':
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/literature/events/roman_touch.mp4"></video></center>'
 				'While you work, you feel Roman''s leg brush against yours. You make nothing of it at first, assuming it was just on accident, but then you feel his hand on your knee before it slowly moves up to your thigh. You look over to him, but he''s still scribbling in his notebook as if nothing is happening.'
 				
-				gs 'willpower', 'exhib'
+				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Push his hand away (<<will_cost>> Willpower)':
 						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
 						npc_rel['A157'] -= 2
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/events/rejection.jpg"></center>'
 						'Knowing how aggressive the gopnik can be, you gently push his hand away and hope that doesn''t provoke him. From the corner of your eye, you catch Roman glaring at you, his eyes narrowed and jaw clenched in anger. You start to prepare yourself for what he''s going to say, but to your surprise he goes back to drawing in his notebook. For the rest of the class, Roman keeps his hands to himself.'
 						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
 				else
-					'<br>You don''t have enough willpower to push his hand away.'
+					act 'Push his hand 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 'Spread your legs':
@@ -153,10 +156,13 @@ if $ARGS[0] = 'literature':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/literature/events/humpday.mp4"></video></center>'
 			*nl
 			'You''re standing at your desk when Anushka suddenly appears behind you, grinning wildly. "Guess what today is, <<$PCS_nickname>>." Before you can react, Anushka grabs you by the waist and pulls you close, your ass now pressed against her hips as she starts to roughly thrust against butt. "It''s hump day!"'
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Push her away (<<will_cost>> Willpower)':
-					*clr & clagrupvalue[1] -= 1
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					grupvalue[1] -= 1
 					grupvalue[4] -= 1
 					npc_rel['A144'] -= 2
 					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
@@ -165,7 +171,7 @@ if $ARGS[0] = 'literature':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to push her away.'
+				act 'Push her 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 'Go along with it':
 				*clr & cla
@@ -219,31 +225,32 @@ if $ARGS[0] = 'reading':
 			'Unable to respond, you turn around without confronting him. You hear him chuckle and mutter something incoherent under his breath, but he doesn''t say anything else for the remaining class period. Replaying the encounter in your head, a part of you wonders if saying nothing was the right thing to do.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'bj', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Tell him he''s right (<<will_cost>> Willpower)':
+				cla & *nl
 				gs 'fame', 'pav', 'sex', 2
+				gs 'willpower', 'bj', 'self', 'easy'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
 				grupvalue[1] -= 1
 				grupvalue[2] -= 1
 				grupvalue[3] -= 1
 				npc_rel['A159'] += 2
-				*nl
 				'"You''re right, and I''m pretty damn good at it, too," You say with a playful smile. A few kids nearby overhear you and start to whisper amongst themselves, the girls quick to bash you and the guys eagerly wanting to put your skills to the test. Before you know it, the whole class is stealing glances at you, some looking disgusted while others lustful. You''re sure that by the end of the day, the whole school will know about how proud you are of your cocksucking skills.'
 				cla
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		else
-			'<br>You don''t have enough willpower to publicly agree with him.'
+			act 'Tell him he''s right (<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 'Tell him to fuck off (<<will_cost>> Willpower)':
 				cla & *nl
-				gs 'willpower', 'misc'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
 				npc_rel['A159'] -= 2
 				npc_rel['A144'] += 1
 				npc_rel['A156'] += 1
@@ -274,15 +281,15 @@ if $ARGS[0] = 'reading':
 				end
 			end
 		else
-			'<br>You don''t have enough willpower to tell him to fuck off.'
+			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
 		
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:		
 			act 'Insult him (<<will_cost>> Willpower)':
 				cla & *nl
-				gs 'willpower', 'misc' 
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'medium'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				demerit += 5
 				grupvalue[1] += 1
@@ -294,7 +301,7 @@ if $ARGS[0] = 'reading':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		else
-			'<br>You don''t have enough willpower to insult him.'
+			act 'Insult 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 scooltiperand = 2:
 		pcs_mood -= 10
@@ -332,11 +339,11 @@ if $ARGS[0] = 'getphone':
 
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Roll your eyes (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/angry.jpg"></center>'
 				'"Whatever, can I just have my phone back?" You sigh, crossing your arms over your chest as you roll your eyes impatiently.'
@@ -455,7 +462,7 @@ if $ARGS[0] = 'getphone':
 				end
 			end
 		else
-			'<br>You don''t have enough willpower to roll your eyes at him.'
+			act 'Roll your eyes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif scooltiperand = 2:
 		'With class over, you make your way to Ms. Braakman''s desk to get your phone back. "Can I have my phone back?" You ask. Without a word, she tosses you the phone, barely looking up from the paper she''s correcting. Looks like she''s too busy to give you a lecture today.'
@@ -501,11 +508,11 @@ if $ARGS[0] = 'english':
 				
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:	
 				act 'Play a cruel trick on them (<<will_cost>> Willpower)':
 					cla & *nl
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					persuas_exp += 10
 					npc_rel['A20'] -= 1
@@ -518,7 +525,7 @@ if $ARGS[0] = 'english':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to play a cruel trick on them.'
+				act 'Play a cruel trick on them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 4:
 			if pcs_makeup > 1:
@@ -564,14 +571,14 @@ if $ARGS[0] = 'english':
 				cla
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Intervene (<<will_cost>> Willpower)':
-					gs 'willpower', 'force', 'self'
+					cla & *nl
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					npc_rel['A141'] +=1
 					grupvalue[2] += 1
-					*nl
 					'"You''re all just jealous that Veronika has more talent in her big toe than all of you combined," you say with a smirk. "It must really scare you knowing that she''s going to do something with her life while the rest of you will end up pregnant before your 21st birthday, by a deadbeat who will see you as nothing more than a warmhole he can stick his dick in."'
 					*nl
 					'The girls are staring at you in silence, and Veronika is looking at you in disbelief. Did you go too far? You start to worry you did something wrong, but then you notice the smallest hint of a smile on Veronika''s face.'
@@ -580,7 +587,7 @@ if $ARGS[0] = 'english':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to intervene.'
+				act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			gt 'gschool_lessons', 'short_break'
@@ -597,11 +604,11 @@ if $ARGS[0] = 'working':
 	if scooltiperand = 1:
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 		'Someone taps you on the shoulder, and when you turn around you see it''s Radomir leaning towards you. "Hey, let me copy off you." It''s more of a demand than a question, and judging by the cocky smirk on his face, he knows the difference and expects you to do as he says.'
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse (<<will_cost>> Willpower)':
 				cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				pcs_mood -=5
 				npc_rel['A154'] -=1
@@ -613,7 +620,7 @@ if $ARGS[0] = 'working':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		else
-			'<br>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 'Hand over your work':
 			npc_rel['A154'] +=1
@@ -657,12 +664,12 @@ if $ARGS[0] = 'working':
 			end
 		end
 		
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Ignore them (<<will_cost>> Willpower)': 
 				cla
-				gs 'willpower', 'misc'
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'medium'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				npc_rel['A20'] -= 1
 				npc_rel['A21'] -= 1
@@ -672,17 +679,15 @@ if $ARGS[0] = 'working':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		else
-			'<br>You don''t have enough willpower to ignore them.'
+			act 'Ignore them (<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 'Give them the wrong answers (<<will_cost>> Willpower)':
 				cla & *nl
-				gs 'willpower', 'misc'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'misc', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				if pcs_persuas >= 20:
 					persuas_exp += 10
@@ -702,7 +707,7 @@ if $ARGS[0] = 'working':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		else
-			'<br>You don''t have enough willpower to give them the wrong answers.'
+			act 'Give them the wrong answers (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif scooltiperand = 4:
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
@@ -717,19 +722,19 @@ if $ARGS[0] = 'working':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 		
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Make up an excuse (<<will_cost>> Willpower)': 
 				cla & *nl
 				npc_rel['A3'] -= 2
 				grupvalue[2] -= 1
-				gs 'willpower', 'force', 'self'
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				'"Sorry, but I''ve still got a lot to finish," you reply, pointing to your own work. Ivan''s smile fades and he looks disappointed, but he shrugs his shoulders and leaves you alone.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		else
-			'<br>You don''t have enough willpower to ignore them.'
+			act 'Make up an excuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	else
 		gt 'gschool_lessons', 'short_break'
@@ -841,9 +846,11 @@ if $ARGS[0] = 'music':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_1.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_2.jpg"></center>'
-					'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod, as you think to yourself, "Damn, I''ll have to take a closer look into that after classes are over!"'
-					gs 'arousal', 'voyeur', 2
 				end
+				'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod, as you think to yourself, "Damn, I''ll have to take a closer look into that after classes are over!"'
+				gs 'arousal', 'voyeur', 2
+				gs 'arousal', 'end'
+				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
 				gs 'gschool_lessonsev3', 'music'
@@ -861,11 +868,11 @@ if $ARGS[0] = 'music':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap Radomir (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -877,7 +884,7 @@ if $ARGS[0] = 'music':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Radomir (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			
 			act 'Embarrassed':
@@ -948,11 +955,11 @@ if $ARGS[0] = 'music':
 				end
 			end
 			
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap Lavrenti (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -964,7 +971,7 @@ if $ARGS[0] = 'music':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Lavrenti (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 8:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
@@ -1060,11 +1067,11 @@ if $ARGS[0] = 'music':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -1074,7 +1081,7 @@ if $ARGS[0] = 'music':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 15:
 			gs 'stat'
@@ -1175,11 +1182,11 @@ if $ARGS[0] = 'art':
 				end
 			end
 
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap Anushka (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					demerit += 10
 					grupvalue[3] -= 1
@@ -1191,7 +1198,7 @@ if $ARGS[0] = 'art':
 					act 'Go to the Principals office': gt 'gschool_office', 'principal'
 				end
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap Anushka (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 8:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/soniaflash.jpg"></center>'
@@ -1279,11 +1286,11 @@ if $ARGS[0] = 'art':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'self', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force', 'self'
+					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 1
 					gs 'stat'
@@ -1293,7 +1300,7 @@ if $ARGS[0] = 'art':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to keep your shirt open.'
+				act 'You ignore it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 13:
 			gs 'stat'

+ 18 - 18
locations/gschool_lunch.qsrc

@@ -222,12 +222,12 @@ if $ARGS[0] = 'marcus_event':
 	'You can''t help but smile and shake your head a little, you can tell by the way his eyes roam all over your body that despite his compliments there is only one thing on his mind right now right now. If the way he''s flirting wasn''t obvious enough, the bulge straining against his pants is a dead give away. "Well you''re not looking too bad yourself Marcus and by the look of things, you sure are VERY happy to see me." You say with a giggle and deliberately staring at his crotch.'
 	*nl
 	'He blushes slightly and pulls out his shirt so it hangs over his crotch, trying to hide his erection a little. "Oh fuck, sorry about that. I just had two girls in my last class who took turns flashing me. I swear those girls get a huge kick out of teasing me." He looks around a bit and then leans in a little close to you and says softly. "Hey, think you might be able to you know... help me out with this?" He says indicating the evident bulge in his pants.'
-	gs 'willpower', 'bj'
+	gs 'willpower', 'bj', 'resist'
 	if will_cost <= pcs_willpwr:
-		act 'Make excuse and go (<<will_cost>> Willpower)':
+		act 'Make an excuse and go (<<will_cost>> Willpower)':
 			*clr & cla
-			gs 'willpower', 'bj'
-			gs 'willpower', 'resist'
+			gs 'willpower', 'bj', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 			'"Sorry Marcus but I got some stuff I got to do, maybe some other time?" You can see he is fairly disappointed but he nods in agreement.'
@@ -235,15 +235,15 @@ if $ARGS[0] = 'marcus_event':
 			'"Yeah, talk to you later." With that you walk off.'
 			act 'Go to lunch': gt 'gschool_lunch', 'lunch'
 		end
+	else
+		act 'Make an excuse and go (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 	end
-	gs 'willpower', 'bj'
-	will_cost = will_cost * 3/2
+	gs 'willpower', 'bj', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:	
 		act 'Not today (<<will_cost>> Willpower)':
 			*clr & cla
-			gs 'willpower', 'bj'
-			will_cost = will_cost * 3/2
-			gs 'willpower', 'resist'
+			gs 'willpower', 'bj', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 			'You shake your head no. "Sorry not today Marcus."'
@@ -278,7 +278,7 @@ if $ARGS[0] = 'marcus_event':
 			end
 		end
 	else
-		'<br>You don''t have enough willpower to refuse.'
+		act 'Not today (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 	end
 	act 'Help him out':
 		*clr & cla
@@ -368,18 +368,18 @@ if $ARGS[0] = 'events':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/school/want.jpg"></center>'
 		'As you are leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately, while one of her hands slides up your skirt and starts rubbing your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don''t really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you, come with me," her fingers sliding up into your pussy as she says it.'
 		
-		gs 'willpower', 'sex'
+		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
-			act 'Not today (<<will_cost>> Willpower)': 
+			act 'Not today (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nomake.jpg"></center>'
 				'You are barely able to tear yourself away, mostly because you don''t really want to, but after struggling with yourself for a bit you finally manage to break away and shake your head at Anushka. "I''m sorry but I can''t right now... sorry." With that you hurry away.'
 				act 'Continue': gt 'gschool_lunch', 'break'
 			end
 		else
-			'<br>You don''t have enough willpower to refuse.'
+			act 'Not today (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 		end
 		
 		act 'Go with it':
@@ -393,13 +393,13 @@ if $ARGS[0] = 'events':
 		end
 	elseif (Anush_lunch > 1 or grupTipe = 4) and rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
-		'As you stop by your locker after lunch, Anushka comes over and rests against the locker next to yours. She leans in close to you "Hey <<$pcs_nickname>>, you wanna come have some fun? The boys brought something special and they are waiting for us in one of the unused classrooms." By the look in her eye and the way she is acting, you know exactly what she means by having fun with the boys.'
+		'As you stop by your locker after lunch, Anushka comes over and rests against the locker next to yours. She leans in close to you "Hey <<$pcs_nickname>>, you wanna come have some fun? The boys brought something special and they are waiting for us in one of the unused classrooms." By the look in her eyes and the way she is acting, you know exactly what she means by having fun with the boys.'
 		
-		gs 'willpower', 'sex'
+		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Not today (<<will_cost>> Willpower)': 
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				grupvalue[4] -= 1
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
@@ -408,7 +408,7 @@ if $ARGS[0] = 'events':
 				act 'Continue': gt 'gschool_lunch', 'break'
 			end
 		else
-			'<br>You don''t have enough willpower to refuse.'
+			act 'Not today (<font color="red"><<will_cost>> Willpower</font>)':'<br>You don''t have enough willpower to refuse.'
 		end
 		act 'Go somewhere private':gt 'gschool_sex', 'Anush_private2'
 	elseif gruptipe = 4 and rand(0,3) = 0:

+ 12 - 12
locations/gschool_office.qsrc

@@ -291,11 +291,11 @@ if $ARGS[0] = 'no_plugin_nude':
 		*nl
 		'You stop when you realize how quickly your headmaster''s face darkens. A blind man could tell she is angry with you, even without the shrill tone of her voice: "I don''t care if you don''t like wearing them, you will not walk around my school like some whore. Do you understand me?"'
 		
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
-			act '"No" (<<will_cost>> Willpower)':
+			act 'No (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/angry.jpg"></center>'
 				'"No, I don''t have to wear them if I don''t want to," you say in a haughty voice; it''s not like she can force you, right?'
@@ -305,10 +305,10 @@ if $ARGS[0] = 'no_plugin_nude':
 				act 'See how she treats a whore': gt 'gschool_office', 'whore'
 			end
 		else
-			'<br>You don''t have enough willpower to say ''No''.'
+			act '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 '"Yes"':
+		act 'Yes':
 			*clr & cla
 			gs 'pain', 7, 'asscheeks', 'spank'
 			gs 'stat'
@@ -370,11 +370,11 @@ if $ARGS[0] = 'plugin_panties':
 		'"I like the way it feels, it especially helps class pass more quickly."'
 		'Her face darkens and you can tell she is angry with you, even without the shrill tone of her voice. "I don''t care if you like wearing them, you will not walk around my school like some whore. Do you understand me?"'
 		
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:	
 			act 'No (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/angry.jpg"></center>'
 				'"No, I like wearing it and I''m not gonna let you tell me what I can or can''t do," you say in a haughty voice; it''s not like she can force you, right?'
@@ -383,7 +383,7 @@ if $ARGS[0] = 'plugin_panties':
 				act 'See how she treats a whore': gt 'gschool_office', 'whore'
 			end
 		else
-			'<br>You don''t have enough willpower to say ''No''.'
+			act '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 'Yes':
@@ -452,11 +452,11 @@ if $ARGS[0] = 'plugin_nude':
 		*nl
 		'You stop when you realize how quickly your headmaster''s face darkens. A blind man could tell she is angry with you, even without the shrill tone of her voice: "I don''t care if you don''t like wearing them, you will not walk around my school like some whore. Do you understand me?"'
 		
-		gs 'willpower', 'misc'
+		gs 'willpower', 'misc', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
-			act 'No (<<will_cost>>)':
+			act 'No (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/angry.jpg"></center>'
 				'"No, I''m not gonna let you tell me what I can or can''t wear," you say in a haughty voice; it''s not like she can force you, right?'
@@ -466,7 +466,7 @@ if $ARGS[0] = 'plugin_nude':
 				act 'See how she treats a whore': gt 'gschool_office', 'whore'
 			end
 		else
-			'<br>You don''t have enough willpower to say ''No''.'
+			act '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 'Yes':

+ 33 - 31
locations/gschool_sex.qsrc

@@ -63,12 +63,12 @@ if $ARGS[0] = 'suck':
 				end
 			end
 		end
-		gs 'willpower', 'bj'
+		gs 'willpower', 'bj', 'resist'
 		if gruptipe = 4 and will_cost <= pcs_willpwr:
 			act 'Not today boys (<<will_cost>> willpower)':
 				*clr & cla
-				gs 'willpower', 'bj'
-				gs 'willpower', 'resist'
+				gs 'willpower', 'bj', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img src="images/locations/pavlovsk/school/afterschool/teasefo.mp4"></center>'
 				'You shake your head, "Sorry boys but I got stuff I have to do, you''ll just have to suck each other off today." you tell them as you walk away from them, but you do lift up your skirt to give them a nice view of your ass and put some extra hip sway into your walk. You hear Dan call you a fucking tease, you turn around and stop a moment like your might be changing your mind, suck on two of your fingers for a moment, the boys intently watch and you can tell they are getting excited at the idea you are going to change your mind, but as you pull your fingers out of your mouth you flip them off with a smile, then giggle and turn and walk away.'
@@ -76,16 +76,14 @@ if $ARGS[0] = 'suck':
 				'Seeing you do that, you are sure they are returning the favor as they tell you to fuck off and call you a variety of names but you don''t care, it was to funny to see the expression on their faces.'
 			end
 		elseif gruptipe = 4 and will_cost > pcs_willpwr:
-			'<br>You don''t have enough willpower to refuse.'
+			act 'Not today boys (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		gs 'willpower', 'bj'
-		will_cost = will_cost * 3/2
+		gs 'willpower', 'bj', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Make an excuse (<<will_cost>> willpower)':
 				*clr & cla 
-				gs 'willpower', 'bj'
-				will_cost = will_cost * 3/2
-				gs 'willpower', 'resist'
+				gs 'willpower', 'bj', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				minut += 1
 				:ReCheck
@@ -118,7 +116,7 @@ if $ARGS[0] = 'suck':
 				act 'Leave': gt 'gschool_grounds', 'main'
 			end
 		else
-			'<br>You don''t have enough willpower to make up an excuse.'
+			act 'Make an excuse (<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
@@ -274,18 +272,18 @@ end
 if $ARGS[0] = 'Anush_private2':
 	*clr & cla
 	menu_off = 1
+	gs 'arousal', 'foreplay', 2, 'lesbian'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 	'Feeling in the mood, instead of saying anything. Instead you lean in closer and kiss her on the lips, after a moment you break the kiss. "Sure, I''m up for some fun."'
 	'She grins to you and gives your ass a squeeze. "That''s my girl." She inclines her head for you to follow and then she starts off to the lesser used wing of the school. You fall in behind her, as the two of your weave through the maze of other students heading towards lunch, while the two of you head for a different destination.'
 	*nl
 	'Anushka leads you to the classroom, once inside she closes the door. Arkadi and Valentin are already in their waiting, passing a bottle of vodka back and forth. They grin as the two of you enter and wave you over. You notice the boys apparently found two of those large exercise balls and filled them up, as they are sitting on the floor near the guys. As you get closer Valentin speaks up. "Glad you could make it <<$pcs_nickname>>, here have a drink." He passes you the bottle of vodka.'
-	gs 'arousal', 'foreplay', 2, 'lesbian'
-	gs 'willpower', 'drink'
+	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Don''t drink (<<will_cost>> willpower)':
 			*clr & cla
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			npc_rel['A144'] -= 2
 			npc_rel['A158'] -= 2
 			npc_rel['A156'] -= 2
@@ -294,11 +292,11 @@ if $ARGS[0] = 'Anush_private2':
 			*nl
 			'The four of your talk for a bit, about the band, school, some of the other students, just normal stuff. As they get a buzz and Anushka more than that, she leans over close to you and starts feeling you up and kissing you.'
 			gs 'arousal', 'foreplay', 2, 'lesbian'
-			gs 'willpower', 'sex'
+			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Push her away (<<will_cost>> willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'arousal', 'end'
 					gs 'stat'
 					npc_rel['A144'] -= 2
@@ -309,12 +307,12 @@ if $ARGS[0] = 'Anush_private2':
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to push her away.'
+				act 'Push her 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 'Return the kiss': gt 'gschool_sex', 'Anush_kiss'
 		end
 	else
-		'<br>You don''t have enough willpower to refuse.'
+		act 'Don''t 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':
 		*clr & cla
@@ -325,21 +323,23 @@ if $ARGS[0] = 'Anush_private2':
 		'Valentin holds up the bottle. "I''ll drink to that, especially when we get to hang out with some fine ass bitches like the two of you." Which is followed by him taking an even bigger swig than Anushka took, so much so Arkadi elbows him in the side. "Hey stop trying to hog it all and pass it over."'
 		*nl
 		'Valentin coughs from the elbow and passes it to Arkadi, who promptly takes a big swig, while Valentin berate him. "Fucking asshole you almost made me choke on that." After his drink Arkadi passes the bottle back to you.'
-		gs 'willpower', 'drink'
+		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Don''t drink again (<<will_cost>> willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'arousal', 'foreplay', 2, 'lesbian'
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/nodrink.jpg"></center>'
 				'You take the bottle but shake your head no, passing it to Anushka. "No thanks I am good, I can already feel it hitting me." The rest of them laugh a bit, while Arkadi adds "Fucking light weight pussy, you need to learn how to drink. Don''t worry you hang around us and we''ll get you trained up in no time."'
 				*nl
 				'As Anushka takes a swig Valentin adds in "Fuck yeah you will, soon you''ll be putting them away like this bitch, now this bitch knows how to party." He says as he gropes Anushka''s tit as she drink and wraps another arm around her giving her a quick hug. Afterwards she passes the bottle back to the boys who start to take a drink, while she turns towards you and leans in close. She kisses you softly then a bit passionately on your lips.'
-				gs 'arousal', 'foreplay', 2, 'lesbian'
-				gs 'willpower', 'sex'
+				
+				gs 'willpower', 'sex', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Push her away (<<will_cost>> willpower)':
 						*clr & cla
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'arousal', 'end'
 						gs 'stat'
 						npc_rel['A144'] -= 2
@@ -352,16 +352,18 @@ if $ARGS[0] = 'Anush_private2':
 						act 'Continue': gt 'gschool_lessons', 'short_break'
 					end
 				else
-					'<br>You don''t have enough willpower to push her away.'
+					act 'Push her 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 'Return the kiss': gt 'gschool_sex', 'Anush_kiss'
 			end
 		else
-			'<br>You don''t have enough willpower to refuse.'
+			act 'Don''t drink again (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Take another drink':
 			*clr & cla
 			gs 'drugs', 'alcohol', 'vodka', 1
+			gs 'arousal', 'foreplay', 2, 'lesbian'
+			gs 'stat'
 			npc_rel['A144'] += 1
 			npc_rel['A158'] += 1
 			npc_rel['A156'] += 1
@@ -369,12 +371,12 @@ if $ARGS[0] = 'Anush_private2':
 			'You take the bottle again and take another drink, Anushka again tilts the bottle up and holds it up for longer forcing you to drink even more, to the hoots and calls of encouragement from the boys. Just about when you can''t take it anymore she tilts the bottle down and takes it away from you, leaving you coughing a bit, to the boys laughter. She takes a big swig herself as you cough and feel your throat burning and your eyes watering slightly.'
 			*nl
 			'Once she passes the bottle back to the boys she leans in closes and starts to feel you up and kiss you. You can hear one of the guys giving his encouragement to what he is seeing.'
-			gs 'arousal', 'foreplay', 2, 'lesbian'
-			gs 'willpower', 'sex'
+			
+			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Push her away (<<will_cost>> willpower)':
 					*clr & cla
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'arousal', 'end'
 					gs 'stat'
 					npc_rel['A144'] -= 2
@@ -387,7 +389,7 @@ if $ARGS[0] = 'Anush_private2':
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				'<br>You don''t have enough willpower to push her away.'
+				act 'Push her 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 'Return the kiss': gt 'gschool_sex', 'Anush_kiss'
 		end
@@ -658,11 +660,11 @@ if $ARGS[0] = 'lunch_sex':
 		'Holding your hips tight with his hands as he fucks you, he leans forward. "<<$pcs_nickname>> can I fuck you in the ass?"'
 		gs 'arousal', 'vaginal', 10, 'unknown'
 		gs 'stat'
-		gs 'willpower', 'anal'
+		gs 'willpower', 'anal', 'resist'
 		if will_cost <= pcs_willpwr:			
 			act 'No (<<will_cost>> Willpower)': 
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/roofvag.jpg"></center>'
 				'You shake your head no. "No, just fuck me."'
@@ -673,7 +675,7 @@ if $ARGS[0] = 'lunch_sex':
 				act 'Swallow': gt 'gschool_sex', 'lunch_sex2'
 			end
 		else
-			'<br>You don''t have enough willpower to refuse.'
+			act '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 'Yes':
 			*clr & cla

+ 3 - 3
locations/kotovtalker.qsrc

@@ -101,11 +101,11 @@ elseif kotovLoveQW > 0 and pav_slut > 100:
 		if $loc = 'gdkin':act 'Move away':gt $loc, $metka
 	end
 
-	gs 'willpower', 'misc'
+	gs 'willpower', 'misc', 'force', 'hard'
 	if wil_cost >= pcs_willpwr and pcs_dom > 0:
 		act 'Argue that it''s not true (<<will_cost>> Willpower)':
 			*clr & cla
-			gs 'willpower', 'force'
+			gs 'willpower', 'pay', 'force'
 			sub += 5
 			if pav_sex > 100: pav_sex = 100
 			if pav_prostitute > 100: pav_prostitute = 100
@@ -116,7 +116,7 @@ elseif kotovLoveQW > 0 and pav_slut > 100:
 		if $loc = 'gdkin':act 'Move away':gt $loc, $metka
 		end
 	elseif wil_cost < pcs_willpwr:
-		'You don''t have enough willpower to argue against it.'
+		act 'Argue that it''s not true (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 elseif $loc = 'gdkin':
 	if pav_slut < 150:

+ 40 - 47
locations/natbelapt.qsrc

@@ -473,51 +473,51 @@ if $ARGS[0] = 'natroom':
 			if NatashaQW > 1 and lernHome ! 0: act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
 
 			if NatashaQW >= 5:
-				gs 'willpower', 'exhib'
+				gs 'willpower', 'exhib', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your feet (<<will_cost>> Willpower)':
-						gs 'willpower', 'exhib'
-						gs 'willpower', 'force'
+						gs 'willpower', 'exhib', 'force'
+						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'lick_feet'
 					end
 				else
-					'You don''t have enough willpower to make her lick your feet.'
+					act 'Make her lick your feet (<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 NatashaQW >= 6:
-				gs 'willpower', 'exhib'
+				gs 'willpower', 'exhib', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Spit in face (<<will_cost>> Willpower)':
-						gs 'willpower', 'exhib'
-						gs 'willpower', 'force'
+						gs 'willpower', 'exhib', 'force'
+						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'spit_face'
 					end
 				else
-					'You don''t have enough willpower to spit in her face.'
+					act 'Spit in face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
 			if NatashaQW >= 7:
-				gs 'willpower', 'sex'
+				gs 'willpower', 'sex', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your pussy (<<will_cost>> Willpower)':
-						gs 'willpower', 'sex'
-						gs 'willpower', 'force'
+						gs 'willpower', 'sex', 'force'
+						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'lick_pussy'
 					end
 				else
-					'You don''t have enough willpower to make her lick your pussy.'
+					act 'Make her lick your pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
 			if NatashaQW >= 8 and hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart and kolkawantsnat = 1:
-				gs 'willpower', 'sex'
+				gs 'willpower', 'sex', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Make her fuck Kolka (<<will_cost>> Willpower)':
-						gs 'willpower', 'sex'
-						gs 'willpower', 'force'
+						gs 'willpower', 'sex', 'force'
+						gs 'willpower', 'pay', 'force'
 						gt 'natkolev', 'kolkabj'
 					end
 				else
-					'You don''t have enough willpower to make her fuck Kolka.'
+					act 'Make her fuck Kolka (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
 !! nutluck pulled this for now
@@ -525,15 +525,15 @@ if $ARGS[0] = 'natroom':
 			!	act 'Fuck her with Julia': gs 'natbelapt', 'Nat_Julia_3some'
 			!end
 			if NatashaQW >= 9 and olufirst = 3 and oluuosegunday ! daystart:
-				gs 'willpower', 'anal'
+				gs 'willpower', 'anal', 'force'
                 if will_cost <= pcs_willpwr:
                     act 'Take her to see Olu (<<will_cost>> Willpower)':
-						gs 'willpower', 'sex'
-						gs 'willpower', 'force'
+						gs 'willpower', 'anal', 'force'
+						gs 'willpower', 'pay', 'force'
 						gt 'natpimp', 'go_see_olu'
 					end
 				else
-					'You don''t have enough willpower to take her to Olu.'
+					act 'Take her to see Olu (<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
@@ -737,11 +737,11 @@ if $ARGS[0] = 'hwundress':
 	menu_off = 1
 	'<center><img src="images/characters/pavlovsk/school/girl/natasha/study.jpg"></center>'
 	'When you see that Natasha is working hard on your homework, you get up from your seat and lie down on her bed to relax.'
-	gs 'willpower', 'exhib'
+	gs 'willpower', 'exhib', 'force'
 	if will_cost <= pcs_willpwr:
 		act 'Tell her to strip (<<will_cost>> Willpower)':
 			cla
-			gs 'willpower', 'force'
+			gs 'willpower', 'pay', 'force'
 			natdoingHW = 1	
 			'"You know, I''m not feeling properly entertained over here." You say, feeling a bit bored. "I think you should lose some clothes, so I have something to look at."'
 			'"B-But what if my mom walks in?" Natasha asks in a trembling voice.'
@@ -774,7 +774,7 @@ if $ARGS[0] = 'hwundress':
 			end	
 		end
 	else
-		'You don''t have enough willpower to make her strip.'
+		act 'Tell her to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Just wait until she''s done':
 		'You are woken out of your daydream by Natasha saying: "It''s done <<$pcs_nickname>>."'
@@ -847,31 +847,24 @@ if $ARGS[0] = 'afterhomework':
 		gt 'natbelapt', 'natroom'
 	end
 	
-	if NatashaQW >= 7:
-		act 'Take off your own clothes':
+	gs 'willpower', 'cuni', 'force'
+	if NatashaQW >= 7 and will_cost <= pcs_willpwr:
+		act 'Take off your own clothes (<<will_cost>> Willpower)':
 			cla
+			gs 'willpower', 'pay', 'self'
 			'You smile at Natasha and start taking off your own clothes slowly, she tries not to pay attention to you. Yet you can see her sneaking peeks.'
-			gs 'willpower', 'bj'
-			if will_cost <= pcs_willpwr:
-				act 'Lie down and open your legs (<<will_cost>> Willpower)':
-					gs 'willpower', 'resist'
-					gt 'natbelapt', 'openlegs'
-				end
-				act 'Straddle her face (<<will_cost>> Willpower)':
-					gs 'willpower', 'resist'
-					gt 'natbelapt', 'straddleface'
-				end
-			else
-				'You don''t have enough willpower to make her lick your pussy.'
-			end
+			act 'Lie down and open your legs': gt 'natbelapt', 'openlegs'
+			act 'Straddle her face': gt 'natbelapt', 'straddleface'
 		end
+	elseif NatashaQW >= 7 and will_cost > pcs_willpwr:
+		act 'Take off your own clothes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	if natseethrough = 1:
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'exhib', 'force'
 		if will_cost <= pcs_willpwr:
 			act 'Make her wear the lingerie (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'force'
+				gs 'willpower', 'pay', 'force'
 				'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethrough00.jpg"></center>'
 				natseethroughwearing = 1
 				if natseethroughworn = 0:
@@ -930,7 +923,7 @@ if $ARGS[0] = 'afterhomework':
 				end
 			end
 		else
-			'You don''t have enough willpower to make her wear the lingerie.'
+			act 'Make her wear the lingerie (<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
@@ -1657,12 +1650,12 @@ if $ARGS[0] = 'kitchen':
 		act 'Leave': gt 'natbelapt','hallway'
 		act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 		if NatashaQW > 6:
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Show me some skin (<<will_cost>> Willpower)':
 					*clr & cla
 					minut += 2
-					gs 'willpower', 'force'
+					gs 'willpower', 'pay', 'force'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natfridgeshow.jpg"></center>'
 					'You grab her ass, making her jump and turn around. "Oh <<$pcs_nickname>>, you startled me."'
@@ -1677,7 +1670,7 @@ if $ARGS[0] = 'kitchen':
 					act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 				end
 			else
-				'You don''t have enough willpower to make her undress.'
+				act 'Show me some skin (<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 NatashaMotherHome = 1 and rand(0,4) = 0 and natmomrobe = 0:
@@ -1834,11 +1827,11 @@ if $ARGS[0] = 'natmother':
 		'"Wow, putting on a show for me Natasha?" You ask her as you walk into the room.'
 		'At the sound of your voice, Natasha immediately turns to you and tries to hide just how short the skirt is with her hands.'
 		if NatashaQW > 6:
-			gs 'willpower', 'exhib'
+			gs 'willpower', 'exhib', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Show me more (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'force'
+					gs 'willpower', 'pay', 'force'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natdressing02.jpg"></center>'
 					'"Now don''t get shy on me. Such an outfit is made to draw attention, so stop covering up and give me a show."'
@@ -1862,7 +1855,7 @@ if $ARGS[0] = 'natmother':
 					end
 				end
 			else
-				'You don''t have enough willpower to make her strip.'
+				act 'Show me more (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			'"Hey, want to go hang out in your room?"'

+ 1 - 1
locations/nichGala.qsrc

@@ -827,7 +827,7 @@ elseif $ARGS[0] = 'slaveGeneric':
 		minut += 120
 		gs 'stat'
 		act 'Downstairs': gt 'nichApartment'
-	else nichRand <= 8:
+	elseif nichRand <= 8:
 		!! Being restrained
 		'<center><img <<$set_imgh>> src="images/characters/city/gala/slave/whipped'+rand(1,2)+'.jpg"></center>'
 		'Gala leads you to her bedroom. There she makes you undress, ties you up and takes out her whip.'

+ 51 - 51
locations/pod_ezd.qsrc

@@ -377,11 +377,11 @@ if $ARGS[0] = 'floor2_events':
 			if rand(0,1) = 1:
 				'You have a chat with uncle Misha, as he smokes his cigarette. You can tell he''s undressing you in his mind, but in a way you find it kind of flattering. As he stubs out his cigarette and puffs away the last bits of smoke, he asks:'
 				'"Say, <<$pcs_nickname>>, would you like to make an old man feel good? I could use a quick blowjob... there''ll be 50 <b>₽</b> in it for you, for your troubles."'
-				gs 'willpower', 'bj'
+				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						minut +=2
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/mishasmoke.jpg"></center>'
@@ -390,7 +390,7 @@ if $ARGS[0] = 'floor2_events':
 						act 'Say goodbye': gt 'pod_ezd', 'etaj_2'
 					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 'Suck him off': gt 'pod_ezd', 'misha_bj'
 			else
@@ -747,14 +747,14 @@ if $ARGS[0] = 'boys_smoke':
 			'As you smoke the cigarette, you hear the boys whisper among themselves. "That''s <<$pcs_nickname>>! I heard she''s a '+func('gopsex','hide','gg_whore_text')+'. From what I''ve been told she''ll do just about anything if the price is right, let''s see if she''ll make us a deal."'
 			'One of the guys walks close to you, and gestures for you to lean your head closer to his. When you do, he pulls all of his money out of his pocket. He counts the crumpled bills and offers them to you, whispering, "Is <<rnd_money_sex>> <b>₽</b> enough for two?"'
 			'He never mentions what exactly he wants you to do with him and his friend.'
-			gs 'willpower', 'prostitution'
+			gs 'willpower', 'prostitution', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse and get away from them (<<will_cost>> Willpower)':
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gt 'pod_ezd', $smoke_loc
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				act 'Refuse and get away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Accept and fuck them':
 				money += '<<rnd_money_sex>>'
@@ -768,12 +768,12 @@ if $ARGS[0] = 'boys_smoke':
 				gs 'fame', 'pav', 'sex', 2
 				gt 'pod_ezd','sex_ev<<rand(1,3)>>'
 			end
-			gs 'willpower', 'gangbang'
+			gs 'willpower', 'gangbang', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Get angry and tell them off (<<will_cost>> Willpower)':
 					*clr & cla
 					minut +=2
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/megera.jpg"></center>'
 					'Tired of always having to defend yourself, you take all your anger out on the guys. "Are you kidding me!? Did all the blood drain from your brains and into your groins or something?"'
@@ -782,7 +782,7 @@ if $ARGS[0] = 'boys_smoke':
 					act 'Leave': gt 'pod_ezd', $smoke_loc
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				act 'Get angry and tell them off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			'You gladly accept and spend the next 5 minutes smoking a cigarette with them, talking about trivial things.'
@@ -799,14 +799,14 @@ if $ARGS[0] = 'boys_smoke':
 			'You hear the boys whisper among themselves. "That''s <<$pcs_nickname>>! I heard she''s a '+func('gopsex','hide','gg_whore_text')+'. From what I''ve been told she''ll do just about anything if the price is right, let''s see if she''ll make us a deal."'
 			'One of the guys walks close to you, and gestures for you to lean your head closer to his. When you do, he pulls all of his money out of his pocket. He counts the crumpled bills and offers them to you, whispering: "Is <<rnd_money_sex>> <b>₽</b> enough for two?"'
 			'He never mentions what exactly he wants you to do with him and his friend.'
-			gs 'willpower', 'prostitution'
+			gs 'willpower', 'prostitution', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse and get away from them (<<will_cost>> Willpower)':
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gt 'pod_ezd', $smoke_loc
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				act 'Refuse and get away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Accept and fuck them':
 				money += '<<rnd_money_sex>>'
@@ -816,12 +816,12 @@ if $ARGS[0] = 'boys_smoke':
 			end
 		elseif pav_slut >= 125 and pav_sex >= pav_prostitute:
 			'You hear the boys whisper among themselves. "That''s <<$pcs_nickname>>. I heard she''s a total slut. I bet if someone would walk up to her and drop their pants, she would start sucking them off without a second thought."'
-			gs 'willpower', 'gangbang'
+			gs 'willpower', 'gangbang', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Get angry and tell them off (<<will_cost>> Willpower)':
 					*clr & cla
 					minut +=2
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/megera.jpg"></center>'
 					'Tired of always having to defend yourself, you take all your anger out on the guys: "Are you kidding me!? Did all the blood drain away from your brains and into your groins or something?"'
@@ -830,7 +830,7 @@ if $ARGS[0] = 'boys_smoke':
 					act 'Leave': gt 'pod_ezd', $smoke_loc
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				act 'Get angry and tell them 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 'Do as they say': gs 'fame', 'pav', 'sex', rand(3,9) & gt 'pod_ezd','sex_ev<<rand(1,3)>>'
 		else
@@ -922,11 +922,11 @@ if $ARGS[0] = 'juliamil':
 							end
 						end
 					end
-					gs 'willpower', 'sex'
+					gs 'willpower', 'cuni', 'force'
 					if will_cost <= pcs_willpwr:
 						act 'Make her lick you instead (<<will_cost>> Willpower)':
 							*clr & cla
-							gs 'willpower', 'force'
+							gs 'willpower', 'pay', 'force'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/stairs/julia5.jpg"></center>'
 							'You expose your pussy and gently rub a finger over your clit, telling her. "No, you''re going to lick me first."'
@@ -958,7 +958,7 @@ if $ARGS[0] = 'juliamil':
 							end
 						end
 					else
-						'You don''t have enough willpower to force her to lick you instead.'
+						act 'Make her lick you instead (<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
@@ -978,11 +978,11 @@ if $ARGS[0] = 'vasily_smoke':
 		'He idly runs his hand over his groin, and you can see the outline of his hard cock through the fabric of his pants quite clearly.'
 		'You look at him with some doubt. "I don''t know Shulga, people might see."'
 		'He reassures you, "Don''t worry <<$pcs_nickname>>, you''ll be fine. I''ll keep an eye out, and there''s no one here now right? Just take it in your mouth. I know you''re good at it, you can finish me off quickly."'
-		gs 'willpower', 'bj'
+		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse giving him a blowjob (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				minut +=1
 				gs 'stat'
 				if pav_slut >= 125:
@@ -1006,7 +1006,7 @@ if $ARGS[0] = 'vasily_smoke':
 				end
 			end
 		else
-			'You don''t have enough willpower to refuse.'
+			act 'Refuse giving him a blowjob (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Suck him off quickly': gt 'pod_ezd', 'vasily_smoke_bj'
 	else
@@ -1060,11 +1060,11 @@ if $ARGS[0] = 'smoke_danvas':
 		'He idly runs his hand over his groin, and you can see the outline of his hard cock through the fabric of his pants quite clearly.'
 		'You look at him with some doubt: "I don''t know Shulga, people might see."'
 		'He reassures you: "Don''t worry <<$pcs_nickname>>, you''ll be fine. we''ll keep an eye out, and there''s no one here now right? Just take it in your mouth. I know you''re good at it, you can finish me off quickly."'
-		gs 'willpower', 'bj'
+		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse giving him a blowjob (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				minut +=1
 				gs 'stat'
 				if pav_slut >= 125:
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'smoke_danvas':
 				end
 			end
 		else
-			'You don''t have enough willpower to refuse.'
+			act 'Refuse giving him a blowjob (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Suck him off quickly': gt 'pod_ezd', 'danvas_smoke_bj'
 	else
@@ -1182,18 +1182,18 @@ if $ARGS[0] = 'danvas_smoke_bj':
 					'You leave their cum on your face, which they seem to really enjoy. They put their dicks away and button up their pants. You chat with them for a bit more, with their cum dripping down your face, before they tell you they need to get going and go into Vasily''s apartment.'
 					act 'Leave': gt 'pod_ezd', 'etaj_3'
 				end
-				gs 'willpower', 'humiliation'
+				gs 'willpower', 'humiliation', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Clean your face (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/vassmoke.jpg"></center>'
 						'You clean their cum off your face, while they put their dicks away and button up their pants. You chat with them for a bit more, before they tell you they need to get going and go into Vasily''s apartment.'
 						act 'Leave': gt 'pod_ezd', 'etaj_3'
 					end
 				else
-					'You don''t have enough willpower to refuse.'
+					act 'Clean your face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
 		end
@@ -1292,13 +1292,13 @@ if $ARGS[0] = 'gopnik_group_chat':
 		'You take a seat next to Lena and Lera. "Hey guys whats up?" You ask them.'
 		'Lera leans over and kisses you on the lips. "Just hanging out and having fun." She slurs obviously she is pretty drunk already, her breath smells like a distillery.'
 		'Vasily offers you one of the beers. "Here <<$pcs_nickname>>."'
-		gs 'willpower', 'drink'
+		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Decline the beer (<<will_cost>> Willpower)':
 				*clr & cla
 				minut += 15
 				grupvalue[4] -= 2
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/gopniks.jpg"></center>'
 				'You shake your head no. "No thanks, I just wanted to chat."'
@@ -1306,7 +1306,7 @@ if $ARGS[0] = 'gopnik_group_chat':
 				act 'Leave': gt 'pod_ezd', 'etaj_5'
 			end
 		else
-			'You don''t have enough willpower to refuse.'
+			act 'Decline the beer (<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 the beer':
 			*clr & cla
@@ -1599,14 +1599,14 @@ if $ARGS[0] = 'sex_ev1':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/sex_ev1_1.jpg"></center>'
 	'One of the boys is content to just keep smoking, but the other one grows more bold and approaches you. He starts pulling at your clothes with one hand while his other hand starts massaging your ass.'
 	'The other boy who is still smoking grins as he watches his friend pull at your clothes. He says nothing, deciding to see how far they can push you, and simply commands you: "Show us your tits, slut."'
-	gs 'willpower', 'exhib'
+	gs 'willpower', 'exhib', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Pull away and leave (<<will_cost>> Willpower)':
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gt 'pod_ezd', 'etaj_2'
 		end
 	else
-		'You don''t have enough willpower to refuse.'
+		act 'Pull 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 'Show them your boobs':
 		*clr & cla
@@ -1615,14 +1615,14 @@ if $ARGS[0] = 'sex_ev1':
 		'This brings an evil grin to his face: "Well well, look at that. You really are a obedient little slut, aren''t you <<$pcs_nickname>>? Now turn your back to my friend and bend over, he''s going to fuck you now."'
 		gs 'arousal', 'flash', 3, 'sub', 'exhibitionism'
 		gs 'stat'
-		gs 'willpower', 'anal'
+		gs 'willpower', 'anal', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Pull away and leave (<<will_cost>> Willpower)':
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gt 'pod_ezd', 'etaj_2'
 			end
 		else
-			'You don''t have enough willpower to refuse.'
+			act 'Pull 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 'Continue to obey':
 			*clr & cla
@@ -1681,14 +1681,14 @@ if $ARGS[0] = 'sex_ev1_anal':
 	'He accelerates his thrusting, his balls are slapping against your bare pussy as he brutally fucks your asshole. The sounds must be clearly audible throughout the stairwell, you just hope no one comes to investigate and find you getting violently sodomized. You do your best to stifle your groans and moans of pain and pleasure by biting your lips.'
 	gs 'gopsex', 'gg_sex_orgasm'
 	act 'Say nothing and let keep ripping up your ass': gt 'pod_ezd', 'sex_ev1_anal1'
-	gs 'willpower', 'anal'
+	gs 'willpower', 'anal', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Suggest you''ll give them a blowjob instead (<<will_cost>> Willpower)':
 			*clr & cla
 			gs 'arousal', 'bj', 3,'dick[2]','sub'
 			gs 'arousal', 'bj', 3,'dick[1]','sub'
 			minut -= 3
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/sex_ev1_4.jpg"></center>'
 			'Several thoughts race through your mind as your being brutally assfucked. You quickly dismiss the thoughts of getting away; there''s no way the guys will just let you go now. Your tactic switches to the next-most desirable option: making them cum as quick as possible before anyone comes along and finds you getting assfucked in the stairwell.'
@@ -1703,7 +1703,7 @@ if $ARGS[0] = 'sex_ev1_anal':
 			end
 		end
 	else
-		'You don''t have enough willpower to refuse.'
+		act 'Suggest you''ll give them a blowjob instead (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -1755,14 +1755,14 @@ if $ARGS[0] = 'sex_ev2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/sex_ev2_1.jpg"></center>'
 	'One of the boys is content to just keep smoking, but the other one grows more bold and approaches you. He stops in front of you with his arms crossed. He doesn''t look like he''ll take no for an answer when he orders you: "Take off your clothes, slut."'
-	gs 'willpower', 'exhib'
+	gs 'willpower', 'exhib', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Pull away and leave (<<will_cost>> Willpower)':
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gt 'pod_ezd', 'etaj_2'
 		end
 	else
-		'You don''t have enough willpower to refuse.'
+		act 'Pull 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 'Do as he says':
 		*clr & cla
@@ -1780,14 +1780,14 @@ if $ARGS[0] = 'sex_ev2':
 			'He grins at your involuntary moans: "I know, slut, I know... you love it when guys play with your tits. Don''t worry, we''ll take good care of you."'
 			'The older guy of the two looks at his younger friend and tells him: "<<$boydesc[2]>>, tell her to suck us both. Don''t worry, she''ll do it."'
 			'The younger guy hesitates for a moment, but then decides to listen to his friend. He walks over to you and pulls his <<dick[2]>>cm <<$dick_girth[2]>> dick out of his pants as he tells you: "Slut, get on your knees and start sucking my dick!"'
-			gs 'willpower', 'bj'
+			gs 'willpower', 'bj', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Pull away and leave (<<will_cost>> Willpower)':
-					gs 'willpower', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gt 'pod_ezd', 'etaj_2'
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				act 'Pull 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 'Suck their dick':
 				*clr & cla
@@ -1861,14 +1861,14 @@ if $ARGS[0] = 'sex_ev3':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/sex_ev3_1.jpg"></center>'
 	'One of the boys smirks at you, with an impatient look on his face: "What are you waiting for, whore? Show us your tits!"'
-	gs 'willpower', 'exhib'
+	gs 'willpower', 'exhib', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Pull away and leave (<<will_cost>> Willpower)':
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gt 'pod_ezd', 'etaj_2'
 		end
 	else
-		'You don''t have enough willpower to refuse.'
+		act 'Pull 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 'Show them your tits':
 		*clr & cla
@@ -1877,14 +1877,14 @@ if $ARGS[0] = 'sex_ev3':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/sex_ev3_2.jpg"></center>'
 		'You quickly pull up your shirt and take your bra off, not wanting to make him any angrier. He reaches and roughly grabs one of your bare breasts, playing with your nipple.'
 		'He continues to roughly squeezes your boobs with both his hands: "That''s more like it, slut. Now strip and show us your ass!"'
-		gs 'willpower', 'exhib'
+		gs 'willpower', 'exhib', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Pull away and leave (<<will_cost>> Willpower)':
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gt 'pod_ezd', 'etaj_2'
 			end
 		else
-			'You don''t have enough willpower to refuse.'
+			act 'Pull 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 'Strip naked for them':
 			*clr & cla

+ 20 - 18
locations/sny.qsrc

@@ -18,11 +18,12 @@ if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg"></center>'
 	'The whole class went to Dimka home. He house had music playing and lots of alcohol to drink, you go up to a table with a couple of the other girls and get a glass of vodka. Soon everyone is drinking and celebrating the new year.'
 
-	gs 'willpower', 'drink'
+	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse to drink (<<will_cost>> Willpower)':
 			*clr & cla
 			minut += 15
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg"></center>'
 			'You just hold the vodka and pretend to drink before setting it back down.'
@@ -30,7 +31,7 @@ if $ARGS[0] = '3':
 			act 'Continue': minut += 5 & gt 'sny', '4'
 		end
 	else
-		'<br>You don''t have enough willpower to resist.'
+		act 'Refuse to drink (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to resist.</font>'
 	end
 	
 	act 'Drink':
@@ -51,11 +52,12 @@ if $ARGS[0] = '4':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg"></center>'
 	'Boys and girls start to relax and break up into groups to talk. Someone poured more vodka into a glass and handed you another glass of vodka.'
 
-	gs 'willpower', 'drink'
+	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse to drink (<<will_cost>> Willpower)':
-		*clr & cla
+			*clr & cla
 			minut += 15
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg"></center>'
 			'You turn down the offered glass.'
@@ -63,7 +65,7 @@ if $ARGS[0] = '4':
 			act 'Continue': minut += 5 & gt 'sny', '5'
 		end
 	else
-		'<br>You don''t have enough willpower to resist.'
+		act 'Refuse to drink (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
 	end
 		
 	act 'Drink':
@@ -84,12 +86,12 @@ if $ARGS[0] = '5':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa5.jpg"></center>'
 	'Albina went into the center of the room and began to dance, she is a very talented dancer and knows how to move her body. She was quickly joined by Katja and her sister Vicky. While you are watching the girls, someone hands you another glass of vodka.'
 	
-	gs 'willpower', 'drink'
+	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse to drink (<<will_cost>> Willpower)':
 			*clr & cla
 			minut += 15
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa5.jpg"></center>'
 			'You turn down the offered glass.'
@@ -97,7 +99,7 @@ if $ARGS[0] = '5':
 			act 'Continue': minut += 5 & gt 'sny', '6'
 		end
 	else
-		'<br>You don''t have enough willpower to resist.'
+		act 'Refuse to drink (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
 	end
 	
 	act 'Drink':
@@ -118,12 +120,12 @@ if $ARGS[0] = '6':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa6.jpg"></center>'
 	'Albina and Katja are dancing face to face in the middle of the room. Suddenly Albina kisses Katja on the lips. The room erupts into howling kids encouraging them to continuing. Someone hands you another glass of vodka.'
 
-	gs 'willpower', 'drink'
+	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse to drink (<<will_cost>> Willpower)':
 			*clr & cla
 			minut += 15
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa6.jpg"></center>'
 			'You turn down the offered glass.'
@@ -131,7 +133,7 @@ if $ARGS[0] = '6':
 			act 'Continue': minut += 5 & gt 'sny', '7'
 		end
 	else
-		'<br>You don''t have enough willpower to resist.'
+		act 'Refuse to drink (<font color="red"<<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
 	end
 	
 	act 'Drink':
@@ -209,14 +211,14 @@ if $ARGS[0] = '7':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/idi.jpg"></center>'
 		'You are a bit tipsy and feel fairly relaxed at the party. There''s some vodka shots lined up so you could have another drink or maybe it''s time to head home?'
 
-		gs 'willpower', 'drink'
+		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
 				gt 'pavResidential'
 			end
 		else
-			'<br>You don''t have enough willpower to resist.'
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to resist.</font>'
 		end
 		
 		act 'Drink':
@@ -260,21 +262,21 @@ if $ARGS[0] = '9':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa9.jpg"></center>'
-	'Virtually everyone is passed on the floor, some in varies stats of undress. Dimka comes over to you "And you''re still on your feet? Good for you, the others have already left or passed out, let''s_go, I need you to help me with something."'
+	'Virtually everyone is passed on the floor, some in varies stats of undress. Dimka comes over to you "And you''re still on your feet? Good for you, the others have already left or passed out, let''s go, I need you to help me with something."'
 
-	gs 'willpower', 'misc'
+	gs 'willpower', 'misc', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'I have to go now (<<will_cost>> Willpower)':
 			*clr & cla
 			minut += 15
-			gs 'willpower', 'resist'
+			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'You tell Dimka, you had to leave.'
 
 			act 'Leave':gt 'pavResidential'
 		end
 	else
-		'<br>You don''t have enough willpower to refuse.'
+		act 'I have to go now (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to refuse.</font>'
 	end
 
 	act 'Let''s go': minut += 5 & gt 'sny', '10'

+ 28 - 2
locations/stat_display.qsrc

@@ -142,7 +142,7 @@ if Enable_showstatimg = 1:
 		$img_temp = FUNC('$body_image','shoes')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
 	end
-	$stat_imgtool_msg += ' <a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']">◎Settings</a>'
+	if $menu_loc ! '': $stat_imgtool_msg += ' <a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']">◎Settings</a>'
 
 end
 !!----------------image Extra messages, end --------------------------
@@ -1065,6 +1065,8 @@ if $clothingworntype ! 'nude':
 	if CloThinness = 6:
 		if $clothingworntype = 'swimwear':
 			$stat_msg += '<BR><font color = #FF00FF>Your nipples are clearly showing through your transparent swimsuit.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #FF00FF>Your breasts are fully on display through your transparent bra and top.</font>'
 		elseif $braworntype ! 'none':
 			$stat_msg += '<BR><font color = #FF00FF>Your bra is clearly showing through your transparent top.</font>'
 		else
@@ -1073,12 +1075,16 @@ if $clothingworntype ! 'nude':
 	elseif CloThinness = 5:
 		if $clothingworntype = 'swimwear':
 			$stat_msg += '<BR><font color = #AB052A>Your nipples are noticeably poking through your swimsuit.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #AB052A>You are wearing such a thin bra that your nipples are noticably poking through the thin fabric of your top.</font>'
 		elseif $braworntype = 'none':
 			$stat_msg += '<BR><font color = #AB052A>You are not wearing a bra and your nipples are noticably poking through the thin fabric of your top.</font>'
 		end
 	elseif CloThinness = 4:
 		if $clothingworntype = 'swimwear':
 			$stat_msg += '<BR><font color = #AB052A>Your nipples are very slightly poking through your swimsuit.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #AB052A>You are wearing such a thin bra that your nipples are subtly outlined through your top.</font>'
 		elseif $braworntype = 'none':
 			$stat_msg += '<BR><font color = #AB052A>You are not wearing a bra and your nipples are being subtly outlined through your top.</font>'
 		end
@@ -1088,9 +1094,19 @@ if $clothingworntype ! 'nude':
 end
 
 if $clothingworntype = 'nude':
-	if $pantyworntype ! 'none':
+	if $pantyworntype = 'exhibitionist':
+		if $braworntype = 'none':
+			$stat_msg += '<BR><font color = #AB052A>You are only wearing your see-through panties and your boobs sway invitingly as you walk.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #AB052A>You are only wearing your see-through underwear.</font>'
+		else
+			$stat_msg += '<BR><font color = #AB052A>You are only wearing your see-through panties and bra.</font>'
+		end
+	elseif $pantyworntype ! 'none':
 		if $braworntype = 'none':
 			$stat_msg += '<BR><font color = #AB052A>You are only wearing your panties and your boobs sway invitingly as you walk.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #AB052A>You are only wearing your see-through bra and panties.</font>'
 		else
 			$stat_msg += '<BR><font color = #AB052A>You are only wearing your underwear.</font>'
 		end
@@ -1137,6 +1153,16 @@ elseif $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 			$stat_msg += '<BR><font color=#AB052A>You are not wearing panties.</font>'
 		end
 	end
+elseif $pantyworntype = 'exhibitionist' and $clothingworntype ! 'swimwear':
+	if PCloStyle = 4:
+		$stat_msg += '<BR><font color= #FF00FF>You are wearing see-through panties, but you are dressed as a hooker, so that''s hardly surprising.</font>'
+	elseif PCloSkirt > 3:
+		if pcs_inhib > 50:
+			$stat_msg += '<BR><font color=#0064FF>You feel liberated as your ass, clearly visible through your panties, flashes from under your short skirt.</font>'
+		else
+			$stat_msg += '<BR><b><font color="red">Your face is flushed with shame, you are wearing panties so thin, they leave your ass clearly visible, as it flashes from under your short skirt.</font></b>'
+		end
+	end
 elseif PCloBimbo = 1 and cheatBimbo = 0:
 	$stat_msg += '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 elseif $clothingworntype = 'cheap' and clothingwornnumber = '414':

+ 8 - 4
locations/succubus.qsrc

@@ -19,10 +19,11 @@ if $ARGS[0] = 'init':
 		act 'Try to control your urges':
 			cla
 			'You try to contain <<$sucself1>>...'
-			gs 'willpower', 'misc'
+			gs 'willpower', 'misc', 'resist', 'easy'
 			will_cost = will_cost * succublvl
 			if will_cost <= pcs_willpwr:
-				gs 'willpower', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 				'And you''re successful, <<$sucself1>> returns to your core.'
 				act 'Continue': scpopt = 2 & gt $sclocrt, $scargrt
 			else
@@ -66,8 +67,11 @@ if $ARGS[0] = 'firsttime':
 		act 'Push it back down':
 			cla
 			'You try to contain <<$sucself1>>...'
-			if pcs_willpwr >= rand(20,40) + (40 * succublvl):
-				!!the willpower check values are based on a willpowermax of 200
+			gs 'willpower', 'misc', 'resist', 'easy'
+			will_cost = will_cost * succublvl
+			if will_cost <= pcs_willpwr:
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 				'And you''re successful, <<$sucself1>> returns to your core.'
 				act 'Continue': scpopt = 2 & gt $sclocrt, $scargrt
 			else

+ 1 - 1
locations/telefon.qsrc

@@ -396,7 +396,7 @@ if $ARGS[0] = 'SvetaCallsNPC':
 		if Call4Date["willAgree"]:
 			'<<$Call4Date["CallerName"]>>, "See you at the movie theater in an hour."'
 
-			act 'Go':gt gt 'telefon', 'NPCDate', Call4Date["ContactIndex"], 'movie'
+			act 'Go':gt 'telefon', 'NPCDate', Call4Date["ContactIndex"], 'movie'
 		else
 			gs 'telefon','telotkaz',$Call4Date["CallerName"]
 		end