[fixed] updated willpower checks in gschool_lessonsev3

locations/gschool_lessonsev2.qsrc

@@ -470,7 +470,7 @@ if $ARGS[0] = 'math':
 				act 'Call him out (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'misc', 'self', 'medium'
-					gs 'willpower', 'force', 'self'
+					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.'

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'
@@ -861,11 +866,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 +882,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 +953,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 +969,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 +1065,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 +1079,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 +1180,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 +1196,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 +1284,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 +1298,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'