Browse Source

[fixed] willpower

julzor 5 năm trước cách đây
mục cha
commit
6e18767b61

+ 31 - 31
locations/gschool_events.qsrc

@@ -256,7 +256,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		elseif PCloSkirt > 0 and will_cost > pcs_willpwr:
 		elseif PCloSkirt > 0 and will_cost > pcs_willpwr:
-			'<br>You don''t have enough willpower to bring yourself to life your skirt.'
+			act 'Lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		if rand (0,2) = 0:
 		if rand (0,2) = 0:
@@ -280,7 +280,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 					gs 'gschool_events', 'leave_break_events'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to slap the boy.'
+				act 'Slap the boy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 
 
 			gs 'willpower', 'misc', 'self', 'hard'
 			gs 'willpower', 'misc', 'self', 'hard'
@@ -298,7 +298,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 					gs 'gschool_events', 'leave_break_events'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to tease him.'
+				act 'Tease the boy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 		end
 		end
 	elseif break_rand = 2 and hot > 5 and PCloSkirt > 0:
 	elseif break_rand = 2 and hot > 5 and PCloSkirt > 0:
@@ -327,7 +327,7 @@ if $ARGS[0] = 'break_events':
 			if pcs_inhib < 50: inhib_exp += 2
 			if pcs_inhib < 50: inhib_exp += 2
 			gs 'willpower', 'exhib', 'self'
 			gs 'willpower', 'exhib', 'self'
 			if will_cost <= pcs_willpwr:
 			if will_cost <= pcs_willpwr:
-				act 'Own it':
+				act 'Own it (<<will_cost>> Willpower)':
 					cla
 					cla
 					if pcs_inhib < 60: inhib_exp += 4
 					if pcs_inhib < 60: inhib_exp += 4
 					gs 'willpower', 'pay', 'self'
 					gs 'willpower', 'pay', 'self'
@@ -338,7 +338,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 					gs 'gschool_events', 'leave_break_events'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to take of your skirt.'
+				act 'Own it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 		else
 		else
 			if pcs_inhib < 60: inhib_exp += 4
 			if pcs_inhib < 60: inhib_exp += 4
@@ -356,7 +356,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 					gs 'gschool_events', 'leave_break_events'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to flash your privat parts.'
+				act 'Bend down (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 		end
 		end
 	elseif break_rand =< 5 and pav_slut > 100 and gruptipe ! 4:
 	elseif break_rand =< 5 and pav_slut > 100 and gruptipe ! 4:
@@ -395,7 +395,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 					gs 'gschool_events', 'leave_break_events'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to refuse.'
+				act 'Threaten to scream (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 
 
 			act 'Enter the men''s restroom':
 			act 'Enter the men''s restroom':
@@ -452,7 +452,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to refuse.'
+			act 'Tell him to get lost (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		act 'Go to the men''s restroom with him':
 		act 'Go to the men''s restroom with him':
@@ -565,7 +565,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to slap him.'
+			act 'Slap him across the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		gs 'willpower', 'misc', 'self', 'hard'
 		gs 'willpower', 'misc', 'self', 'hard'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to kick him in the balls.'
+			act 'Kick him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		act 'Slap him playfully':
 		act 'Slap him playfully':
@@ -616,7 +616,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to playfully lift your skirt.'
+			act 'Playfully lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		gs 'willpower', 'exhib', 'self', 'hard'
 		gs 'willpower', 'exhib', 'self', 'hard'
@@ -644,7 +644,7 @@ if $ARGS[0] = 'break_events':
 				end
 				end
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to taunt him.'
+			act 'Taunt him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 	elseif break_rand = 12 and hotcat > 5 and PCloSkirt > 0:
 	elseif break_rand = 12 and hotcat > 5 and PCloSkirt > 0:
 		cla
 		cla
@@ -685,7 +685,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to slap him.'
+			act 'Slap him across the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		gs 'willpower', 'misc', 'self', 'hard'
 		gs 'willpower', 'misc', 'self', 'hard'
@@ -704,7 +704,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to kich him in the balls.'
+			act 'Kick him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		act 'Slap him playfully':
 		act 'Slap him playfully':
@@ -736,7 +736,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to playfully lift your skirt.'
+			act 'Playfully lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		gs 'willpower', 'exhib', 'self', 'hard'
 		gs 'willpower', 'exhib', 'self', 'hard'
@@ -764,7 +764,7 @@ if $ARGS[0] = 'break_events':
 				end
 				end
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to taunt him.'
+			act 'Taunt him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 	elseif break_rand = 13 and hotcat > 5 and PCloSkirt > 0:
 	elseif break_rand = 13 and hotcat > 5 and PCloSkirt > 0:
 		cla
 		cla
@@ -806,7 +806,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to slap him.'
+			act 'Slap him across the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		act 'Slap him playfully':
 		act 'Slap him playfully':
@@ -838,7 +838,7 @@ if $ARGS[0] = 'break_events':
 				gs 'gschool_events', 'leave_break_events'
 				gs 'gschool_events', 'leave_break_events'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to playfully lift your skirt.'
+			act 'Playfully lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		gs 'willpower', 'exhib', 'self', 'hard'
 		gs 'willpower', 'exhib', 'self', 'hard'
@@ -866,7 +866,7 @@ if $ARGS[0] = 'break_events':
 				end
 				end
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to taunt him.'
+			act 'Taunt him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 	elseif break_rand = 14:
 	elseif break_rand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
@@ -917,7 +917,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 					gs 'gschool_events', 'leave_break_events'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to tell him ''Not today''.'
+				act 'Not today (<<will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 			
 			
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'sex', 'resist', 'hard'
@@ -933,7 +933,7 @@ if $ARGS[0] = 'break_events':
 					gs 'gschool_events', 'leave_break_events'
 					gs 'gschool_events', 'leave_break_events'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to refuse.'
+				act 'Hell no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 
 
 			act 'Offer to suck him off':
 			act 'Offer to suck him off':
@@ -1129,7 +1129,7 @@ if $ARGS[0] = 'follow_petka':
 				act 'Take the homework': gt 'gschool_events', 'leave_break_events2'
 				act 'Take the homework': gt 'gschool_events', 'leave_break_events2'
 			end
 			end
 		elseif will_cost > pcs_willpwr and grupTipe = 1:
 		elseif will_cost > pcs_willpwr and grupTipe = 1:
-			'<br>You don''t have enough willpower to threaten his reputation.'
+			act 'Threaten his reputation (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 
 
 		gs 'willpower', 'misc', 'force', 'medium'
 		gs 'willpower', 'misc', 'force', 'medium'
@@ -1165,7 +1165,7 @@ if $ARGS[0] = 'follow_petka':
 				end
 				end
 			end
 			end
 		elseif will_cost > pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
 		elseif will_cost > pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
-			'<br>You don''t have enough willpower to give him a swirly.'
+			act 'Give him a swirly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 		
 		
 		gs 'willpower', 'sex', 'self'
 		gs 'willpower', 'sex', 'self'
@@ -1176,7 +1176,7 @@ if $ARGS[0] = 'follow_petka':
 				gt 'gschool_events', 'homework_sex_bribe'
 				gt 'gschool_events', 'homework_sex_bribe'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to seduce him.'
+			act 'Seduce him with sex (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 	elseif petka_homework = 2:
 	elseif petka_homework = 2:
 		'You follow Petka into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little eager, obviously hoping you want to repeat last time. "Do you need my homework again?" He asks you.'
 		'You follow Petka into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little eager, obviously hoping you want to repeat last time. "Do you need my homework again?" He asks you.'
@@ -1354,7 +1354,7 @@ if $ARGS[0] = 'afterschool_events':
 						act 'Leave': gt 'gschool_grounds', 'main'
 						act 'Leave': gt 'gschool_grounds', 'main'
 					end
 					end
 				else
 				else
-					'<br>You don''t have enough willpower to resist.'
+					act 'Refuse the drink (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				end
 
 
 				act 'Take a drink':
 				act 'Take a drink':
@@ -1379,7 +1379,7 @@ if $ARGS[0] = 'afterschool_events':
 							act 'Leave': gt 'gschool_grounds', 'main'
 							act 'Leave': gt 'gschool_grounds', 'main'
 						end
 						end
 					else
 					else
-						'<br>You don''t have enough willpower to resist.'
+						act 'Refuse another the drink (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					end
 
 
 					act 'Drink more':
 					act 'Drink more':
@@ -1607,7 +1607,7 @@ if $ARGS[0] = 'afterschool_events':
 				act 'Walk away': gt 'gschool_grounds', 'main'
 				act 'Walk away': gt 'gschool_grounds', 'main'
 			end
 			end
 		else
 		else
-			'<br>You don''t have enough willpower to resist.'
+			act 'Back off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		end
 		act 'Sure why not':
 		act 'Sure why not':
 			*clr & cla
 			*clr & cla
@@ -1683,7 +1683,7 @@ if $ARGS[0] = 'afterschool_events':
 					act 'Go to the men''s room with them':gt 'gschool_events', 'toilet_bj'
 					act 'Go to the men''s room with them':gt 'gschool_events', 'toilet_bj'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to resist.'
+				act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 			act 'Go to the men''s room with them': gt 'gschool_events', 'toilet_bj'
 			act 'Go to the men''s room with them': gt 'gschool_events', 'toilet_bj'
 		end
 		end
@@ -1864,7 +1864,7 @@ if $ARGS[0] = 'rand_scoolboy':
 					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to slap him.'
+				act 'Slap him hard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 		elseif npc_rel['A<<r>>'] > 50:
 		elseif npc_rel['A<<r>>'] > 50:
 			act 'Slap him playfully':
 			act 'Slap him playfully':
@@ -1889,7 +1889,7 @@ if $ARGS[0] = 'rand_scoolboy':
 					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 				end
 				end
 			else
 			else
-				'<br>You don''t have enough willpower to life your skirt.'
+				act 'Lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 		else
 		else
 			act 'Continue': gt 'gschool_events', 'leave_break_events2'
 			act 'Continue': gt 'gschool_events', 'leave_break_events2'
@@ -2106,7 +2106,7 @@ if $ARGS[0] = 'rand_gopnic':
 						act 'Go to the men''s room with them':gt 'gschool_events', 'toilet_bj'
 						act 'Go to the men''s room with them':gt 'gschool_events', 'toilet_bj'
 					end
 					end
 				else
 				else
-					'<br>You don''t have enough willpower to resist.'
+					act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				end
 				act 'Go to the men''s room with them': gt 'gschool_events', 'toilet_bj'
 				act 'Go to the men''s room with them': gt 'gschool_events', 'toilet_bj'
 			end
 			end

+ 3 - 2
locations/pavaptcourtev.qsrc

@@ -906,10 +906,11 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 						elseif grupTipe = 4 and will_cost > pcs_willpwr:
 						elseif grupTipe = 4 and will_cost > pcs_willpwr:
 							act 'Threaten Lera (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							act 'Threaten Lera (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 						end
-					else
-						act 'Refuse bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					end
+				else
+					act 'Refuse bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				end
+
 				
 				
 				act 'Make bet':
 				act 'Make bet':
 					*clr & cla
 					*clr & cla