Ver código fonte

Merge branch 'pain-rework' of Lusticon/glife into master

[changed] Since there are places with wrong calls like: gs 'pain', 'asscheeks', 'spank', 2 gs 'pain', 3, 'spank', 'nipples' here a rewritten version with universal ARGS order
Kevin_Smarts 4 meses atrás
pai
commit
3b3c5af252
1 arquivos alterados com 72 adições e 132 exclusões
  1. 72 132
      locations/pain.qsrc

+ 72 - 132
locations/pain.qsrc

@@ -12,147 +12,87 @@
 !Format to use: gs 'pain', n, 'BobyPart', 'Act'
 !For pain to multiple body parts, use multiple calls
 
-pain[1] = min(ARGS[0],9)
-if pain[1]<1:exit 
+pain[1] = min(ARGS[0]+ARGS[1]+ARGS[2],9)
+if pain[1]<1: exit
 
-if	   $ARGS[2] = 'slap':
-	pain[2] = 1
-elseif $ARGS[2] = 'bind':
-	pain[2] = 1
-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':
-	pain[2] = 5
-elseif $ARGS[2] = 'stretch':
-	pain[2] = 6
-elseif $ARGS[2] = 'slam':
-	pain[2] = 6
-elseif $ARGS[2] = 'burn':
-	pain[2] = 7
-elseif $ARGS[2] = 'freeze':
-	pain[2] = 7
-elseif $ARGS[2] = 'hit':
-	pain[2] = 7
-elseif $ARGS[2] = 'pierce':
-	pain[2] = 8
-elseif $ARGS[2] = 'bite':
-	pain[2] = 8
-elseif $ARGS[2] = 'tear':
-	pain[2] = 9
-elseif $ARGS[2] = 'ache':
-	pain[2] = 9
-elseif $ARGS[2] = 'kick':
-	pain[2] = 10
-elseif $ARGS[2] = 'break':
-	pain[2] = 10
-elseif $ARGS[2] = 'cramp':
-	pain[2] = 10
-end
+pain[2] = 0
+if arrpos('$ARGS', 'slap') >= 0:    pain[2] = 1
+if arrpos('$ARGS', 'bind') >= 0:    pain[2] = 1
+if arrpos('$ARGS', 'spank') >= 0:   pain[2] = 3 & spank += 1
+if arrpos('$ARGS', 'choke') >= 0:   pain[2] = 3
+if arrpos('$ARGS', 'shock') >= 0:   pain[2] = 4
+if arrpos('$ARGS', 'twist') >= 0:   pain[2] = 4
+if arrpos('$ARGS', 'pull') >= 0:    pain[2] = 4	
+if arrpos('$ARGS', 'fall') >= 0:    pain[2] = 4
+if arrpos('$ARGS', 'labor') >= 0:   pain[2] = 4
+if arrpos('$ARGS', 'pinch') >= 0:   pain[2] = 5
+if arrpos('$ARGS', 'stretch') >= 0: pain[2] = 6
+if arrpos('$ARGS', 'slam') >= 0:    pain[2] = 6
+if arrpos('$ARGS', 'burn') >= 0:    pain[2] = 7
+if arrpos('$ARGS', 'freeze') >= 0:  pain[2] = 7
+if arrpos('$ARGS', 'hit') >= 0:     pain[2] = 7
+if arrpos('$ARGS', 'pierce') >= 0:  pain[2] = 8
+if arrpos('$ARGS', 'bite') >= 0:    pain[2] = 8
+if arrpos('$ARGS', 'tear') >= 0:    pain[2] = 9
+if arrpos('$ARGS', 'ache') >= 0:    pain[2] = 9
+if arrpos('$ARGS', 'kick') >= 0:    pain[2] = 10
+if arrpos('$ARGS', 'break') >= 0:   pain[2] = 10
+if arrpos('$ARGS', 'cramp') >= 0:   pain[2] = 10
+if pain[2]<1: exit
 
-if	   $ARGS[1] = 'hair':
-	pain[3] = 1
-elseif $ARGS[1] = 'asscheeks':
-	pain[3] = 2
-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':
-	pain[3] = 2
-elseif $ARGS[1] = 'cheeks':
-	pain[3] = 3
-elseif $ARGS[1] = 'legL':
-	pain[3] = 3
-elseif $ARGS[1] = 'legR':
-	pain[3] = 3
-elseif $ARGS[1] = 'hands':
-	pain[3] = 3
-elseif $ARGS[1] = 'mouth':
-	pain[3] = 4
-elseif $ARGS[1] = 'jaw':
-	pain[3] = 4
-elseif $ARGS[1] = 'thighs':
-	pain[3] = 4
-elseif $ARGS[1] = 'toes':
-	pain[3] = 4
-elseif $ARGS[1] = 'fingers':
-	pain[3] = 4
-elseif $ARGS[1] = 'nose':
-	pain[3] = 5
-elseif $ARGS[1] = 'back':
-	pain[3] = 5
-elseif $ARGS[1] = 'ribs':
-	pain[3] = 5
-elseif $ARGS[1] = 'hips':
-	pain[3] = 5
-elseif $ARGS[1] = 'head':
-	pain[3] = 6
-elseif $ARGS[1] = 'ears':
-	pain[3] = 6
-elseif $ARGS[1] = 'eyebrows':
-	pain[3] = 6
-elseif $ARGS[1] = 'lips':
-	pain[3] = 6
-elseif $ARGS[1] = 'throat':
-	pain[3] = 6
-elseif $ARGS[1] = 'tummy':
-	pain[3] = 6
-elseif $ARGS[1] = 'pubic':
-	pain[3] = 6
-elseif $ARGS[1] = 'urethra':
-	pain[3] = 6
-elseif $ARGS[1] = 'tongue':
-	pain[3] = 7
-elseif $ARGS[1] = 'neck':
-	pain[3] = 7
-elseif $ARGS[1] = 'chest':
-	pain[3] = 7
-elseif $ARGS[1] = 'eyes':
-	pain[3] = 8
-elseif $ARGS[1] = 'breasts':
-	pain[3] = 8
-elseif $ARGS[1] = 'vaginal':
-	pain[3] = 8
-elseif $ARGS[1] = 'labia':
-	pain[3] = 8
-elseif $ARGS[1] = 'cervix':
-	pain[3] = 8
-elseif $ARGS[1] = 'asshole':
-	pain[3] = 9
-elseif $ARGS[1] = 'nipples':
-	pain[3] = 9
-elseif $ARGS[1] = 'clitoris':
-	pain[3] = 10
-end
+pain[3] = 0
+if arrpos('$ARGS', 'hair') >= 0:      pain[3] = 1  & $painPart = 'hair'
+if arrpos('$ARGS', 'asscheeks') >= 0: pain[3] = 2  & $painPart = 'asscheeks'
+if arrpos('$ARGS', 'feet') >= 0:      pain[3] = 2  & $painPart = 'feet'
+if arrpos('$ARGS', 'shoulders') >= 0: pain[3] = 2  & $painPart = 'shoulders'
+if arrpos('$ARGS', 'wrists') >= 0:    pain[3] = 2  & $painPart = 'wrists'
+if arrpos('$ARGS', 'ankles') >= 0:    pain[3] = 2  & $painPart = 'ankles'
+if arrpos('$ARGS', 'armL') >= 0:      pain[3] = 2  & $painPart = 'armL'
+if arrpos('$ARGS', 'armR') >= 0:      pain[3] = 2  & $painPart = 'armR'
+if arrpos('$ARGS', 'cheeks') >= 0:    pain[3] = 3  & $painPart = 'cheeks'
+if arrpos('$ARGS', 'legL') >= 0:      pain[3] = 3  & $painPart = 'legL'
+if arrpos('$ARGS', 'legR') >= 0:      pain[3] = 3  & $painPart = 'legR'
+if arrpos('$ARGS', 'hands') >= 0:     pain[3] = 3  & $painPart = 'hands'
+if arrpos('$ARGS', 'mouth') >= 0:     pain[3] = 4  & $painPart = 'mouth'
+if arrpos('$ARGS', 'jaw') >= 0:       pain[3] = 4  & $painPart = 'jaw'
+if arrpos('$ARGS', 'thighs') >= 0:    pain[3] = 4  & $painPart = 'thighs'
+if arrpos('$ARGS', 'toes') >= 0:      pain[3] = 4  & $painPart = 'toes'
+if arrpos('$ARGS', 'fingers') >= 0:   pain[3] = 4  & $painPart = 'fingers'
+if arrpos('$ARGS', 'nose') >= 0:      pain[3] = 5  & $painPart = 'nose'
+if arrpos('$ARGS', 'back') >= 0:      pain[3] = 5  & $painPart = 'back'
+if arrpos('$ARGS', 'ribs') >= 0:      pain[3] = 5  & $painPart = 'ribs'
+if arrpos('$ARGS', 'hips') >= 0:      pain[3] = 5  & $painPart = 'hips'
+if arrpos('$ARGS', 'head') >= 0:      pain[3] = 6  & $painPart = 'head'
+if arrpos('$ARGS', 'ears') >= 0:      pain[3] = 6  & $painPart = 'ears'
+if arrpos('$ARGS', 'eyebrows') >= 0:  pain[3] = 6  & $painPart = 'eyebrows'
+if arrpos('$ARGS', 'lips') >= 0:      pain[3] = 6  & $painPart = 'lips'
+if arrpos('$ARGS', 'throat') >= 0:    pain[3] = 6  & $painPart = 'throat'
+if arrpos('$ARGS', 'tummy') >= 0:     pain[3] = 6  & $painPart = 'tummy'
+if arrpos('$ARGS', 'pubic') >= 0:     pain[3] = 6  & $painPart = 'pubic'
+if arrpos('$ARGS', 'urethra') >= 0:   pain[3] = 6  & $painPart = 'urethra'
+if arrpos('$ARGS', 'tongue') >= 0:    pain[3] = 7  & $painPart = 'tongue'
+if arrpos('$ARGS', 'neck') >= 0:      pain[3] = 7  & $painPart = 'neck'
+if arrpos('$ARGS', 'chest') >= 0:     pain[3] = 7  & $painPart = 'chest'
+if arrpos('$ARGS', 'eyes') >= 0:      pain[3] = 8  & $painPart = 'eyes'
+if arrpos('$ARGS', 'breasts') >= 0:   pain[3] = 8  & $painPart = 'breasts'
+if arrpos('$ARGS', 'vaginal') >= 0:   pain[3] = 8  & $painPart = 'vaginal'
+if arrpos('$ARGS', 'labia') >= 0:     pain[3] = 8  & $painPart = 'labia'
+if arrpos('$ARGS', 'cervix') >= 0:    pain[3] = 8  & $painPart = 'cervix'
+if arrpos('$ARGS', 'asshole') >= 0:   pain[3] = 9  & $painPart = 'asshole'
+if arrpos('$ARGS', 'nipples') >= 0:   pain[3] = 9  & $painPart = 'nipples'
+if arrpos('$ARGS', 'clitoris') >= 0:  pain[3] = 10 & $painPart = 'clitoris'
+if pain[3]<1: exit
 
 curpain = (pain[1] * pain[2] * pain[3]) /10
-prevpain = pain[$ARGS[1]]
+prevpain = pain[$painPart]
 
-pain[$ARGS[1]] = func( 'shortgs','modul',prevpain,curpain)
+pain[$painPart] = func( 'shortgs','modul',prevpain,curpain)
 
-if pain[$ARGS[1]] > 100: pain[$ARGS[1]] = 100
+if pain[$painPart] > 100: pain[$painPart] = 100
 
 killvar 'prevpain'
 killvar 'curpain'
+killvar '$painPart'
 
 !arousal calculation
 !arousal += (pain[1] * pain[2]) * pain[3] * masochism['pref'] / 1000