[fixed] willpower seeding, eigth batch + made code in the shulga files more readable

locations/serpent.qsrc

@@ -15,22 +15,24 @@ if findneck = 1:
 	'"Who are you ?  Where are you?" you yell.  Looking for the owner of the strange sibilant voice.'
 	'"I am Zzathrezzz.  Lord of Ssserpentsss." as the voice continues from above you see a large snake emerge out of the shadows.  Outside the barn you hear Bandit start to loudly bark.  Zathrez hisses in anoyance.'
 	'"That dog isss a noicccenccce!"'
-	act 'You stand frozen as the snake''s head glides down towards you': gt $loc
-
-	cls
-	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/serpent/serpent1_0.jpg"></center>'
 	'"Now, do we deal?" the sibilant voice continues.'
-
-	act '"Maybe, but first tell me more about what you can teach me." you place your hands on your hips and pose defiantly.':
-		serpent_path = 1
-		gt 'serpent'
-	end	
-
-	act '"No, leave me alone you freaky snake." you scream and throw the box aside as you run out of the barn':
-		serpent_path = 0
-		gt 'Gaddvor'
+	
+	gs 'willpower', 'misc', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'No, leave me alone you freaky snake (<<will_cost>> Willpower)': gs 'willpower', 'misc', 'self', 'hard' & gs 'willpower', 'pay', 'self' & serpent_path = 0 & gt 'Gaddvor'
+	else
+		act 'No, leave me alone you freaky snake (<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', 'skill', 'self', 'magik_lvl'
+	if will_cost <= pcs_willpwr:
+		act 'Maybe, but first tell me more about what you can teach me (<<will_cost>> Willpower)': gs 'willpower', 'skill', 'self', 'magik_lvl' & gs 'willpower', 'pay', 'self' & serpent_path = 1 & gt 'serpent'
+	else
+		act 'Maybe, but first tell me more about what you can teach me (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	
+	act 'You stand frozen as the snake''s head glides down towards you': gt $loc
 end
 
 if serpent_path = 1:

locations/shulgabath.qsrc

@@ -18,10 +18,10 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	!Sonia opening event in the bathroom
 	if soniaPS >= 2:
-		if RAND(0,100) >= 90 and sh_sonya_sexev > 2 and sonya_bazar_count > 0 and ev_sonya_count > 0 and hour <= 23 and ((week < 6 and hour >= 14) or (week >= 6 and hour >= 10)):
+		if rand(0,100) >= 90 and sh_sonya_sexev > 2 and sonya_bazar_count > 0 and ev_sonya_count > 0 and hour <= 23 and ((week < 6 and hour >= 14) or (week >= 6 and hour >= 10)):
 			gt 'shulgabath', 'ev'
 			exit
-		elseif RAND(0,90) <= 5 and npc_rel['A112'] >= 20 and sexev_sonya_count > 0 and hour <= 23 and ((week < 6 and hour >= 14) or (week >= 6 and hour >= 10)):
+		elseif rand(0,90) <= 5 and npc_rel['A112'] >= 20 and sexev_sonya_count > 0 and hour <= 23 and ((week < 6 and hour >= 14) or (week >= 6 and hour >= 10)):
 			gt 'shulgabath', 'sexev'
 			exit
 		end
@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna.jpg"></center>'
 	*nl
-	'Uncle Sergey''s bathroom is small and very unpretentious. Nevertheless, it has everything a bathroom needs. There is a <a href="exec:gt ''mirror'',''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower and bath tub.'
+	'Uncle Sergey''s bathroom is small and very unpretentious. Nevertheless, it has everything a bathroom needs. There is a <a href="exec: gt ''mirror'',''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower and bath tub.'
 	*nl
 
 	act 'Return to the hallway': gt'shulgahall'
@@ -41,7 +41,7 @@ end
 !Bathroom, Sonia choice opening event:
 if $ARGS[0] = 'sexev':
 	menu_off = 1
-	if RAND(0,100) < 50:
+	if rand(0,1) = 0:
 		gt 'shulgabath', 'sexev1'
 	else
 		gt 'shulgabath', 'sexev2'
@@ -125,7 +125,7 @@ end
 
 if $ARGS[0] = 'ev':
 	menu_off = 1
-	if RAND(0,100) <= 80:
+	if rand(0,100) <= 80:
 		gt 'shulgabath', 'ev1'
 	else
 		gt 'shulgabath', 'ev2'
@@ -143,11 +143,21 @@ if $ARGS[0] = 'ev1':
 	'When you go to the bathroom, you find Sonia already in there. "Hi!" she says cheerfully, before returning to touching up her make-up.'
 
 	act 'Chat with Sonia': gt 'shulgabath', 'bazar'
-	if sh_sonya_bazar > 5:
-		act 'Suggest you take a bath together': gt 'shulgabath', 'lesb'
+	if sh_sonya_bazar > 5 and mesec <= 0:
+		gs 'willpower', 'cuni', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Suggest you take a bath together (<<will_cost>> Willpower)': gs 'willpower', 'cuni', 'self', 'easy' & gs 'willpower', 'pay', 'self' & gt 'shulgabath', 'lesb'
+		else
+			act 'Suggest you take a bath together (<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 sh_sonya_bazar >= 25 and npc_rel['A112'] >= 50:
-		act 'Suggest you and Sonia fuck Sergey together': gt 'shulgabath', 'serg_sex'
+	if sh_sonya_bazar >= 25 and npc_rel['A112'] >= 50 and pcs_vag >= 1:
+		gs 'willpower', 'group', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Suggest you and Sonia fuck Sergey together (<<will_cost>> Willpower)': gs 'willpower', 'group', 'self' & gs 'willpower', 'pay', 'self' & gt 'shulgabath', 'serg_sex'
+		else
+			act 'Suggest you and Sonia fuck Sergey together (<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 'Return to the hallway': gt'shulgahall'
@@ -181,7 +191,7 @@ if $ARGS[0] = 'bazar':
 	*nl
 	'Ever since Sonia inadvertedly got way too drunk and gave five guys including Vitek and his friends a simultaneous blowjob near the disco, her reputation in Pavlovsk has been in shambles. The girls in her class all give her the silent treatment, pretending she does not exist. Meanwhile the guys all treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to say no.'
 
-	sonya_textb_vanna = RAND(1,7)
+	sonya_textb_vanna = rand(1,7)
 	if sonya_textb_vanna = 1:$sonya_textb_vanna = 'You spend some time chatting about everyday things with Sonia.'
 	if sonya_textb_vanna = 2 and SchoolAtestat = 0:$sonya_textb_vanna	= 'When you ask Sonia how she''s doing in school, she laughs and says: "It''s very easy to get good grades at our school. All you have to do is get the teachers to like you. And as you may know, they all like me..."'
 	if sonya_textb_vanna = 2 and SchoolAtestat = 1:$sonya_textb_vanna	= 'When you ask Sonia about the kind of work she does since school ended, she shrugs: "It''s tough to get a decent job nowadays. I''m lucky I have some nice guys like Sergey helping me out with my bills, otherwise I wouldn''t know how to make ends meet!"'
@@ -199,11 +209,21 @@ if $ARGS[0] = 'bazar':
 		act 'Chat some more': gt 'shulgabath', 'bazar'
 	end
 
-	if sh_sonya_bazar > 5 and mesec <=0:
-		act 'Suggest you take a bath together': gt 'shulgabath', 'lesb'
+	if sh_sonya_bazar > 5 and mesec <= 0:
+		gs 'willpower', 'cuni', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Suggest you take a bath together (<<will_cost>> Willpower)': gs 'willpower', 'cuni', 'self', 'easy' & gs 'willpower', 'pay', 'self' & gt 'shulgabath', 'lesb'
+		else
+			act 'Suggest you take a bath together (<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 sh_sonya_bazar >= 25 and npc_rel['A112'] >= 50 and sonya_bazar_count >= 1 and pcs_vag >=1:
-		act 'Suggest you and Sonia fuck Sergey together': gt 'shulgabath', 'serg_sex'
+	if sh_sonya_bazar >= 25 and npc_rel['A112'] >= 50 and sonya_bazar_count >= 1 and pcs_vag >= 1:
+		gs 'willpower', 'group', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Suggest you and Sonia fuck Sergey together (<<will_cost>> Willpower)': gs 'willpower', 'group', 'self' & gs 'willpower', 'pay', 'self' & gt 'shulgabath', 'serg_sex'
+		else
+			act 'Suggest you and Sonia fuck Sergey together (<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 'Return to the hallway': gt'shulgahall'
@@ -219,7 +239,7 @@ if $ARGS[0] = 'lesb':
 	pcs_makeup = 1
 	noShampoo = 1
 	dynamic $showerdin
-	if frost > 0:frost = 0
+	if frost > 0: frost = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/ev1_1.jpg"></center>'
 	*nl
@@ -231,7 +251,6 @@ if $ARGS[0] = 'lesb':
 
 	act 'Continue':
 		*clr & cla
-		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/vanna/ev1_2'+rand(1,2)+'.jpg"></center>'
 		*nl
@@ -244,7 +263,6 @@ if $ARGS[0] = 'lesb':
 			'Just when you were about to say something, Sonia moves closer to you and kisses you full on your mouth. You freeze for a second, and then think to yourself... why the hell not?'
 			'You kiss Sonia back eagerly, playing with her tongue as she thrusts it into your mouth.'
 			gs 'arousal', 'kiss', 10, 'lesbian'
-			minut -= 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -252,15 +270,10 @@ if $ARGS[0] = 'lesb':
 				*nl
 				'Before you realize what''s going on, Sonia signals for you to lift your hips above the water, which you do immediately.'
 				'Sonia moves her head between your legs and licks your cunt eagerly, teasing your clitoris with her tongue. She teases you with one hand, thrusting two fingers inside your snatch while she licks you skilfully. The way she looks into your eyes the whole time makes it a very intimate experience... she''s really good at this!'
-				if pcs_horny >=70:
-					pcs_mood += 35
-					pcs_willpwr +=20
-					$orgasm_or = 'custom'
-					$orgasm_txt = 'Sonia''s constant teasing pushes you over the edge, and you orgasm loudly when she licks your clit again.'
-					gs 'arousal', 'cuni', 5, 'lesbian'
-					gs 'arousal', 'vaginal_finger', 5, 'lesbian'
-					minut -= 5
-				end
+				$orgasm_or = 'custom'
+				$orgasm_txt = 'Sonia''s constant teasing pushes you over the edge, and you orgasm loudly when she licks your clit again.'
+				gs 'arousal', 'cuni', 5, 'lesbian'
+				gs 'arousal', 'vaginal_finger', -5, 'lesbian'
 				'Sonia grins at you and asks playfully: "Did you like my tongue on your pussy, <<$pcs_nickname>>?"'
 				'"Absolutely!" you nod. "Come on, let me do the same for you! I want to taste you too!"'
 				'"I can''t right now, my mother is waiting for me at home", Sonia says wistfully. "Maybe next time?"'
@@ -303,13 +316,12 @@ if $ARGS[0] = 'serg_sex':
 		'"Enjoying yourself over there, Sonia?" you teasingly ask between moans. Sonia grins mischievously, and punishes you by grabbing a firmer hold on your hair and roughly grinding her pussy against your mouth.'
 		'Then Sergey decides it''s Sonia''s turn, and he makes her lie down on her back.'
 		gs 'arousal', 'vaginal', 5, 'sub', 'group'
-		gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub', 'group'
-		minut -= 5
+		gs 'arousal', 'cuni_give', -5, 'lesbian', 'sub', 'group'
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
-			minut += 5
 			pcs_horny += 15
+			if pcs_inhib < 30:inhib_exp += rand(1,3)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna/gr/ev1_3_'+rand(1,4)+'.jpg"></center>'
 			*nl
@@ -319,15 +331,10 @@ if $ARGS[0] = 'serg_sex':
 			'Sonia is too enthralled by the large dick fucking her snatch, and mostly just moans and groans into your pussy when you grind your groin against her face.'
 			'Sergey is railing her quite roughly now, and since Sonia is not doing a good job of pleasing you, you encourage him: "Fuck that pussy, Sergey! No need to hold back on this whore''s slit, she can take it! Pleasing you is what she''s made for!"'
 			'Suddenly Sonia becomes far more eager to please you, and you feel her tongue actively rubbing against your clit. You smirk when you realize why; Sonia must understand that you''re the reason why Sergey is fucking her so roughly, and is trying to please you so you''ll choose her side again.'
-			if pcs_horny >=70:
-				if pcs_inhib < 30:inhib_exp += rand(1,3)
-				pcs_mood += 35
-				pcs_willpwr +=20
-				$orgasm_or = 'custom'
-				$orgasm_txt = 'She does such a good job, she brings you to an orgasm before you can stop her. You loudly groan and your body trembles over hers, causing Sergey to give you some confused looks.'
-				gs 'arousal', 'cuni', 5, 'lesbian', 'dom', 'group'
-				gs 'stat'
-			end
+			$orgasm_or = 'custom'
+			$orgasm_txt = 'She does such a good job, she brings you to an orgasm before you can stop her. You loudly groan and your body trembles over hers, causing Sergey to give you some confused looks.'
+			gs 'arousal', 'cuni', 10, 'lesbian', 'dom', 'group'
+			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				minut += 5

locations/shulgabed.qsrc

@@ -17,15 +17,15 @@ if $ARGS[0] = '' or $ARGS[0] = 'wakeup':
 	*nl
 	'Sergey''s bedroom looks just like any other bedroom. There''s a large bed, a television with a VCR connected to it, and a large cabinet to store clothes in. A random amount of junk is deposited on one of the nightstands.'
 
-	if hour < 7 or hour >= 23: 'When you come in you see that<<$serg_obr>> <a href="exec:gt ''Serge_Shulgin'',''sleep''">Sergey</a> is currently on his bed, sound asleep.'
+	if hour < 7 or hour >= 23: 'When you come in you see that<<$serg_obr>> <a href="exec: gt ''Serge_Shulgin'',''sleep''">Sergey</a> is currently on his bed, sound asleep.'
 
-	if week < 6 and ((hour >= 16 and hour < 18) or (hour >= 21 and hour < 23)): 'When you come in you see that<<$serg_obr>> <a href="exec:gt ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
-	if week >= 6 and ((hour >= 7 and hour < 18) or (hour >= 21 and hour < 23)): 'When you come in you see that<<$serg_obr>> <a href="exec:gt ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
+	if week < 6 and ((hour >= 16 and hour < 18) or (hour >= 21 and hour < 23)): 'When you come in you see that<<$serg_obr>> <a href="exec: gt ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
+	if week >= 6 and ((hour >= 7 and hour < 18) or (hour >= 21 and hour < 23)): 'When you come in you see that<<$serg_obr>> <a href="exec: gt ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
 
 	if week < 6 and hour >= 7 and hour < 16: gs 'shulgabed', 'sleep'
 
 	if RAND(0,100) <= 5 and soniaPS >= 1 and sexev_sonya_count > 0 and hour >= 15 and hour <= 23 and $ARGS[0] = '': gt 'shulgabed', 'sonya'
-	act 'Return to the hallway': gt'shulgahall'
+	act 'Return to the hallway': gt 'shulgahall'
 end
 
 if $ARGS[0] = 'sonya':
@@ -42,37 +42,43 @@ if $ARGS[0] = 'sonya':
 	gs 'arousal', 'voyeur_sex', 5
 	gs 'gopsex', 'masturb_gg'
 	gs 'stat'
-	act 'Keep watching': 
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/sonya/ev1_2_'+rand(1,3)+'.jpg"></center>'
-		'Sergey groans: "Roll over so I can look you in the eye while I''m fucking you, slut."'
-		'Sonia immediately obeys him, turning around and spreading her legs wide to receive his cock again. Sergey wastes no time and immediately slams his cock back in.'
-		'You softly bite your lower lip, watching Sonia get railed by him. She really seems to enjoy it. He''s rough with her, sometimes even uncomfortably so, but you don''t think you''ve ever seen her this happy before. What if...'
-		'Sonia interrupts your train of thought by moaning louder and louder, clearly in a lot of pleasure. She even startles Sergey a bit, who quickly leans forward and kisses her on her mouth dominantly to shut her up.'
-		
-		gs 'arousal', 'voyeur_sex', 5
-		gs 'gopsex', 'masturb_gg'
-		gs 'stat'
-		act 'Keep watching': 
+	gs 'willpower', 'voyeur', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Keep watching (<<will_cost>> Willpower)':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/sonya/ev1_3_'+rand(1,2)+'.jpg"></center>'
-			'When he pulls away from her and gets down on the bed so she can ride him, she immediately begins to moan loudly again. You can tell that Sergey is starting to get annoyed by this, and he puts his hand over her mouth.'
-			'"Keep it down! Do you want the whole building to come see what you and I are up to, here?" he hisses at her.'
-			'Sonia clamps her lips tightly together and shakes her head, still emitting some muffled moans.'
-			'"I didn''t think so", he rumbles. "I''ll tell you what, if you promise to keep quiet I will make it worth your while..."'
-			'He slaps her perfect butt cheek quite hard, leaving a bright red spot on your horny classmate''s buttock. Her body begins to tremble almost immediately, and Sonia''s really struggling to hold in her moans. Wow... is she orgasming from getting spanked like that!?'
-			'Sergey decides he''s toyed with Sonia long enough and fucks her intensely, while she''s having her orgasm. "That''s it, baby. Milk my load out of me. Maybe uncle Sergey feel good", he groans.'
-			'Seconds later you can tell he''s shooting his load deep inside Sonia''s cunt. He embraces her tightly while the two of them lie on the bad, panting and gasping for air. That was intense...'	
+			gs 'willpower', 'pay', 'self'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/sonya/ev1_2_'+rand(1,3)+'.jpg"></center>'
+			'Sergey groans: "Roll over so I can look you in the eye while I''m fucking you, slut."'
+			'Sonia immediately obeys him, turning around and spreading her legs wide to receive his cock again. Sergey wastes no time and immediately slams his cock back in.'
+			'You softly bite your lower lip, watching Sonia get railed by him. She really seems to enjoy it. He''s rough with her, sometimes even uncomfortably so, but you don''t think you''ve ever seen her this happy before. What if...'
+			'Sonia interrupts your train of thought by moaning louder and louder, clearly in a lot of pleasure. She even startles Sergey a bit, who quickly leans forward and kisses her on her mouth dominantly to shut her up.'
 			
 			gs 'arousal', 'voyeur_sex', 5
-			gs 'arousal', 'end'
-			gs 'stat'
 			gs 'gopsex', 'masturb_gg'
-			act 'Leave them alone': gt'shulgahall'
+			gs 'stat'
+			act 'Keep watching': 
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/sonya/ev1_3_'+rand(1,2)+'.jpg"></center>'
+				'When he pulls away from her and gets down on the bed so she can ride him, she immediately begins to moan loudly again. You can tell that Sergey is starting to get annoyed by this, and he puts his hand over her mouth.'
+				'"Keep it down! Do you want the whole building to come see what you and I are up to, here?" he hisses at her.'
+				'Sonia clamps her lips tightly together and shakes her head, still emitting some muffled moans.'
+				'"I didn''t think so", he rumbles. "I''ll tell you what, if you promise to keep quiet I will make it worth your while..."'
+				'He slaps her perfect butt cheek quite hard, leaving a bright red spot on your horny classmate''s buttock. Her body begins to tremble almost immediately, and Sonia''s really struggling to hold in her moans. Wow... is she orgasming from getting spanked like that!?'
+				'Sergey decides he''s toyed with Sonia long enough and fucks her intensely, while she''s having her orgasm. "That''s it, baby. Milk my load out of me. Maybe uncle Sergey feel good", he groans.'
+				'Seconds later you can tell he''s shooting his load deep inside Sonia''s cunt. He embraces her tightly while the two of them lie on the bad, panting and gasping for air. That was intense...'	
+				
+				gs 'arousal', 'voyeur_sex', 5
+				gs 'arousal', 'end'
+				gs 'stat'
+				gs 'gopsex', 'masturb_gg'
+				act 'Leave them alone': gt 'shulgahall'
+			end
+			act 'Leave them alone': gt 'shulgahall'
 		end
-		act 'Leave them alone': gt'shulgahall'
+	else
+		act 'Keep watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Leave them alone': gt'shulgahall'
+	act 'Leave them alone': gt 'shulgahall'
 end
 
 !sleep when the bed is empty