Browse Source

[Edit] Added a few more pain options. Removed some useless code from willpower.

CroWke 5 years ago
parent
commit
70e6a95630
2 changed files with 16 additions and 20 deletions
  1. 13 2
      locations/pain.qsrc
  2. 3 18
      locations/willpower.qsrc

+ 13 - 2
locations/pain.qsrc

@@ -4,10 +4,11 @@
 !$ARGS[1] should equal the body part being hurt from any of the following:
 !BobyPart 'head', 'hair', 'ears', 'eyebrows', 'eyes', 'cheeks', 'nose', 'mouth', 'lips', 'tongue', 'throat', 'neck', 'back',
 !'asscheeks', 'asshole', 'hips', 'thighs', 'legL', 'legR', 'feet', 'toes', 'shoulders', 'armL', 'armR', 'handL', 'handR',
-!'fingers', 'chest', 'breasts', 'nipples', 'ribs', 'tummy', 'pubic', 'vaginal', 'labia', 'clitoris', 'urethra', 'cervix'
+!'fingers', 'chest', 'breasts', 'nipples', 'ribs', 'tummy', 'pubic', 'vaginal', 'labia', 'clitoris', 'urethra', 'cervix',
+!'wrists', 'ankles'
 !$ARGS[2] The action the participant has performed on Sveta (some of these can cause arousal if Sveta is into pain)
 !Acts: 'pierce', 'slap', 'spank', 'pinch', 'bite', 'burn', 'freeze', 'hit', 'kick', 'Slam', 'shock', 'bind', 'stretch'
-!'tear', 'break', 'twist', 'ache', 'cramp', 'labor'
+!'tear', 'break', 'twist', 'ache', 'cramp', 'labor', 'choke', 'fall', 'pull'
 !Format to use: gs 'pain', n, 'BobyPart', 'Act'
 !For pain to multiple body parts, use multiple calls
 
@@ -21,10 +22,16 @@ elseif $ARGS[2] = 'bind':
 elseif $ARGS[2] = 'spank':
 	pain[2] = 3
 	spank += 1
+elseif $ARGS[2] = 'choke':
+	pain[2] = 3
 elseif $ARGS[2] = 'shock':
 	pain[2] = 4
 elseif $ARGS[2] = 'twist':
 	pain[2] = 4
+elseif $ARGS[2] = 'pull':
+	pain[2] = 4	
+elseif $ARGS[2] = 'fall':
+	pain[2] = 4
 elseif $ARGS[2] = 'labor':
 	pain[2] = 4
 elseif $ARGS[2] = 'pinch':
@@ -63,6 +70,10 @@ elseif $ARGS[1] = 'feet':
 	pain[3] = 2
 elseif $ARGS[1] = 'shoulders':
 	pain[3] = 2
+elseif $ARGS[1] = 'wrists':
+	pain[3] = 2
+elseif $ARGS[1] = 'ankles':
+	pain[3] = 2
 elseif $ARGS[1] = 'armL':
 	pain[3] = 2
 elseif $ARGS[1] = 'armR':

+ 3 - 18
locations/willpower.qsrc

@@ -133,7 +133,6 @@ end
 
 if $ARGS[0] = 'hj':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -160,7 +159,6 @@ end
 
 if $ARGS[0] = 'bj':
 	gs 'willpower', 'calc'
-	will_cost = 0
 		
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -187,7 +185,6 @@ end
 
 if $ARGS[0] = 'cuni':
 	gs 'willpower', 'calc'
-	will_cost = 0
 
 	cuni_check = (stat['cuni'] + stat['cuni_give']) / 2
 		
@@ -216,7 +213,6 @@ end
 	
 if $ARGS[0] = 'sex' or $ARGS[0] = 'vaginal':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -243,7 +239,6 @@ end
 	
 if $ARGS[0] = 'anal':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -270,7 +265,6 @@ end
 	
 if $ARGS[0] = 'gangbang' or $ARGS[0] = 'group':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -297,7 +291,6 @@ end
 	
 if $ARGS[0] = 'prostitution':
 	gs 'willpower', 'calc'
-	will_cost = 0
 		
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -326,7 +319,6 @@ end
 
 if $ARGS[0] = 'humiliation':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -349,7 +341,6 @@ end
 	
 if $ARGS[0] = 'swallow':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -372,7 +363,6 @@ end
 
 if $ARGS[0] = 'cum_inside':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	creampie_count = pcs_cp_safe_unknown + pcs_cp_notsafe_unknown + pcs_cp_risky_unknown
 		
@@ -397,7 +387,6 @@ end
 
 if $ARGS[0] = 'cum_inside_anal':
 	gs 'willpower', 'calc'
-	will_cost = 0
 		
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -421,7 +410,7 @@ end
 !! requires the skill to be named with the _lvl postfix
 if $ARGS[0] = 'skill':
 	gs 'willpower', 'calc'
-	will_cost = 0
+
 	if $ARGS[1] = 'resist' or $ARGS[1] = 'force' or $ARGS[1] = 'self':
 		if $ARGS[2] = 'inhib_lvl':
 			will_cost = (pcs_inhib + will_calc)/10
@@ -439,7 +428,6 @@ end
 		
 if $ARGS[0] = 'rape':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -458,7 +446,6 @@ end
 
 if $ARGS[0] = 'drink':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		will_cost = (60 - alcohol_exp * 40 + will_calc)/10
@@ -480,7 +467,6 @@ end
 !!Drug needs already included in the will_calc so just a small base cost here
 if $ARGS[0] = 'drugs':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		will_cost = (100 - addictive_trait_lvl * 30 + will_calc)/10
@@ -497,7 +483,7 @@ end
 
 if $ARGS[0] = 'crime':
 	gs 'willpower', 'calc'
-	will_cost = 0
+
 	if $ARGS[0] = 'force':
 		will_cost = (80 - will_enforced + will_calc)/10
 	else
@@ -507,7 +493,7 @@ end
 
 if $ARGS[0] = 'exhib':
 	gs 'willpower', 'calc'
-	will_cost = 0		
+		
 	if $ARGS[1] = 'self':
 		will_cost = (100 - Exhibitionist_lvl * 20 - pcs_inhib/5 + will_calc)/10
 	elseif $ARGS[1] = 'force':
@@ -527,7 +513,6 @@ end
 !!Choose this if nothing else fits
 if $ARGS[0] = 'misc':
 	gs 'willpower', 'calc'
-	will_cost = 0
 
 	if $ARGS[1] = 'force':
 		if $ARGS[2] = 'easy':