Browse Source

[fixed] Renamed variable to match 'arousal' file

KevinSmarts 5 years ago
parent
commit
488f7c0b9f
1 changed files with 9 additions and 9 deletions
  1. 9 9
      locations/willpower.qsrc

+ 9 - 9
locations/willpower.qsrc

@@ -5,7 +5,7 @@
 !!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'
-!!		there is also 'sex_other' for things like touching and fondling
+!!		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'). 
 !!		-'resist' is used if sveta is resisting to do the 'action' somebody else wants her to do. 
@@ -638,26 +638,26 @@ if $ARGS[0] = 'kiss':
 end
 
 ! Something for sex stuff that''s not covered by other caregories. Like touching, fondling, etc.
-if $ARGS[0] = 'sex_other':
+if $ARGS[0] = 'foreplay':
 	gs 'willpower', 'calc'
 	! Attempt at giving relevant things different weight. Throw away if it seems wrong
-	sex_other_check = ((stat['hj'] + stat['bj'])/2 + stat['vaginal'] + stat['anal'] + (stat['cuni'] + stat['trib'] + stat['massage'] + stat['massage_give'])/4)/4
+	foreplay_check = ((stat['hj'] + stat['bj'])/2 + stat['vaginal'] + stat['anal'] + (stat['cuni'] + stat['trib'] + stat['massage'] + stat['massage_give'])/4)/4
 	
 	if $ARGS[1] = 'self':
-		if sex_other_check <= 90:
-			will_cost = (100 - sex_other_check + will_calc)/10
+		if (stat['foreplay'] + stat['foreplay_give']) / 2 <= 90:
+			will_cost = (100 - ((stat['foreplay'] + stat['foreplay_give']) / 2) + will_calc)/10
 		else
 			will_cost = (10 + will_calc)/10
 		end
 	elseif $ARGS[1] = 'force':
-		if sex_other_check <= 40:
-			will_cost = (110 - will_enforced - sex_other_check + will_calc)/10
+		if stat['foreplay_give'] <= 40:
+			will_cost = (160 - will_enforced - stat['foreplay_give'] + will_calc)/10
 		else
 			will_cost = (70 - will_enforced + will_calc)/10
 		end	
 	else
-		if sex_other_check <= 90:
-			will_cost = (10 + sex_other_check + will_calc)/10
+		if stat['foreplay'] <= 90:
+			will_cost = (10 + stat['foreplay'] + will_calc)/10
 		else
 			will_cost = (100 + will_calc)/10
 		end