Merge remote-tracking branch 'Deroc/master'

locations/Voltrener.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 		'The coach hates you.'
 		if volleysostav = 1:
 			volleysostav = 0
-			'Menacingly he says, "<<$pcs_lastname>>, I''m sick of you attitude. You''re off the team!"'
+			'Menacingly he says, "<<$pcs_lastname>>, I''m sick of your attitude. You''re off the team!"'
 			act 'Leave':gt 'gdksport', 'start'
 		end
 	elseif npc_rel['A69'] < 20:
@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 		'You are in a sexual relationship with Coach.'
 	else
 		if trenerlust >= 80:
-			'Coach can''t take his eyes of you, and he keeps making sexual references in your presence.'
+			'Coach can''t take his eyes of you and he keeps making sexual references in your presence.'
 		elseif trenerlust >= 60:
 			'Coach sometimes makes lewd comments around you and you often catch him ogling your body.'
 		elseif trenerlust >= 40:
@@ -56,35 +56,48 @@ if $ARGS[0] = 'Lariska':
 	if lariskaTrenerTalk = 1:
 		'You and Lariska tried to persuade the coach to take Lariska, but he refused to consider your arguments.'
 	elseif lariskaTrenerTalk = 2:
-		if pcs_dom >= 10:
-			'You managed to convince the coach to let Lariska join the team.'
-			LariskaProfi = 1
+		gs 'willpower', 'misc', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Convince coach to let Lariska play (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'force'
+				gs'stat'
+				'You managed to convince the coach to let Lariska join the team.'
+				gs 'Voltrener' ,'LariskaProfi'
+				act 'Leave':gt 'gdksport', 'start'
+			end
 		else
-			'You and Lariska tried to persuade the coach to take Lariska, but he refused.'
+			act 'Convince coach to let Lariska play (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You and Lariska tried to persuade the coach to take Lariska, but he refused.'
 		end
 	elseif lariskaTrenerTalk = 3:
-		if pcs_dom >= 20:
-			'You take an agressive approach and, although he doesn''t like it, you managed to convince the coach to let you both play.'
-			volleysostav = 1
-			if npc_rel['A69'] > 30:npc_rel['A69'] = 30
-			LariskaProfi = 1
+		gs 'willpower', 'misc', 'force', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Convince coach to let both of you join the team (<<will_cost>> Willpower)': 
+				gs 'willpower', 'pay', 'force'
+				gs 'stat'
+				volleysostav = 1
+				'You take an agressive approach and, although he doesn''t like it, you managed to convince the coach to let you both play.'
+				if npc_rel['A69'] > 30:npc_rel['A69'] = 30
+				gs 'Voltrener' ,'LariskaProfi'
+				act 'Leave':gt 'gdksport', 'start'
+			end
 		else
-			'You and Lariska tried to persuade the coach to give you both a place on the team, but he threw all of your arguments back in your faces.'
+			act 'Convince coach to let both of you join the team (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You and Lariska tried to persuade the coach to give you both a place on the team, but he threw all of your arguments back in your faces.'
 		end
 	elseif lariskaTrenerTalk = 4:
-		if npc_rel['A69'] >= 60:
-			'You managed to convince the coach to let Lariska join the team.'
-			LariskaProfi = 1
+		gs 'willpower', 'misc', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Convince coach to let Lariska play (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'force'
+				gs 'stat'
+				'You managed to convince the coach to let Lariska join the team.'
+				gs 'Voltrener' ,'LariskaProfi'
+				act 'Leave':gt 'gdksport', 'start'
+			end
 		else
-			'You and Lariska tried to persuade the coach to take Lariska, but he refused.'
+			act 'Convince coach to let Lariska play (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You tried to persuade the coach to take Lariska, but he refused.'
 		end
 	end
 
-	if LariskaProfi = 1:
-		$npc_notes['A13'] = 'Lariska is an athletic girl, but she is very dependent on other people''s opinions. Lariska has changed a lot; she has a sparkle in her eyes, and is almost always in a good mood. After joining the team, she quickly got into playing and is now one of the best players.'
-		'When you came out of the coach''s office, Lariska hugged you and said,: "Thank you, <<$pcs_nickname>>!"'
-		npc_rel['A13'] += 20
-	end
 	minut += 10
 	gs 'stat'
 
@@ -92,6 +105,13 @@ if $ARGS[0] = 'Lariska':
 	act 'Leave':gt 'gdksport', 'start'
 end
 
+if $ARGS[0] = 'LariskaProfi':
+	LariskaProfi = 1
+	$npc_notes['A13'] = 'Lariska is an athletic girl, but she is very dependent on other people''s opinions. Lariska has changed a lot; she has a sparkle in her eyes, and is almost always in a good mood. After joining the team, she quickly got into playing and is now one of the best players.'
+	'When you came out of the coach''s office, Lariska hugs you and says,: "Thank you, <<$pcs_nickname>>!"'
+	npc_rel['A13'] += 20
+end
+
 if $ARGS[0] = 'talk':
 	*clr & cla
 	gs 'stat'
@@ -138,53 +158,24 @@ if $ARGS[0] = 'talk':
 							'"Okay, welcome to the team <<$pcs_lastname>>. Remember, tournament matches are on Saturdays. Don''t forget to show up!"'
 							act 'Leave':gt 'gdksport', 'start'
 						end
-					else
-						'You ask the coach about joining the team, the coach thinks for a minute. "I have a spot for a substitute, but I do not know if you have what it takes."'
-						act 'Persuade him':
-							*clr & cla
-							gs 'stat'
-
-							if npc_rel['A69'] >= 60:
-								minut += rand(20,30)
-								if pcs_dom >= 30:
-									volleysostav = 1
-									'You appeal to the coach and ask him to at least give you a chance to prove yourself. Since he likes you, he decides to give you a break. "Okay, <<$pcs_nickname>>, I do have an opening for a sub. You''re on the team as a substitute player.'
-									act 'Leave':gt 'gdksport', 'start'
-								else
-									'You try to prove the coach that he should let you on the team, but you are not forceful enough and the coach countered all your arguments, denying you a place on the team.'
-									act 'Leave':gt 'gdksport', 'start'
-								end
-							end
-							
-							if rand(1,100) < pcs_dom: 
-								volleysostav = 1
-								if npc_rel['A69'] > 20:npc_rel['A69'] -= 20
-								'You try to prove the coach that he should include in the team, the coach tries to protest, and you get into an argument. Eventually you shout him down and he gives up. "Okay <<$pcs_lastname>>, I''ll put you in the team, but you''re on the bench and any more stunts like this and you''re out."'
-								act 'Leave':gt 'gdksport', 'start'
-							else 
-								pcs_dom -= 1
-								npc_rel['A69'] -= rand(1,5)
-								'You try to force the coach to put you on the team and you end up screaming at him. He just glares at you until you run out of steam then simply points to the door and says, "Out."' 
-								'Your cheeks are burning with embarrassment as you leave the office wondering what you were thinking by saying that if brains were dynamite he couldn''t blow his nose.' 
-							end
-							act 'Leave':gt 'gdksport', 'start'
-						end
 					end
-				else
+				elseif pav_slut > 75
 					'You ask the coach about joining the team. The coach thinks for a minute, "Hey <<$pcs_lastname>>, I hear loads of rumours about you. Such as you being a <<$gnikname>>. Is this true?"'
+					act 'Leave':gt 'gdksport', 'start'
 					act 'It''s all lies':
 						*clr & cla
+						gs 'willpower', 'misc', 'self', 'hard'
 						gs 'stat'
-
-						if pcs_dom > 0:
-							'You convince the coach that it''s all rumors and lies and dismiss them as envy. You speak quite convincingly and coach seems to believe you.'
-							act 'Persuade him to let you join the team':
+						act 'Leave': gt 'gdksport', 'start'						
+						if will_cost <= pcs_willpwr:
+							act 'Persuade him to let you join the team (<<will_cost>> Willpower)':
 								*clr & cla
+								gs 'willpower', 'pay', 'self'
 								gs 'stat'
-								if pcs_dom >= 10:
 									!!if volleysostav > 0:npc_rel['A69'] -= 1
-									volleysostav = 1
-									if npc_rel['A69'] > 20:npc_rel['A69'] = 20
+								volleysostav = 1
+								if npc_rel['A69'] > 20:
+									npc_rel['A69'] = 20
 									'You try to prove to the coach that he should put you on the team, the coach tries to protest, and you get into an argument. Eventually you shout him down and he gives up. "Fine <<$pcs_lastname>>, I''ll put you in the team, but you''re on the bench and any more stunts like this and you''re out."'
 								else
 									'You try to prove to the coach that he should put you on the team, but you are not forceful enough and the coach countered all your arguments, denying you a place on the team.'
@@ -192,24 +183,35 @@ if $ARGS[0] = 'talk':
 								act 'Leave':gt 'gdksport', 'start'
 							end
 						else
-							'You try to convince the coach that it''s all rumors and lies and dismiss them as envy. You are not very convincing and coach does not believe you. "<<$pcs_lastname>>, stop lying, do you take me for a fool?"'
-							act 'Okay, it''s true, I am a <<$gnikname>>':
-								*clr & cla
-								gs 'stat'
-								gt'Voltrener', 'gorslut'
-							end
+							act 'Persuade him to let you join the team (<font color="red"><will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 						end
-
-						act 'Leave':gt 'gdksport', 'start'
 					end
-					act 'It''s true, I''m a <<$gnikname>>':
+					act 'Okay, it''s true, I am a <<$gnikname>>':
 						*clr & cla
 						gs 'stat'
 						gt'Voltrener', 'gorslut'
 					end
-				end
+				else
+					'You ask the coach about joining the team, the coach thinks for a minute. "I have a spot for a substitute, but I do not know if you have what it takes."'
+					act 'Leave': gt 'gdksport', 'start'					
+					gs 'willpower', 'misc', 'self'
+					if will_cost <= pcs_willpwer:
+						act 'Persuade him (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
 
-				act 'Leave':gt 'gdksport', 'start'
+							if npc_rel['A69'] >= 60:
+								minut += rand(20,30)
+								volleysostav = 1
+								'You appeal to the coach and ask him to at least give you a chance to prove yourself. Since he likes you, he decides to give you a break. "Okay, <<$pcs_nickname>>, I do have an opening for a sub. You''re on the team as a substitute player.'
+								act 'Leave':gt 'gdksport', 'start'
+							end
+						end	
+					else
+						act 'Persuade him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red"> You try to prove the coach that he should let you on the team, but you are don''t have enough willpower and the coach countered all your arguments, denying you a place on the team.'
+					end
+				end
 			end
 
 			act 'Leave':gt 'gdksport', 'start'