Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/BDsex.qsrc

@@ -79,20 +79,33 @@ if $ARGS[0] = 'start':
 			'<<$boydesc>> grabs the back of your head and pulls you to face his penis.'
 
 			act 'Take by mouth':gt 'BDsex', 'minet'
-				if pcs_dom > 0:
-					act 'Lie on your back and spread your legs ':gt 'BDsex', 'sex'
-					act 'Stand on all fours':gt 'BDsex', 'sex2'
-				end
-			elseif brand >= 90:
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
+				act 'Stand on all fours (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
+			else
+				act 'Lie on your back and spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Stand on all fours (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		elseif brand >= 90:
 
 			'<<$boydesc>> tells you that he wants to take you in the ass.'
 
 			act 'Do anal':gt 'BDsex', 'anal2'
 
-			if pcs_dom > 0:
-				act 'I do not want to! Lie on your back and spread your legs instead ':gt 'BDsex', 'sex'
-				act 'Tell him that you''ll go into a doggystyle position, but that your ass is a no-go':gt 'BDsex', 'sex2'
-				act 'Take by mouth':gt 'BDsex', 'minet'
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
+				act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
+			else
+				act '"I do not want to!" Lie on your back and spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act '"I''ll do it doggy style, but not in the ass!" (<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', 'bj', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Take him into your mouth (<<will_cost>> Willpower)': gs 'willpower', 'bj', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'minet'
+			else
+				act 'Take him into your mouth (<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
@@ -322,10 +335,19 @@ if $ARGS[0] = 'hj':
 
 				act 'Anal':gt 'BDsex', 'anal2'
 
-				if pcs_dom > 5:
-					act '"I do not want to!" Lie on your back and spread your legs ':gt 'BDsex', 'sex'
-					act '"I''ll do it doggy style, but not in the ass!"':gt 'BDsex', 'sex2'
-					act 'Take by mouth':gt 'BDsex', 'minet'
+				gs 'willpower', 'sex', 'resist'
+				if will_cost <= pcs_willpwr:
+					act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
+					act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
+				else
+					act '"I do not want to!" Lie on your back and spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act '"I''ll do it doggy style, but not in the ass!" (<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', 'bj', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Take him into your mouth (<<will_cost>> Willpower)': gs 'willpower', 'bj', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'minet'
+				else
+					act 'Take him into your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			elseif brand >= 80:
 				'<<$boydesc>> forces your face down on his member.'
@@ -403,9 +425,13 @@ if $ARGS[0] = 'minet':
 
 				act 'Anal':gt 'BDsex', 'anal2'
 
-				if pcs_dom > 0:
-					act '"I do not want to!" Lie on your back and spread your legs ':gt 'BDsex', 'sex'
-					act '"I''ll do it doggy style, but not in the ass!"':gt 'BDsex', 'sex2'
+				gs 'willpower', 'sex', 'resist'
+				if will_cost <= pcs_willpwr:
+					act '"I do not want to!" Lie on your back and spread your legs (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex'
+					act '"I''ll do it doggy style, but not in the ass!" (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'resist' & gs 'willpower', 'pay', 'resist' & gt 'BDsex', 'sex2'
+				else
+					act '"I do not want to!" Lie on your back and spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act '"I''ll do it doggy style, but not in the ass!" (<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
@@ -775,7 +801,7 @@ if $ARGS[0] = 'autobj':
 		gs 'stat'
 	end
 
-	pcs_horny += pcs_throat + SUB - pcs_dom
+	pcs_horny += pcs_throat + 10 - (willpowermax / 10)
 	'His hard and hot cock slides into your wet mouth, filling it completely. Your lips are locked tightly around his dick in a lovers embrace.'
 
 	if pcs_horny >= 100:

locations/albinaEv.qsrc

@@ -59,10 +59,12 @@ if albinaCar = 0:
 					'"I''ve brought you an inobedient girl who knows too much about my dancing business."'
 					'Grinning, the tall one says "I see.", as the short one starts walking slowly towards you.'
 					'A chill runs up your spine as you realize you''ve been tricked. You need to get out of here right now!'
-
-					if pcs_dom > 0:
-						act 'Jump behind the wheel':
+					
+					gs 'willpower', 'misc', 'self', 'hard'
+					if will_cost <= pcs_willpwr:
+						act 'Jump behind the wheel (<<will_cost>> Willpower)':
 							*clr & cla
+							gs 'willpower', 'pay', 'self'
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
@@ -103,6 +105,8 @@ if albinaCar = 0:
 								dynamic $din_albina_get_over_car
 							end
 						end
+					else
+						act 'Jump behind the wheel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 
 					act 'Get out of the car':

locations/annafrends.qsrc

@@ -258,11 +258,13 @@ if $ARGS[0] = 'scene1':
 			*nl
 			'Already pretty tipsy, Rex approaches you - "<<$pcs_nickname>>, let me refill your glass" - but he, seemingly accidentally, spills some on your foot. - "Oh, <<$pcs_nickname>>, forgive me! Here, I''ll clean that up."'
 			'Rex begins wiping off your legs with his shirt sleeve.'
-			if pcs_dom > 5:
-				act 'Step back':
+			gs 'willpower', 'misc', 'self', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Step back (<<will_cost>> Willpower)':
 					*clr & cla
+					gs 'willpower', 'pay', 'self'
 					minut += 5
-					pcs_dom += 1
+					!pcs_dom += 1
 					rex -= 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/community/rexnet.jpg"></center>'
@@ -270,6 +272,8 @@ if $ARGS[0] = 'scene1':
 					'"No problem, I can manage that."'
 					act 'Continue to drink beer':gt 'annafrends', 'scene2'
 				end
+			else
+				act 'Step back (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Wait':
 				*clr & cla

locations/artemEv.qsrc

@@ -113,86 +113,105 @@ if $ARGS[0] = 'learn':
 				'After you finish your homework, Artem has a serious look on his face when he says: "<<$pcs_nickname>>, with how much I''ve been helping you... We both know what you are willing to do. I think it''s only fair you give me a little something in return."'
 				act 'Suck him off': gt 'artemEv','bj'
 				
-				act '"No way!"':
-					cla
-					pcs_dom += 1
-					artemLernQW = -1
-					artemblok = 1
-					npc_rel['A2'] = 0
-					gs 'stat'
-	
-					'"No, I won''t do it again. It ends here."'
-					act 'Leave Artem''s apartment':gt 'artemhome','leave',5
+				gs 'willpower', 'bj', 'resist'
+				if will_cost <= pcs_willpwr:
+					act '"No way!" (<<will_cost>> Willpower)':
+						cla
+						gs 'willpower', 'pay', 'resist'
+						!pcs_dom += 1
+						artemLernQW = -1
+						artemblok = 1
+						npc_rel['A2'] = 0
+						gs 'stat'
+						
+						'"No, I won''t do it again. It ends here."'
+						act 'Leave Artem''s apartment':gt 'artemhome','leave',5
+					end
+				else
+					act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			else
 				'After you finish your homework, Artem has a serious look on his face when he says: "<<$pcs_nickname>>, everyone in the school is talking about how much of a slut you are. With how much I''ve been helping you... I think it''s only fair you give me a little something in return."'
 				act 'Suck him off': gt 'artemEv','bj'
-
-				act '"No way!"':
-					cla
-					pcs_dom += 1
-					artemLernQW = -1
-					artemblok = 1
-					npc_rel['A2'] = 0
-					gs 'stat'
-	
-					'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
-					'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-					act 'Leave Artem''s apartment':gt 'artemhome','leave',5
+				!CUSTOM EDIT willpower seeding
+				gs 'willpower', 'bj', 'resist'
+				if will_cost <= pcs_willpwr:
+					act '"No way!" (<<will_cost>> Willpower)':
+						cla
+						gs 'willpower', 'pay', 'resist'
+						!pcs_dom += 1
+						artemLernQW = -1
+						artemblok = 1
+						npc_rel['A2'] = 0
+						gs 'stat'
+		
+						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+						'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
+						act 'Leave Artem''s apartment':gt 'artemhome','leave',5
+					end
+				else
+					act '"No way!" (<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 (artemBJQW > 0 and artemBJQW < 10 and artemsex = 0) or (artemStripSee = 3 and artemsex = 0 and artemTouch > daystart) or (artemBJQW > 0 and artQW = 5):
 			cla
 			'Artem unbuttons his pants and pulls his stiff erection from his pants.'
 			'He looks at you expectantly: "You know our deal, <<$pcs_nickname>>. If you want my help, I want your mouth."'
-
+			!Candidate for willpower expansion
 			act 'Suck him off': gt 'artemEv','bj'
 		elseif artemBJQW = 10 and artemsex = 0 and artQW ! 5:
 			cla
 			'After you finish your homework with Artem, he says a little shyly: "You know... I''ve never seen a girl naked before. Only on pictures. Maybe you could..."'
-			if pcs_dom >= 30 and dimaFilm > 0 and arthakQW = 0 and pcs_vag > 0:
-				act 'Agree to strip, in exchange for a favor':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/anatomy.jpg"></center>'
-					'You give him a serious look when you say: "You want me to get naked for you? You know what... I''ll show you what you want to see, but I need something in return."'
-					'Artem is mostly surprised you''re not ripping him a new one and nods enthusiastically, pretty much agreeing to whatever it is you want without even asking what it is.'
-					'You tell him: "But if you do not keep your promise, I know some guys that will break your nose. And that''d be just the beginning. Are we clear?"'
-					'You see him gulp, but he''s still interested in seeing you nude. You continue: "Now, about the service... Dimka Nosov has some video footage of me. I need it to disappear. I need you to break into his computer and remove it. Can you do that for me?"'
-					'Artem looks a bit unsure, but says: "Yea... I think I can do that. What''s on the recording?"'
-					'You smile at him and tell him a lie while you take off your clothes: "Oh, don''t worry about it. It''s just me dancing after I had a few drinks in the disco. My <<$npc_nickname[''A29'']>> doesn''t know I sometimes drink alcohol, and he threatened to show her."'
-					*pl
-					'Once you''re naked, Artem unbuttons his pants and looks at you expectantly: "You know our deal, <<$pcs_nickname>>. If you want my help, I want your mouth."'
-					minut += 5
-					artemhakday = daystart
-					arthakQW = 1
-					gs 'stat'
-					artemStripSee = 1
-					dimaRevenge = 1
-
-					act 'Suck him off': gt 'artemEv','bj'
-				end
-			else
-				act 'Agree to strip, but ask for money':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/anatomy.jpg"></center>'
-					'You think it over for a second, but realize Artem is not a very good negotiator. You figure you can probably get something in exchange.'
-					'You look at him, feigning doubt: "I don''t know, Artem. I guess I could give you some female anatomy lessons, but my family is kinda pressed for cash. You see, my sister really needs some medication, and we can''t afford it. If you''d give me 300 <b>₽</b>, that would go a long way... maybe we can help each other out?"'
-					'Artem readily agrees, and gives you the money without a second thought: "Of course, of course! That sounds fair. Here you go... now, your clothes?"'
-					'Well... fair''s fair, he paid for it. You slowly take off your clothes, making a little show out of it. When you''re completely naked you sit back and spread your legs, exposing your bare pussy to Artem.'
-					'You were clear he''s not allowed to touch you, but you spread your pussy lips and show him everything he wants to see.'
-					*pl
-					'Once you''re naked, Artem unbuttons his pants and looks at you expectantly: "Our previous deal still stands, <<$pcs_nickname>>. If you want my help, I want your mouth."'
-					money += 300
-					artemStripSee = 1
-					minut += 5
-					gs 'stat'
-
-					act 'Suck him off': gt 'artemEv','bj'
+			if dimaFilm > 0 and arthakQW = 0 and pcs_vag > 0:
+				! using 'misc' since youre stripping either way, this is about forcing yourself to reveal dimka is blackmailing you
+				gs 'willpower', 'misc', 'self'
+				if will_cost <= pcs_willpwr:
+					act 'Agree to strip, in exchange for help with Dimka (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'self'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/anatomy.jpg"></center>'
+						'You give him a serious look when you say: "You want me to get naked for you? You know what... I''ll show you what you want to see, but I need something in return."'
+						'Artem is mostly surprised you''re not ripping him a new one and nods enthusiastically, pretty much agreeing to whatever it is you want without even asking what it is.'
+						'You tell him: "But if you do not keep your promise, I know some guys that will break your nose. And that''d be just the beginning. Are we clear?"'
+						'You see him gulp, but he''s still interested in seeing you nude. You continue: "Now, about the service... Dimka Nosov has some video footage of me. I need it to disappear. I need you to break into his computer and remove it. Can you do that for me?"'
+						'Artem looks a bit unsure, but says: "Yea... I think I can do that. What''s on the recording?"'
+						'You smile at him and tell him a lie while you take off your clothes: "Oh, don''t worry about it. It''s just me dancing after I had a few drinks in the disco. My <<$npc_nickname[''A29'']>> doesn''t know I sometimes drink alcohol, and he threatened to show her."'
+						*pl
+						'Once you''re naked, Artem unbuttons his pants and looks at you expectantly: "You know our deal, <<$pcs_nickname>>. If you want my help, I want your mouth."'
+						minut += 5
+						artemhakday = daystart
+						arthakQW = 1
+						gs 'stat'
+						artemStripSee = 1
+						dimaRevenge = 1
+						
+						act 'Suck him off': gt 'artemEv','bj'
+					end
+				else
+					act 'Agree to strip, in exchange for help with Dimka (<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 'Agree to strip, but ask for money':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/anatomy.jpg"></center>'
+				'You think it over for a second, but realize Artem is not a very good negotiator. You figure you can probably get something in exchange.'
+				'You look at him, feigning doubt: "I don''t know, Artem. I guess I could give you some female anatomy lessons, but my family is kinda pressed for cash. You see, my sister really needs some medication, and we can''t afford it. If you''d give me 300 <b>₽</b>, that would go a long way... maybe we can help each other out?"'
+				'Artem readily agrees, and gives you the money without a second thought: "Of course, of course! That sounds fair. Here you go... now, your clothes?"'
+				'Well... fair''s fair, he paid for it. You slowly take off your clothes, making a little show out of it. When you''re completely naked you sit back and spread your legs, exposing your bare pussy to Artem.'
+				'You were clear he''s not allowed to touch you, but you spread your pussy lips and show him everything he wants to see.'
+				*pl
+				'Once you''re naked, Artem unbuttons his pants and looks at you expectantly: "Our previous deal still stands, <<$pcs_nickname>>. If you want my help, I want your mouth."'
+				money += 300
+				artemStripSee = 1
+				minut += 5
+				gs 'stat'
+				
+				act 'Suck him off': gt 'artemEv','bj'
+			end
 		elseif artemBJQW > 10 and artemStripSee < 2 and artQW ! 5:
 			artemRand = rand(0,5)
 			*clr & cla
+			!Candidate for willpower expansion
 			if artemRand = 5:
 				'After you finish your homework with Artem, he puts 300 <b>₽</b> down on the table out of nowhere.'
 				'He has a greedy grin on his face when he says: "Let''s repeat that anatomy lesson you gave me... get rid of those clothes, <<$pcs_nickname>>."'
@@ -230,6 +249,7 @@ if $ARGS[0] = 'learn':
 			artemTouch = daystart + 7
 			artemStripSee = 3
 			gs 'stat'
+			!Candidate for willpower expansion
 			act 'Let him touch you':
 				if pcs_horny >= 80:
 					*clr & cla
@@ -308,18 +328,24 @@ if $ARGS[0] = 'learn':
 			'Artem pressures you: "Come on... you need the money, right? We would both pay you."'
 			minut += 5
 			gs 'stat'
-			act 'Refuse to meet his friend':
-				cla
-				'You can''t do it. You tell him: "It''s not about the money. Sorry Artem, but I don''t feel comfortable doing that."'
-				'Artem is deeply insulted: "Really, <<$pcs_nickname>>? Plenty of other guys have sex with you, a lot of them not even offering you anything in return, but we''re not good enough for you? Despite me always helping you out with school, and making you a very fair offer?"'
-				'He continues: "If you''re not willing to help, pack up your stuff and get out. And find someone else to help you with your homework, I''m not doing it any more."'
-				pcs_dom += 1
-				artemLernQW = -1
-				artemblok = 1
-				npc_rel['A2'] = 0
-				gs 'stat'
+			gs 'willpower', 'prostitution', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse to meet his friend (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'resist'
+					'You can''t do it. You tell him: "It''s not about the money. Sorry Artem, but I don''t feel comfortable doing that."'
+					'Artem is deeply insulted: "Really, <<$pcs_nickname>>? Plenty of other guys have sex with you, a lot of them not even offering you anything in return, but we''re not good enough for you? Despite me always helping you out with school, and making you a very fair offer?"'
+					'He continues: "If you''re not willing to help, pack up your stuff and get out. And find someone else to help you with your homework, I''m not doing it any more."'
+					!pcs_dom += 1
+					artemLernQW = -1
+					artemblok = 1
+					npc_rel['A2'] = 0
+					gs 'stat'
 
-				act 'Leave Artem''s apartment':gt 'artemhome','leave',15
+					act 'Leave Artem''s apartment':gt 'artemhome','leave',15
+				end
+			else
+				act 'Refuse to meet his friend (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Agree to meet his friend':
 				cla
@@ -341,7 +367,7 @@ if $ARGS[0] = 'learn':
 			'Artem notices his reluctance and suggests: "Maybe start with her breasts? <<$pcs_nickname>>, show Petka your boobs."'
 			minut += 5
 			gs 'stat'
-
+			!Candidate for willpower expansion
 			act 'Show him your boobs':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/ap_anatomy1_1.jpg"></center>'
@@ -396,6 +422,7 @@ if $ARGS[0] = 'learn':
 			else
 				artemAndPetjaRand = rand(0,5)
 			end
+			!Candidate for willpower expansion
 			if artemAndPetjaRand ! 0:
 				'Artem unbuttons his pants and looks at you expectantly: "Our previous deal still stands, <<$pcs_nickname>>. If you want my help, I want your mouth."'
 
@@ -638,7 +665,7 @@ if $ARGS[0] = 'learn':
 				sub += 10
 				gang += 1
 				gs 'stat'
-				
+				!Candidate for willpower expansion
 				act 'Drink it all':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/ap_anatomy6_3.jpg"></center>'
@@ -692,30 +719,39 @@ if $ARGS[0] = 'kiss':
 	elseif leghumpArtem >= 1:
 		'Artem looks at you with embarrassment, but gathers the courage to ask: "<<$pcs_nickname>>, you''re the best thing that''s ever happened to me. I enjoyed last time so much... could we play like that again?"'
 		act 'Let him caress your ass': gt 'artemEv','leghump'
-		if pcs_dom > 0:
-			act 'Strip and let Artem rub his dick against your ass': gt 'artemEv','leghump2'
+		gs 'willpower', 'exhib', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Strip and let Artem rub his dick against your ass (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'force' & gt 'artemEv','leghump2'
+		else
+			act 'Strip and let Artem rub his dick against your ass (<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 artQW = 3:
 		if pcs_horny < 50:
-			act 'Reluctantly masturbate Artem':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj1.jpg"></center>'
-				'Well... you don''t feel particularly aroused, but you''d feel bad saying no to the guy. You reluctantly nod and tell him to take his pants off, which he joyfully does.'
-				'Without much enthusiasm you rub your hand over his foreskin for a second, before pulling it back and slowly spreading his precum out with your fingers. You then clasp your fingers around the head of his cock, and slowly jerk him off. Within minutes you see Artem tense up, and he groans your name right as he shoots his warm load over your hand.'
-				'You give him a few more strokes to make sure he''s finished, and then quickly go wash his cum off your hand in the bathroom. You return to his room with a slightly faked smile. He''s completely oblivious to the fact that you didn''t really want to do it, and seems happy.'
-				npc_sex['A2'] += 1
-				hja += 1
-				gs 'arousal','hj',15,'sub'
-				if pcs_mood > 50:pcs_mood = 50
-				gs 'cum_call','hands',$boy,1
-				cumspclnt = 9
-				gs 'cum_cleanup'
-				gs 'arousal','end'
-				gs 'stat'
+			gs 'willpower', 'hj', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Reluctantly masturbate Artem (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj1.jpg"></center>'
+					'Well... you don''t feel particularly aroused, but you''d feel bad saying no to the guy. You reluctantly nod and tell him to take his pants off, which he joyfully does.'
+					'Without much enthusiasm you rub your hand over his foreskin for a second, before pulling it back and slowly spreading his precum out with your fingers. You then clasp your fingers around the head of his cock, and slowly jerk him off. Within minutes you see Artem tense up, and he groans your name right as he shoots his warm load over your hand.'
+					'You give him a few more strokes to make sure he''s finished, and then quickly go wash his cum off your hand in the bathroom. You return to his room with a slightly faked smile. He''s completely oblivious to the fact that you didn''t really want to do it, and seems happy.'
+					npc_sex['A2'] += 1
+					hja += 1
+					gs 'arousal','hj',15,'sub'
+					if pcs_mood > 50:pcs_mood = 50
+					gs 'cum_call','hands',$boy,1
+					cumspclnt = 9
+					gs 'cum_cleanup'
+					gs 'arousal','end'
+					gs 'stat'
 
-				act 'Continue':gt 'artemhome','inside'
+					act 'Continue':gt 'artemhome','inside'
+				end
+			else
+				act 'Reluctantly masturbate Artem (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			act 'Jerk off Artem':
@@ -1017,132 +1053,81 @@ if $ARGS[0] = 'artemGopSkver':
 
 		act 'Go inside with Artem':gt 'artemhome','inside'
 	end
-	act 'Stand up to them':
-		cla
-		'You indignantly reply: "He''s not a bitch, Artem is my friend!"'
-		'The Gopnik walks up to Artem, and pokes him in the chest with his finger. He asks: "Oh really... what do you think, bitch? Are you a bitch or what?"'
-		act 'Get between them':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_knee.jpg"></center>'
-			'You quickly get inbetween Artem and the Gopnik, shielding him with your body. You threaten them: Don''t touch him! I''ll call the police!"'
-			'The Gopnik is not impressed. He pulls out a knife and puts it against your throat: "Why are you wasting your time with this loser, <<$pcs_nickname>>?"'
-			'You can see his friends slowly encroaching around you. There''s no way you can run away now.'
-			'You look into his eyes and sigh: "Come on... just let us leave. Please? You can take my money."'
-			'The Gopnik is satisfied with that prospect, and lowers the knife. After you give him all your money, he lets you and Artem leave. You feel bad for getting robbed like that, but you still feel you did the right thing. Who knows what they would''ve done to Artem, if you didn''t get involved!'
-			minut += 5
-			money = 0
-			gs 'stat'
-
-			act 'Go to Artem''s apartment':gt 'artemhome','inside'
-		end
-		act 'Watch in silence':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_udar.jpg"></center>'
-			'"I''m not a bitch", Artyom says quietly.'
-			'The Gopnik grins: "We''ll see about that!"'
-			'He hits Artem hard in the stomach. Artem buckles over and falls to his knees. The Gopnik and his friends laugh while Artem lies groaning on the ground.'
-			'He turns to you: "Everyone can see he''s a bitch, <<$pcs_nickname>>. What do you even see him him? Seriously..."'
-			'Then he continues, with an evil smirk on his face: "So... you really like him? Enough to help him out of this mess he talked himself into? There is one thing you could do..."'
-			'The other Gopniks are all laughing when their leader suggests: "Do a striptease! If it''s a good one, we''ll leave him alone. Someone, play some music."'
-			minut += 5
-			gs 'stat'
+	gs 'willpower', 'misc', 'self', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Stand up to them (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'self'
+			cla
+			'You indignantly reply: "He''s not a bitch, Artem is my friend!"'
+			'The Gopnik walks up to Artem, and pokes him in the chest with his finger. He asks: "Oh really... what do you think, bitch? Are you a bitch or what?"'
+			gs 'willpower', 'misc', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Get between them (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay', 'self'
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_knee.jpg"></center>'
+					'You quickly get inbetween Artem and the Gopnik, shielding him with your body. You threaten them: Don''t touch him! I''ll call the police!"'
+					'The Gopnik is not impressed. He pulls out a knife and puts it against your throat: "Why are you wasting your time with this loser, <<$pcs_nickname>>?"'
+					'You can see his friends slowly encroaching around you. There''s no way you can run away now.'
+					'You look into his eyes and sigh: "Come on... just let us leave. Please? You can take my money."'
+					'The Gopnik is satisfied with that prospect, and lowers the knife. After you give him all your money, he lets you and Artem leave. You feel bad for getting robbed like that, but you still feel you did the right thing. Who knows what they would''ve done to Artem, if you didn''t get involved!'
+					minut += 5
+					money = 0
+					gs 'stat'
 
-			act 'Refuse':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_udar2.jpg"></center>'
-				'Wait, what!?'
-				'You answer: "No way, you perverts! Just leave us alone!"'
-				'The Gopnik walks back over to Artem and kicks him in the face. A few seconds later, one of his friends also kicks Artem in the back. You quickly throw yourself on top of Artem and hug him, so they can''t kick him any more.'
-				'The Gopnik looks down at the two of you, and spits on the ground. He sighs: "Whatever..."'
-				'The Gopniks leave you alone and go deeper into the park, probably to go drink some beer or something. You help Artem up on his feet, carefully.'
-				'Artem wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home.'
-				minut += 5
-				gs 'stat'
-				act 'Put him in bed and leave':gt 'artemhome','leave',15
+					act 'Go to Artem''s apartment':gt 'artemhome','inside'
+				end
+			else
+				act 'Get between them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			act 'Dance for them':
-				inhib_exp += rand(0,1)
+			act 'Watch in silence':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_strip.jpg"></center>'
-				'Well, if that''s what you have to do to get out of here...'
-				'You begin to dance to the music a bit awkwardly, and immediately get boo''d.'
-				'The Gopnik threatens: "We said striptease, <<$pcs_nickname>>! Not dance!"'
-				'You nod and slowly begin to undress to the music, trying to avoid their greedy looks.'
-				'Artem noticed their looks as well and shouts: "<<$pcs_nickname>>, stop! You don''t have to do this!"'
-				'The Gopnik punches him in the ribs and tells him: "Shut up, bitch! She''s saving your ass, show some respect."'
-				'Artem is too afraid to argue with them, and soon the only thing you''re still wearing is your boots.'
-				'All of the Gopniks gather around you. Their leader grins and gives you a choice: "Not bad <<$pcs_nickname>>, nice tits. It''s a shame you''re wasting them on him. And now, you''re going to suck us all off. If you do a good job, we''ll let you go."'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_udar.jpg"></center>'
+				'"I''m not a bitch", Artyom says quietly.'
+				'The Gopnik grins: "We''ll see about that!"'
+				'He hits Artem hard in the stomach. Artem buckles over and falls to his knees. The Gopnik and his friends laugh while Artem lies groaning on the ground.'
+				'He turns to you: "Everyone can see he''s a bitch, <<$pcs_nickname>>. What do you even see him him? Seriously..."'
+				'Then he continues, with an evil smirk on his face: "So... you really like him? Enough to help him out of this mess he talked himself into? There is one thing you could do..."'
+				'The other Gopniks are all laughing when their leader suggests: "Do a striptease! If it''s a good one, we''ll leave him alone. Someone, play some music."'
 				minut += 5
-				gs 'shortgs','undress'
 				gs 'stat'
-
-				act 'Get down on your knees':
-					*clr & cla
-					gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
-					gs 'boyStat', $npclastgenerated,1
-					npc_sex[$npclastgenerated] += 1
-					gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
-					gs 'boyStat', $npclastgenerated,2
-					npc_sex[$npclastgenerated] += 1
-					gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
-					gs 'boyStat', $npclastgenerated,3
-					npc_sex[$npclastgenerated] += 1
-
-					gs 'arousal','bj','dick[1]',5,'sub','group','rough'
-					gs 'arousal','bj','dick[2]',5,'sub','group','rough'
-					gs 'arousal','bj','dick[3]',5,'sub','group','rough'
-					gs 'cum_call','face',$boy[1],0
-					gs 'cum_call','face',$boy[2],0
-					gs 'cum_call','face',$boy[3],0
-
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_bj.jpg"></center>'
-					'You quickly glance around you and realize there''s no way you can get past them and outrun them all. With a deep sigh, you drop to your knees and reach out for one of the exposed cocks the Gopniks are already shoving in your face.'
-					'Three of the Gopniks leave you and go keep an eye out, satisfied that you can''t run away from this position without their friends easily stopping you. The other three all offer you their cocks.'
-					'For a few seconds you try to give the first guy a blowjob, but it''s quite obvious they don''t need your cooperation. The guy roughly shoves his dick down your throat and then begins to thrust his hips against your face, roughly fucking his throat while he keeps your head in place by grabbing onto your hair.'
-					'They run a train on your face, and you''re never without a cock in your mouth for long. As soon as one guy finishes, the next takes over. After what feels like forever the third guy finally finishes, and your face is completely covered with their sperm. You can hardly open your eyes and your throat feels sore.'
-					'The Gopniks all gather around for one last laugh, and then leave you and Artem be. Artem quietly helps you put your clothes back on before walking you home.'
-					act 'Go home':
-						gs 'shortgs','dress'
+				
+				gs 'willpower', 'humiliation', 'resist', 'hard'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse (<<will_cost>> Willpower)':
+						gs 'willpower', 'pay', 'resist'
 						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_udar2.jpg"></center>'
+						'Wait, what!?'
+						'You answer: "No way, you perverts! Just leave us alone!"'
+						'The Gopnik walks back over to Artem and kicks him in the face. A few seconds later, one of his friends also kicks Artem in the back. You quickly throw yourself on top of Artem and hug him, so they can''t kick him any more.'
+						'The Gopnik looks down at the two of you, and spits on the ground. He sighs: "Whatever..."'
+						'The Gopniks leave you alone and go deeper into the park, probably to go drink some beer or something. You help Artem up on his feet, carefully.'
+						'Artem wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home.'
+						minut += 5
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_slap.jpg"></center>'
-						'You can see Artem is mulling something over, while you walk back home.'
-						'Once you reach your apartment building, Artem says: "<<$pcs_nickname>>... I don''t think we should see each other any more, after what just happened. That was gross!"'
-						'That fucking bastard... you did that to save him! Too angry to say anything, you slap him in the face as hard as you can and then storm off, vowing to never speak to him again.'
-						act 'Leave':
-							minut += 15
-							artemblok = 1
-							artemLernQW = -1
-							gt 'artemhome','leave',5
-						end
+						act 'Put him in bed and leave':gt 'artemhome','leave',15
 					end
+				else
+					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 'Run away':
+				act 'Dance for them':
+					inhib_exp += rand(0,1)
 					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_strip.jpg"></center>'
+					'Well, if that''s what you have to do to get out of here...'
+					'You begin to dance to the music a bit awkwardly, and immediately get boo''d.'
+					'The Gopnik threatens: "We said striptease, <<$pcs_nickname>>! Not dance!"'
+					'You nod and slowly begin to undress to the music, trying to avoid their greedy looks.'
+					'Artem noticed their looks as well and shouts: "<<$pcs_nickname>>, stop! You don''t have to do this!"'
+					'The Gopnik punches him in the ribs and tells him: "Shut up, bitch! She''s saving your ass, show some respect."'
+					'Artem is too afraid to argue with them, and soon the only thing you''re still wearing is your boots.'
+					'All of the Gopniks gather around you. Their leader grins and gives you a choice: "Not bad <<$pcs_nickname>>, nice tits. It''s a shame you''re wasting them on him. And now, you''re going to suck us all off. If you do a good job, we''ll let you go."'
 					minut += 5
+					gs 'shortgs','undress'
 					gs 'stat'
-					artemGopRange = speed + pcs_agil + pcs_run
-					if artemGopRange < 50:
-						artemRand = rand(0,1)
-					elseif artemGopRange >= 50 and artemGopRange < 100:
-						artemRand = rand(0,2)
-					elseif artemGopRange >= 100 and artemGopRange < 150:
-						artemRand = rand(0,5)
-					elseif artemGopRange >= 150 and artemGopRange < 200:
-						artemRand = rand(0,10)
-					else
-						artemRand = rand(0,20)
-					end
-
-					if artemRand ! 0:
-						pcs_dom += 5
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
-						'You look around you, and suddenly shout in a random direction: "Dad, I''m over here!"'
-						'As the Gopniks turn around to see who you''re shouting at, you quickly grab Artem by the arm and start running. When you''re satisfied the Gopniks are no longer following you, you find a quiet area and put your clothes back on.'
-						act 'Go back to Artem''s apartment':gt 'artemhome','inside'
-					else
+					
+					act 'Dance for them':
 						*clr & cla
 						gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
 						gs 'boyStat', $npclastgenerated,1
@@ -1153,55 +1138,130 @@ if $ARGS[0] = 'artemGopSkver':
 						gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
 						gs 'boyStat', $npclastgenerated,3
 						npc_sex[$npclastgenerated] += 1
-						gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
-						gs 'boyStat', $npclastgenerated,4
-						npc_sex[$npclastgenerated] += 1
-						gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
-						gs 'boyStat', $npclastgenerated,5
-						npc_sex[$npclastgenerated] += 1
-						gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
-						gs 'boyStat', $npclastgenerated,6
-						npc_sex[$npclastgenerated] += 1
 
-						rape += 1
-						gang += 1
-						gs 'arousal','anal','dick[1]',5,'sub','group','rough'
+						gs 'arousal','bj','dick[1]',5,'sub','group','rough'
 						gs 'arousal','bj','dick[2]',5,'sub','group','rough'
 						gs 'arousal','bj','dick[3]',5,'sub','group','rough'
-						gs 'arousal','','dick[4]',5,'sub','group','rough'
-						gs 'arousal','bj','dick[5]',5,'sub','group','rough'
-						gs 'arousal','','dick[6]',5,'sub','group','rough'
-						gs 'arousal','bj','dick[1]',5,'sub','group','rough'
-						gs 'arousal','','dick[2]',5,'sub','group','rough'
-						gs 'arousal','anal','dick[3]',5,'sub','group','rough'
-						gs 'arousal','bj','dick[4]',5,'sub','group','rough'
-						gs 'arousal','','dick[5]',5,'sub','group','rough'
-						gs 'arousal','bj','dick[6]',5,'sub','group','rough'
-						minut -= 20
-						gs 'cum_call','anus',$boy[1],0
+						gs 'cum_call','face',$boy[1],0
 						gs 'cum_call','face',$boy[2],0
-						gs 'cum_call','mouth',$boy[3],0
-						gs 'cum_call','face',$boy[4],0
-						gs 'cum_call','face',$boy[5],0
-						gs 'cum_call','face',$boy[6],0
+						gs 'cum_call','face',$boy[3],0
 
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_rape.jpg"></center>'
-						'You look around you, and suddenly shout: "Dad, I''m over here!"'
-						'As the Gopniks turn around to see who you''re shouting at, you quickly grab Artem by the arm and start running. Unfortunately, one of the Gopniks wasn''t fooled by your diversion, and you trip over his foot when he tackles you.'
-						'The guy drops to his knees and grabs you by the hair while you lie flat on your stomach: "We warned you, <<$pcs_nickname>>. You''re all ours now."'
-						'One of them takes off his pants and drops to his knees in front of you, while the other holds his knife to your neck. He threatens: "Open up whore, or we''ll be spilling your guts all over the ground."'
-						'Two of them go stand watch, while the other four gather around you. Two of them hold you down, while the third fucks your throat and the last one fucks your pussy. They keep switching places, fucking your helpless body relentlessly while Artem watches, unable to assist you in any way.'
-						'By this point you''re too tired to resist and just let them have their way with you, and just groan through the pain when one of them puts you on your hands and knees and fucks your tight asshole. Several more follow his example, and after what feels like forever they tell you to get up to your knees.'
-						'You do as they say, and meekly open your mouth while they jerk themselves off over your face one by one. Then they all spit into your mouth, and force you to swallow it.'
-						'To add insult to injury, several of them finish it off by urinating all over you. They laugh as they get dressed again, and their leader grins benevolently: "Go home and get cleaned up. We have nothing against you, but remember this lesson, <<$pcs_nickname>>... if you keep hanging out with bitches, people will treat you like one too. You know where to find us, when you decide you want a real man". Then they leave.'
-						'Artem quietly helps you get dressed, and quietly walks you home. When you get home he finally says something: "<<$pcs_nickname>>, I''m so sorry. I know what you did for me and... I owe you. Big time. I don''t know what I can do to repay you, but if you ever need anything... please. I''m there for you."'
-						gs 'shortgs','dress'
-						act 'Leave': artemblag = 1 & gt 'artemhome','leave',15
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_bj.jpg"></center>'
+						'You quickly glance around you and realize there''s no way you can get past them and outrun them all. With a deep sigh, you drop to your knees and reach out for one of the exposed cocks the Gopniks are already shoving in your face.'
+						'Three of the Gopniks leave you and go keep an eye out, satisfied that you can''t run away from this position without their friends easily stopping you. The other three all offer you their cocks.'
+						'For a few seconds you try to give the first guy a blowjob, but it''s quite obvious they don''t need your cooperation. The guy roughly shoves his dick down your throat and then begins to thrust his hips against your face, roughly fucking his throat while he keeps your head in place by grabbing onto your hair.'
+						'They run a train on your face, and you''re never without a cock in your mouth for long. As soon as one guy finishes, the next takes over. After what feels like forever the third guy finally finishes, and your face is completely covered with their sperm. You can hardly open your eyes and your throat feels sore.'
+						'The Gopniks all gather around for one last laugh, and then leave you and Artem be. Artem quietly helps you put your clothes back on before walking you home.'
+						act 'Go home':
+							gs 'shortgs','dress'
+							*clr & cla
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_slap.jpg"></center>'
+							'You can see Artem is mulling something over, while you walk back home.'
+							'Once you reach your apartment building, Artem says: "<<$pcs_nickname>>... I don''t think we should see each other any more, after what just happened. That was gross!"'
+							'That fucking bastard... you did that to save him! Too angry to say anything, you slap him in the face as hard as you can and then storm off, vowing to never speak to him again.'
+							act 'Leave':
+								minut += 15
+								artemblok = 1
+								artemLernQW = -1
+								gt 'artemhome','leave',5
+							end
+						end
+					end
+					gs 'willpower', 'group', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Run away (<<will_cost>> Willpower)':
+							gs 'willpower', 'pay', 'resist'
+							*clr & cla
+							minut += 5
+							gs 'stat'
+							artemGopRange = speed + pcs_agil + pcs_run
+							if artemGopRange < 50:
+								artemRand = rand(0,1)
+							elseif artemGopRange >= 50 and artemGopRange < 100:
+								artemRand = rand(0,2)
+							elseif artemGopRange >= 100 and artemGopRange < 150:
+								artemRand = rand(0,5)
+							elseif artemGopRange >= 150 and artemGopRange < 200:
+								artemRand = rand(0,10)
+							else
+								artemRand = rand(0,20)
+							end
+
+							if artemRand ! 0:
+								!pcs_dom += 5
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
+								'You look around you, and suddenly shout in a random direction: "Dad, I''m over here!"'
+								'As the Gopniks turn around to see who you''re shouting at, you quickly grab Artem by the arm and start running. When you''re satisfied the Gopniks are no longer following you, you find a quiet area and put your clothes back on.'
+								act 'Go back to Artem''s apartment':gt 'artemhome','inside'
+							else
+								*clr & cla
+								gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
+								gs 'boyStat', $npclastgenerated,1
+								npc_sex[$npclastgenerated] += 1
+								gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
+								gs 'boyStat', $npclastgenerated,2
+								npc_sex[$npclastgenerated] += 1
+								gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
+								gs 'boyStat', $npclastgenerated,3
+								npc_sex[$npclastgenerated] += 1
+								gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
+								gs 'boyStat', $npclastgenerated,4
+								npc_sex[$npclastgenerated] += 1
+								gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
+								gs 'boyStat', $npclastgenerated,5
+								npc_sex[$npclastgenerated] += 1
+								gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
+								gs 'boyStat', $npclastgenerated,6
+								npc_sex[$npclastgenerated] += 1
+
+								rape += 1
+								gang += 1
+								gs 'arousal','anal','dick[1]',5,'sub','group','rough'
+								gs 'arousal','bj','dick[2]',5,'sub','group','rough'
+								gs 'arousal','bj','dick[3]',5,'sub','group','rough'
+								gs 'arousal','','dick[4]',5,'sub','group','rough'
+								gs 'arousal','bj','dick[5]',5,'sub','group','rough'
+								gs 'arousal','','dick[6]',5,'sub','group','rough'
+								gs 'arousal','bj','dick[1]',5,'sub','group','rough'
+								gs 'arousal','','dick[2]',5,'sub','group','rough'
+								gs 'arousal','anal','dick[3]',5,'sub','group','rough'
+								gs 'arousal','bj','dick[4]',5,'sub','group','rough'
+								gs 'arousal','','dick[5]',5,'sub','group','rough'
+								gs 'arousal','bj','dick[6]',5,'sub','group','rough'
+								minut -= 20
+								gs 'cum_call','anus',$boy[1],0
+								gs 'cum_call','face',$boy[2],0
+								gs 'cum_call','mouth',$boy[3],0
+								gs 'cum_call','face',$boy[4],0
+								gs 'cum_call','face',$boy[5],0
+								gs 'cum_call','face',$boy[6],0
+
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_rape.jpg"></center>'
+								'You look around you, and suddenly shout: "Dad, I''m over here!"'
+								'As the Gopniks turn around to see who you''re shouting at, you quickly grab Artem by the arm and start running. Unfortunately, one of the Gopniks wasn''t fooled by your diversion, and you trip over his foot when he tackles you.'
+								'The guy drops to his knees and grabs you by the hair while you lie flat on your stomach: "We warned you, <<$pcs_nickname>>. You''re all ours now."'
+								'One of them takes off his pants and drops to his knees in front of you, while the other holds his knife to your neck. He threatens: "Open up whore, or we''ll be spilling your guts all over the ground."'
+								'Two of them go stand watch, while the other four gather around you. Two of them hold you down, while the third fucks your throat and the last one fucks your pussy. They keep switching places, fucking your helpless body relentlessly while Artem watches, unable to assist you in any way.'
+								'By this point you''re too tired to resist and just let them have their way with you, and just groan through the pain when one of them puts you on your hands and knees and fucks your tight asshole. Several more follow his example, and after what feels like forever they tell you to get up to your knees.'
+								'You do as they say, and meekly open your mouth while they jerk themselves off over your face one by one. Then they all spit into your mouth, and force you to swallow it.'
+								'To add insult to injury, several of them finish it off by urinating all over you. They laugh as they get dressed again, and their leader grins benevolently: "Go home and get cleaned up. We have nothing against you, but remember this lesson, <<$pcs_nickname>>... if you keep hanging out with bitches, people will treat you like one too. You know where to find us, when you decide you want a real man". Then they leave.'
+								'Artem quietly helps you get dressed, and quietly walks you home. When you get home he finally says something: "<<$pcs_nickname>>, I''m so sorry. I know what you did for me and... I owe you. Big time. I don''t know what I can do to repay you, but if you ever need anything... please. I''m there for you."'
+								gs 'shortgs','dress'
+								act 'Leave': artemblag = 1 & gt 'artemhome','leave',15
+							end
+						end
+					else
+						act 'Run away (<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
+	else
+		act 'Stand up to them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end &! --- artemgopSkver ---
 
@@ -1218,11 +1278,15 @@ if $ARGS[0] = 'start':
 		'Vitek frowns though, and says: "He ''kindly offered''... right. I don''t trust that freak! Just look at him, he''s eyeing you up and down constantly!"'
 		'Artem is getting quite nervous, and tries to appease Vitek: "Vitek, come on man! You know I would never do that! I''m only helping <<$pcs_nickname>> out with her studies, I swear!"'
 		'You can see Vitek''s body tense. He''s not buying Artem''s story at all, and looks at Artem with distrust.'
-
-		if pcs_dom >= 10:
-			act 'Reassure Vitek he can trust you':
+		
+		gs 'willpower', 'skill', 'force', 'chrsm_lvl'
+		if will_cost <= pcs_willpwr:
+			act 'Reassure Vitek he can trust you (<<will_cost>> Willpower)':
+				! I think passing this warrants some chrsm_exp. If you dont think so just remove this line
+				chrsm_exp += rand(0,will_cost)
+				gs 'willpower', 'pay', 'force'
 				cla
-				sub += 10
+				!sub += 10
 				artemVitokQW = 1
 				gs 'stat'
 				'You decide that you should step up for Artem, but also reassure Vitek you''re still with him. You need to be delicate about it, though.'
@@ -1233,8 +1297,9 @@ if $ARGS[0] = 'start':
 				'Vitek leaves you be, and you go to Artem''s home with him to study. You can see Artem''s body still trembling as you walk down the streets.'
 				act 'Do homework with Artem': gt 'artemEv','learn'
 			end
+		else
+			act 'Reassure Vitek he can trust you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-
 		act 'Say nothing':
 			cla
 			artemVitokQW = 2

locations/artgar.qsrc

@@ -351,7 +351,7 @@ elseif apmeet = 3:
 elseif apmeet = 4:
 	*clr & cla
 	minut += 30
-	sub += 1
+	!sub += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	'When you leave school, Artem is waiting for you by the entrance like he said he would. Without saying a word, he takes you by the hand and guides you to his parents'' garage. Peter said he would be a bit late this week, so you take your time walking there. While you walk, you ask Artem: "Did you ask Petka about my suggestion for this week?"'
@@ -430,7 +430,7 @@ elseif apmeet = 5:
 	*clr & cla
 	minut += 30
 	apmeet = 6
-	pcs_dom += 10
+	!pcs_dom += 10
 	gs 'stat'
 	arthakQW = 11
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/meet6.jpg"></center>'

locations/fit.qsrc

@@ -163,11 +163,12 @@ if $ARGS[0] = 'fitgirl':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower0.jpg"></center>'
 		'There''s no one in the shower, except this girl. The girl looks around and seeing you smiles again then turns away.'
-		if pcs_dom > 10:
-			act 'Molest her':
-				cla
-				*clr
-				tanday = daystart
+		
+		gs 'willpower', 'misc', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Molest her (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/showermol0.jpg"></center>'
 				'You walk up to the girl and gently place one hand on her right breast. She turns to face you.'
@@ -224,6 +225,8 @@ if $ARGS[0] = 'fitgirl':
 					end
 				end
 			end
+		else
+			act 'Molest her (<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 the shower':gt 'fit', 'dressing room'

locations/obj_din.qsrc

@@ -2351,6 +2351,23 @@ if $ARGS[0] = 'records':
 	if bumtolik = 4:$tab_text += dyneval($NoteBookLine,'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.')
 	if bumtolik >= 5:$tab_text += dyneval($NoteBookLine,'You volunteer at the Mercy Clinic in the city industrial region, working with the homeless. Working hours are from 9 to 17, Saturday and Sunday.')
 	$tab_text += '<center><h2>Relationships</h2></center>'
+
+	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+		if grupTipe = 0:
+			$tab_text += dyneval($NoteBookLine,'You are not a member of any particular school social group.')
+		elseif grupTipe = 1:
+			$tab_text += dyneval($NoteBookLine,'Your school social group consists of the popular, cool, and beautiful.')
+		elseif grupTipe = 2:
+			$tab_text += dyneval($NoteBookLine,'Your school social group consists of jocks and natural athletes.')
+		elseif grupTipe = 3:
+			$tab_text += dyneval($NoteBookLine,'You school social group consists of nerds, geeks, and good students.')
+		elseif grupTipe = 4:
+			$tab_text += dyneval($NoteBookLine,'You school social group consists of gopniks, rebels, punks, or troublemakers.')
+		elseif grupTipe = 5:
+			$tab_text += dyneval($NoteBookLine,'You school social group consists of losers, teacher''s pets, sluts, and the ugly.')
+		end
+	end
+	
 	if husband > 0:$tab_text += dyneval($NoteBookLine,'You have been married for <<husbanday>> days. Your husband <<$husName>> <<$husBody>> <<$husFat>> <<$husHair>>. Member <<husDick>> Relationship <<husband>>.')
 	if kid > 0:
 		i = 0

locations/party_boy.qsrc

@@ -1,9 +1,9 @@
 # party_boy
-menu_off = 1
 
 if $ARGS[0] = 'party_boy':
-	cls
+	*clr & cla
 	minut += 5
+	menu_off = 1
 	party_dj = 1
 	gs'stat'
 	if party_dj = 1 and dj_beer < 1:

locations/spellList.qsrc

@@ -42,6 +42,8 @@ spellTime['teleport'] = 20
 spellDiff['teleport'] = 20
 $spellName['teleport'] = 'Teleport'
 $spellDesc['teleport'] = 'You can move from one Fairy Circle to another.'
+$spellOptDesc['teleport'] = '$treeCircName'
+$spellOptVal['teleport'] = '$tpLocations'
 !regenerate
 spellMana['regenerate'] = 500
 spellTime['regenerate'] = 1
@@ -367,6 +369,9 @@ $spellName['greatflood'] = 'Great Flood'
 $spellDesc['greatflood'] = 'A huge flood of water fills the area absorbing mana from the enemy and giving you additional protection.'
 
 
+!-------------------------------------------------------------------------------------------
+! Pick Execution points for the spells
+
 ! List Combat Spells for use in fight scenerios
 $combatSpells[0] = 'fog'
 $combatSpells[1] = 'clone'
@@ -416,6 +421,8 @@ $nonComSpells[7] = 'shower'
 $nonComSpells[8] = 'makeup'
 $nonComSpells[9] = 'cosmetica'
 
+!-------------------------------------------------------------------------------------
+! Pick Learning Location for Spells
 
 ! Basic Spells
 $basicSpells[0] = 'fog'
@@ -480,6 +487,9 @@ $waterSpells[3] = 'sharkrockets'
 $waterSpells[4] = 'greatflood'
 
 
+!-------------------------------------------------------------------------------------------
+! Helper procedure to build Action bar for Learning Spells.
+
 if $ARGS[0] = 'teacherActions':
 	! Make Actions for learning spells
 	!	$ARGS[1] = the name of the array of spells

locations/telefon.qsrc

@@ -424,18 +424,37 @@ if $ARGS[0] = 'SvetaCallsNPC':
 		if Call4Date["willAgree"]:
 			'<<$Call4Date["CallerName"]>>, "See you at the cafe in an hour."'
 
-			act 'Go':gt gt 'telefon', 'NPCDate', Call4Date["ContactIndex"], 'cafe'
+			act 'Go':gt 'telefon', 'NPCDate', Call4Date["ContactIndex"], 'cafe'
 		else
 			gs 'telefon','telotkaz',$Call4Date["CallerName"]
 		end
 	end
 
-	act 'I think we should break up...':
-		cla
-		'<<$Call4Date["NPC-He"]>> sounds hurt, but you insist it is for the best. You both say goodbye and part ways.'
-		gs 'telefon', 'DeleteContact', $Call4Date["NPC"]
+	!!Willpower checks for resistance
+	if npc_rel[$Call4Date["NPC"]] <= 25:
+		$Call4Date["loverResist"] = 'easy'
+	elseif npc_rel[$Call4Date["NPC"]] <= 50:
+		$Call4Date["loverResist"] = 'medium'
+	else
+		$Call4Date["loverResist"] = 'hard'
+	end
+	gs 'willpower', 'misc', 'self', $Call4Date["loverResist"]
 
-		act 'Hangup':gt 'telefon', 'fin'
+	if will_cost <= pcs_willpwr:
+		act 'I think we should break up... (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'self'
+			gs 'stat'
+
+			'<<$Call4Date["NPC-He"]>> sounds hurt, but you insist it is for the best. You both say goodbye and part ways.'
+			gs 'telefon', 'DeleteContact', $Call4Date["NPC"]
+
+			act 'Hang up': gt 'telefon', 'fin'
+		end
+	else
+		act 'I think we should break up... (<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 'Hangup':gt 'telefon', 'fin'
@@ -453,6 +472,18 @@ if $ARGS[0] = 'NPCCallsForDate':
 	Call4Date["ContactIndex"] = ARGS[1]
 	$Call4Date["NPC"] = $contact[Call4Date['ContactIndex']]
 
+	if npc_gender[$Call4Date["NPC"]] = 0:
+		$Call4Date["NPC-he"] = 'he'
+		$Call4Date["NPC-He"] = 'He'
+		$Call4Date["NPC-his"] = 'his'
+		$Call4Date["NPC-His"] = 'His'
+	else
+		$Call4Date["NPC-he"] = 'her'
+		$Call4Date["NPC-He"] = 'Her'
+		$Call4Date["NPC-his"] = 'hers'
+		$Call4Date["NPC-His"] = 'Hers'
+	end
+
 	!!Pick a nickname that caller will use for Sveta
 	$DateNickName[0] = 'cutie'
 	$DateNickName[1] = 'honey'
@@ -514,13 +545,34 @@ if $ARGS[0] = 'NPCCallsForDate':
 			act 'Hang up': gt 'telefon', 'fin'
 		end
 
-		act 'I think we should break up...':
-			cla
-			'He sounds hurt, but you insist it is for the best. You both say goodbye and part ways.'
-			gs 'telefon', 'DeleteContact', $Call4Date["NPC"]
 
-			act 'Hang up': gt 'telefon', 'fin'
+		!!Willpower checks for resistance
+		if npc_rel[$Call4Date["NPC"]] <= 25:
+			$Call4Date["loverResist"] = 'easy'
+		elseif npc_rel[$Call4Date["NPC"]] <= 50:
+			$Call4Date["loverResist"] = 'medium'
+		else
+			$Call4Date["loverResist"] = 'hard'
+		end
+		gs 'willpower', 'misc', 'self', $Call4Date["loverResist"]
+
+		if will_cost <= pcs_willpwr:
+			act 'I think we should break up... (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+
+				'<<$Call4Date["NPC-He"]>> sounds hurt, but you insist it is for the best. You both say goodbye and part ways.'
+				gs 'telefon', 'DeleteContact', $Call4Date["NPC"]
+
+				act 'Hang up': gt 'telefon', 'fin'
+			end
+		else
+			act 'I think we should break up... (<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
 
 	act 'Hang up (end relationship)':

locations/therapist.qsrc

@@ -45,8 +45,8 @@ if $ARGS[0] = '':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/therapy1.jpg"></center>'
 		minut += 60
-		pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5 + 1000
-		pcs_mood = 100
+		!pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5 + 1000
+		pcs_mood += rand(30,60)
 		gs 'stat'
 		'You talk about your problems for a while, and in a few places Dr. Pavlov asks you some pointed questions. Although he makes you look at your own actions and desires closely, making you aware of your own issues, it somehow makes you feel better about yourself.'
 		'"Please, visit me again if you have any further problems, I will be glad to help!" Says Dr. Pavlov, as he escort you out of his door.'
@@ -63,7 +63,7 @@ if $ARGS[0] = '':
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/therapy1.jpg"></center>'
 			minut += 60
-			pcs_willpwr += rand(0,1)
+			pcs_willpwr += rand(2,6)
 			gs 'stat'
 			'You talk about your self-confidence problem, and Dr. Pavlov makes some suggestions, and asks some pointed questions. Although he makes you look at your own actions and desires closely, making you aware of your own issues, it somehow makes you feel better about yourself.'
 			'"Please, visit me again if you have any further problems, I will be glad to help!" Says Dr. Pavlov, as he escort you out of his door.'
@@ -71,6 +71,7 @@ if $ARGS[0] = '':
 		end
 		act 'Hypnotherapy':gt 'therapist', 'hypno'
 	end
+!{ Temporarily disabled until sub & dom sexual traits/preferences are added
 	act 'Raise your dominance':
 		cla
 		*clr
@@ -109,7 +110,7 @@ if $ARGS[0] = '':
 			act 'Leave':gt $loc
 		end
 		act 'Hypnotherapy':gt 'therapist', 'hypno'
-	end
+	end}
 !{	act 'Hypnotherapy to fight addiction':
 		cls
 		money -= 1000
@@ -168,12 +169,14 @@ if $ARGS[0] = 'hypno':
 		if $therapy = 'confidence':
 			pcs_willpwr += rand(1,2)
 			$session = 'You will feel more confident. You are smart, beautiful, and if other people has other opinions, that is their problem. You know what you want, and do not fear to act upon your desires."<br>...<br>...<br>..."'
+		!{ Already disabled up top, but for the sake of marking it..
 		elseif $therapy = 'dominance':
 			pcs_dom += rand(1,2)
 			$session = 'You like to do what you want to do. It pleases you if people do what you tell them to do, or act according to your wishes, and you like to cause them pleasure this way. You have to be in control constantly, but that means others around you can relax."<br>...<br>...<br>..."'
 		elseif $therapy = 'submission':
 			sub += rand(1,2)
 			$session = 'You want to be told what to do and what to think, what to feel and whom to please. Obeying others pleases you because it pleases them, and for a while you do not have to take responsibility for your actions."<br>...<br>...<br>..."'
+		}
 		elseif $therapy = 'trauma':
 			pcs_childtrauma -= rand(2,4)
 			if pcs_childtrauma >0:
@@ -216,7 +219,39 @@ if $ARGS[0] = 'hypno':
 					act 'Wake up':gt 'therapist', 'hypnoEnd'
 				end
 			end
-		else				
+		else
+			! Dont know what $ARGS[0] would be appropriate here.. technically youre resisting stripping down, but it eventually ends up as some form of sex... The whole point is that once you give in youre under his control.
+			gs 'willpower', 'sex', 'resist'
+			! adding a modifier for hypnotime? (more influence - harder checks?)
+			will_cost += hypnotime
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay', 'resist'
+					minut += 5
+					cla
+					if sound = 0:PLAY 'sound/rainstorm.mp3',20 & PLAY 'sound/clock.mp3',40
+					'<font color=brown>'
+					if hypnostrength <=5:
+						'Your body tenses and you shake your head as you reject Dr. Pavlov''s suggestion to remove your clothing. Seeing that you might awaken, he quickly tells you to forget the idea of undressing. As the suggestion fades from your memory, you once again relax.'
+						'"Hmmm," Dr. Pavlov muses, "Your will is quite strong, it may take some time to break you - but you will break."'
+						act 'Wake up':gt 'therapist', 'hypnoEnd'
+					elseif hypnostrength <=10:
+						'Your body tenses and you frown as you resist Dr. Pavlov''s suggestion to strip. The doctor frowns but orders you to forget the idea of undressing, for now. You relax as you comply with his order to forget.'
+						'"Soon you will be unable to resist me, my dear." he murmurs as he lightly traces the shape of your breast through your clothes, "Then we will have some fun."'
+						act 'Wake up':gt 'therapist', 'hypnoEnd'
+					elseif hypnostrength <=15:
+						'Your brow wrinkles and you frown as you fight the doctor''s suggestion and he quickly tells you to forget that he asked. As the command fades from your memory, you relax once more.'
+						'"It would appear that you are not yet ready to play, but it won''t be long now, <i>Cunt</i>." Dr. Pavlov mutters in mild frustration.' 
+						act 'Wake up':gt 'therapist', 'hypnoEnd'
+					else
+						'You frown slightly as your hands start to move towards your waist to unfasten your clothes then return to your side before once again beginning to move. Your frown deepens and Dr. Pavlov tells you to forget the command before the conflict awakens you. You relax once more as the doctor sighs in frustration.'
+						'"We are very close to a breakthrough, my little <i> Cunt </i>." he whispers in your ear as he caresses your breasts making your nipples stiffen, "You won''t resist me much longer and then you''ll be mine to enjoy."'
+						act 'Wake up':gt 'therapist', 'hypnoEnd'
+					end
+				end
+			else
+				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 'Taking off clothes':
 				if hypnosexing = 0: hypnosexing = 1 & hidden_guy += 1
 				minut += 5
@@ -453,9 +488,9 @@ if $ARGS[0] = 'hypnoEnd':
 	elseif hypnoTime < 10:
 		hypnoAddict = 1
 		hypnoDay = daystart
-		i += (100+sub-pcs_dom)/25+1
+		i += (200-willpowermax)/25+1
 		gs 'exhibitionism', i
-		inhib_exp += (100+sub-pcs_dom)/25+1
+		inhib_exp += (200-willpowermax)/25+1
 		pain['vaginal'] -= 5
 		pain['asshole'] -= 5
 		pcs_horny = 40
@@ -466,9 +501,9 @@ if $ARGS[0] = 'hypnoEnd':
 	else
 		hypnoAddict = 2
 		hypnoDay = daystart
-		i += (100+sub-pcs_dom)/25+2
+		i += (200-willpowermax)/25+2
 		gs 'exhibitionism', i
-		inhib_exp += (100+sub-pcs_dom)/25+1
+		inhib_exp += (200-willpowermax)/25+1
 		pain['vaginal'] -= 5
 		pain['asshole'] -= 5
 		pcs_horny = 60

locations/willpower.qsrc

@@ -127,6 +127,8 @@ if $ARGS[0] = 'calc':
 	elseif sick > 1:
 		will_calc += 5
 	end
+	
+	will_calc += pain['total']
 end
 
 if $ARGS[0] = 'hj':