[fixed] renamed 'sex_other' willpower calls to 'foreplay' + added missing 'kiss' option to list of willpower actions + fixed two willpower calls in katjaEvDin

locations/Gnpc_cinema.qsrc

@@ -24,7 +24,7 @@ act 'Watch the movie':
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		'You have been watching a movie and suddenly felt a hand on my knee Man.'
 
-		gs 'willpower', 'sex_other', 'self', 'easy'
+		gs 'willpower', 'foreplay', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Remove his hands (<<will_cost>> Willpower)':
 				cls

locations/annafrends.qsrc

@@ -258,7 +258,7 @@ 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.'
-			gs 'willpower', 'sex_other', 'resist', 'easy'
+			gs 'willpower', 'foreplay', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Step back (<<will_cost>> Willpower)':
 					*clr & cla

locations/clener.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'start':
 						'You drink the shitty vodka and it burns your throat. Your throat is on fire and you quickly grab some cheese to help soothe it. Sasha casually downs the glass and doesn''t even blink. "Ah, good one."'
 						'While you are leaning over to eat the sausage, you feel a light touch as the guard pats you on the buttocks.'
 
-						gs 'willpower', 'sex_other', 'self'
+						gs 'willpower', 'foreplay', 'self'
 						if will_cost <= pcs_willpwr:
 							act 'React (<<will_cost>> Willpower)':
 								cla

locations/katjaEvDin.qsrc

@@ -468,7 +468,7 @@ if $ARGS[0] = 'kuni_dom':
 						gs 'arousal', 'bj', 5, 'lesbian', 'sub', 'rough', 'deepthroat'
 						gs 'stat'
 
-						gs 'willpower', 'vaginal_strap', 'resist', 'hard'
+						gs 'willpower', 'vaginal', 'resist', 'hard'
 						if will_cost <= pcs_willpwr:
 							act 'Decline and go home (<<will_cost>> Willpower)':
 								gs 'willpower', 'pay', 'resist'
@@ -493,7 +493,7 @@ if $ARGS[0] = 'kuni_dom':
 							gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub', 'rough'
 							gs 'stat'
 
-							gs 'willpower', 'anal_strap', 'resist', 'hard'
+							gs 'willpower', 'anal', 'resist', 'hard'
 							if will_cost <= pcs_willpwr:
 								act 'Decline and go home (<<will_cost>> Willpower)':
 									gs 'willpower', 'pay', 'resist'

locations/postevents.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = '1':
 				'"Well?" you ask him sharply.'
 				'"You look... very sexy," the man confesses. He''s actually fairly attractive, despite his age.'
 				''
-				gs 'willpower', 'sex_other', 'force', 'easy'
+				gs 'willpower', 'foreplay', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Press on and seduce him (<<will_cost>> Willpower)':
 						*clr & cla

locations/train_incidental.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'breastfeedthebaby':
 					'Then you unlatch the baby and hand it to the father, then you cover yourself up. The man thanks you for the help.'
 					act 'Leave':gt $loc, $metka
 				end
-				gs 'willpower', 'sex_other', 'force'
+				gs 'willpower', 'foreplay', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Have him try your breast milk (<<will_cost>> Willpower)':
 						*clr & cla

locations/vann.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'v1':
 	'"Oops... Sorry, I''ll come back later." you say and turn to leave.'
 	'"Weel, no... It''s okay, you can stay, I''m almost finished." she says with a smile. You come back and go to the sink to wash your hands to keep yourself busy until she leaves. But she seems not to be in a hurry and, a couple of minutes later, she asks "Do you want your feet smeared too?"'
 
-	gs 'willpower', 'sex_other', 'resist', 'easy'
+	gs 'willpower', 'foreplay', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 			cla
@@ -252,7 +252,7 @@ if $ARGS[0] = 'v4':
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/bathroom/v10.jpg"></center>'
 		'You began to slowly crawl from the bathroom, covering your naked pussy, soapy water, and tried to close the chest hand that you do not really succeed. The guy kept watch over you and his smile grew wider, and then you realize that your hand is still stroking your pussy and his eyes only excites you. Making an effort you took the hand. He walked up to you and sat on the edge of the tub, lifted out of the water loofah handed to you, "Can I help you? ... I mean back rub, " he said. You sat and stared blankly at him not knowing what to say, and his hands were pulled down again.'
 
-		gs 'willpower', 'sex_other', 'resist', 'easy'
+		gs 'willpower', 'foreplay', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse (<<will_cost>> Willpower)':
 				*clr & cla

locations/vecher.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = 'end10':
 	'<center><img <<$set_imgh>> src="images/locations/shared/party/itog10.jpg"></center>'
 	'You get drunk and dance with some stranger who spends the whole time pawing at your tits and making dirty comments.'
 
-	gs 'willpower', 'sex_other', 'resist'
+	gs 'willpower', 'foreplay', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm','korr'
 	else

locations/willpower.qsrc

@@ -4,7 +4,7 @@
 !!Action: Determines what action sveta is resisting, forcing somebody to do or forcing herself to do
 !!List of actions: 
 !!		'voyeur', 'mast', 'hj', 'bj', 'cuni', 'sex', 'anal', 'group', 'gangbang', 'prostitution', 'swallow', 'cum_inside', 'cum_inside_anal', 'rape',
-!!		'humiliation', 'footjob', 'titjob', 'trib', 'rimming', 'BDSM', 'pee', 'cum_outside', 'drink', 'drugs', 'crime', 'exhib', 'sleep'
+!!		'kiss', 'humiliation', 'footjob', 'titjob', 'trib', 'rimming', 'BDSM', 'pee', 'cum_outside', 'drink', 'drugs', 'crime', 'exhib', 'sleep'
 !!		there is also 'foreplay' for things like touching and fondling
 !!		and two special cases 'misc' and 'skill' 
 !!Type: Determines what kind of willpower check sveta needs to do ('resist', 'force', 'self'). 

locations/worksalon.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if masharab = 1:
-			gs 'willpower', 'sex_other', 'force'
+			gs 'willpower', 'foreplay', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Tell Masha to give you a massage (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'force'
@@ -161,7 +161,7 @@ if $ARGS[0] = 'start':
 			end
 
 		elseif masha > 5 and masharab = 0:
-			gs 'willpower', 'sex_other', 'force', 'easy'
+			gs 'willpower', 'foreplay', 'force', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Ask Masha to give you a massage (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'force'