Ver Fonte

[fixed] missing else for willpower checks

julzor há 5 anos atrás
pai
commit
56c73fdee0

+ 3 - 3
locations/gschool_break.qsrc

@@ -227,7 +227,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					end
 				end
 			else
-				'You don''t have enough willpower to refuse.'
+				'<br>You don''t have enough willpower to refuse.'
 			end
 			act 'Agree': gt 'gschool_break', 'lena_dom'
 		elseif grupTipe = 3 or grupTipe = 5:
@@ -1362,7 +1362,7 @@ if $ARGS[0] = 'naked_bathroom':
 			gs 'willpower', 'misc'
 			if will_cost >= pcs_willpwr:
 				act 'Tell her a lie (<<will_cost>> Willpower)':
-					gs 'willpower', 'force'
+					gs 'willpower', 'force', 'self'
 					*clr & cla
 					gs 'exhibitionism', 3
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/officenaked.jpg"></center>'
@@ -1402,7 +1402,7 @@ if $ARGS[0] = 'naked_bathroom':
 					end
 				end
 			else
-				'You don''t have enough willpower to bring yourself to tell her a lie.'
+				'<br>You don''t have enough willpower to bring yourself to tell her a lie.'
 			end
 		end
 	end

+ 13 - 3
locations/gschool_detention.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'wedgie':
 	if will_cost >= pcs_willpwr:
 		act 'Smack her (<<will_cost>> Willpower)':
 			*clr & cla
-			gs 'willpower', 'force'
+			gs 'willpower', 'force', 'self'
 			grupvalue[4] += 1
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/slap.jpg"></center>'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'sitting_events':
 		if will_cost >= pcs_willpwr:
 			act 'Yes (<<will_cost>> willpower)':
 				*clr & cla
-				gs 'willpower', 'force'
+				gs 'willpower', 'force', 'self'
 				pav_sex += 1
 				gs 'exhibitionism', 1
 				inhib_exp += rand(1,3)
@@ -248,6 +248,8 @@ if $ARGS[0] = 'sitting_events':
 				'You look around once more to make sure no one else is looking, then you wait for him to look back. When he does, you pull open your shirt and expose your tits to him. His eyes get huge in surprise, you can tell he is shocked by this. You start to giggle and quickly cover up, for the rest of the time you can''t help but smile. You catch him watching you for the rest of detention, while you mostly ignore him and play on your phone.'
 				act 'Go home': gt 'gschool_detention', 'end'
 			end
+		else
+			'<br>You don''t have enough willpower to do it.'
 		end
 	end
 end
@@ -446,7 +448,7 @@ if $ARGS[0] = 'Help Friends in need':
 			act 'Go home': gt 'gschool_detention', 'end'
 		end
 	else
-		'You don''t have enough willpower to say ''no''.'
+		'<br>You don''t have enough willpower to say ''no''.'
 	end
 	act 'Yes':
 		cla & *clr
@@ -543,6 +545,8 @@ if $ARGS[0] = 'strange':
 						'You return to your seat and start playing on your phone. About ten minutes later, your ''friend'' joins you as well and sits back down. He seems a bit confused, he alternate between giving you annoyed looks and lustful looks the whole time but the huge grin you have on your face stays there for the rest of detention, until the bell rings and it even last the whole walk back home.'
 						act 'Go home': gt 'gschool_detention', 'end'
 					end
+				else
+					'<br>You don''t have enough willpower to force him to keep going.'
 				end
 				act 'Suck his cock':
 					*clr & cla
@@ -705,6 +709,8 @@ if $ARGS[0] = 'company2':
 			'He smiles and nods. "Sure, works for me. So, did you hear about what happened in gym yesterday?" After that, the two of you talk the rest of detention about a variety of things. Marcus is polite and nice the whole time. Once detention is over, he walks you out of the school and bids you farewell. On your way home, you wonder if you should just say "yes" next time, or maybe see if you see him cutting class again...'
 			act 'Go home': gt 'gschool_detention', 'end'
 		end
+	else
+		'<br>You don''t have enough willpower to resist.'
 	end
 	act 'Agree':
 		*clr & cla
@@ -828,8 +834,12 @@ if $ARGS[0] = 'Ivanov':
 					'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.'
 			end
 		end
+	else
+		'<br>You don''t have enough willpower to resist.'
 	end
 	act 'Suck his cock': gt 'gschool_detention', 'Ivanov_suck'
 end

+ 6 - 2
locations/willpower.qsrc

@@ -13,9 +13,12 @@
 !!'drink', 'drugs', 'crime', 'exhib'
 !!Forcing Sveta to stay awake
 !!'sleep'
+!!If no other option fits
+!!'misc'
 !!The value returned as will_cost can be used to inform the player of cost and limit actions
 !!To apply the cost just call gs 'willpower', 'resist' or gs 'willpower', 'force'
 !!Force is for Sveta forcing someone else and will slowly increase the will stat, otherwise its the same as resist
+!!If sveta forces herself to do something you can also use gs 'willpower', 'force', 'self' instead of 'resist'. This option is only available to avoid some confusion if sveta isn''t resisting
 
 if $ARGS[0] = 'calc':
 	gs 'willpower', 'dnd'
@@ -300,9 +303,10 @@ if $ARGS[0] = 'dnd':
 	end
 end
 
-if $ARGS[0] = 'resist': pcs_willpwr -= will_cost
+if $ARGS[0] = 'resist' or ($ARGS[0] = 'force' and $ARGS[1] = 'self'): pcs_willpwr -= will_cost
 
-if $ARGS[0] = 'force':
+
+if $ARGS[0] = 'force' and $ARGS[1] ! 'self':
 	pcs_willpwr -= will_cost
 	will_counter += 1
 	if will_counter > 10: willpowermax += 1