[fixed/changed] extracted repeated code in flash and fixed typos which changed `ARGS[3]` into the never given `ARGS[4]`

locations/flash.qsrc

@@ -28,12 +28,8 @@
 !!	There is no continue action so you must add this as required
 !!	You should add checks for underwear before allowing the player to flash them but a non-event contingency is included
 
-if $ARGS[0] = 'panties': $ARGS[0] = 'panty'
-if $ARGS[0] = 'panties_rear': $ARGS[0] = 'pantyrear'
-if $ARGS[0] = 'butt' and analplugin = 1: $ARGS[0] = 'butt_plug'
 
-
-if $ARGS[0] = 'get_image' and $flash_image = '' and $flash_video = '':
+if $ARGS[0] = 'get_image':
 	flashVars['dress_ind_bra'] = 3
 	flashVars['dress_ind_tits'] = 12
 	flashVars['dress_ind_panty'] = 4
@@ -77,49 +73,73 @@ if $ARGS[0] = 'get_image' and $flash_image = '' and $flash_video = '':
 	flashVars['pants_out_full_hairy'] = 6
 
 
+	$flashVars['image'] = 'images/pc/activities/flashing/'
 	$flash_image = 'images/pc/activities/flashing/'
 	$temp_id_text = ''
 
 	if PCloSkirt > 0:
 		$temp_id_text += 'dress_'
-		$flash_image += 'dress/'
+		$flashVars['image'] += 'dress/'
 	else
 		$temp_id_text += 'pants_'
-		$flash_image += 'pants/'
+		$flashVars['image'] += 'pants/'
 	end
 	if $ARGS[2] = 'inside' or $ARGS[2] = 'indoors':
 		$temp_id_text += 'ind_'
-		$flash_image += 'inside/'
+		$flashVars['image'] += 'inside/'
 	else
 		$temp_id_text += 'out_'
-		$flash_image += 'outside/'
+		$flashVars['image'] += 'outside/'
 	end
 	$temp_id_text += $ARGS[1]
-	$flash_image += $ARGS[1]
-	$flash_image += '/'
+	$flashVars['image'] += $ARGS[1]
+	$flashVars['image'] += '/'
 
 	if ($ARGS[1] = 'pussy' or $ARGS[1] = 'full') and pcs_pubes > 20:
 		$temp_id_text += '_hairy'
-		$flash_image += 'hairy'
+		$flashVars['image'] += 'hairy'
 	end
 
 	flashVars['rand'] = rand(1, flashVars[$temp_id_text])
-	$flash_image += str(flashVars['rand']) + '.jpg'
-
-	$flashVars['image'] = $flash_image
+	$flashVars['image'] += str(flashVars['rand']) + '.jpg'
 
 	killvar 'temp_id_text'
 end
 
 
 if $ARGS[0] = 'display_image':
-	if $flash_video = '':
-		'<center><img <<$set_imgh>> src="<<$flash_image>>"></center>'
-	else
+	if $flash_video ! '':
 		'<center><video autoplay loop src="<<$flash_video>>"></video></center>'
+	elseif $flash_image ! '':
+		'<center><img <<$set_imgh>> src="<<$flash_image>>"></center>'
 	end
 end
 
+! $ARGS[1] = 'type' (bra)
+! $ARGS[2] = 'location'
+! $ARGS[3] = 'arousal type' (flashlite vs flash)
+!  ARGS[4] = time
+!  ARGS[5] = option
+if $ARGS[0] = 'generate_output':
+	if ARGS[5] < 1:
+		*clr
+		$flash_text[0] = $flashVars['text_before']
+		$flash_text[1] = $flashVars['text_after']
+	end
+
+	if ARGS[5] ! 1:
+		if $flash_image = '': $flash_image = $flashVars['image']
+		gs 'flash', 'display_image'
+	end
+
+	if $flash_text[0] ! '': '<<$flash_text[0]>>'
+	gs 'arousal', $ARGS[3], ARGS[4]
+	if ARGS[5] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[4], ARGS[5]
+	if $flash_text[1] ! '': '<<$flash_text[1]>>'
+
+	gs 'arousal', 'end'
+	gs 'flash', 'cleanup', ARGS[5]
+end
 
 
 
@@ -130,166 +150,83 @@ end
 	!!=========================================================!!
 
 
+! $ARGS[0] = 'type' (bra)
+! $ARGS[1] = 'location'
+!  ARGS[2] = time
+!  ARGS[3] = option1
 if $ARGS[0] = 'bra':
 	if Exhibitionist_lvl < 1 or pcs_inhib < 40: gs 'flash', 'exhibitionism', 1
 
-	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_before'] = 'You glance around to see who is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
 	$flashVars['text_after'] = 'You pull your top back down, feeling the thrill of excitement running down your spine.'
+	gs 'flash', 'get_image', 'bra', $ARGS[1]
 
-	if ARGS[3] < 1:
-		*clr
-		$flash_text[0] = $flashVars['text_before']
-		$flash_text[1] = $flashVars['text_after']
-	end
-
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
-	if ARGS[4] ! 1: gs 'flash', 'display_image'
-
-	if $flash_text[0] ! '': '<<$flash_text[0]>>'
-	gs 'arousal', 'flashlite', ARGS[2]
-	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
-	if $flash_text[1] ! '': '<<$flash_text[1]>>'
-	gs 'arousal', 'end'
-
-	gs 'flash', 'cleanup', ARGS[3]
+	gs 'flash', 'generate_output', 'bra', $ARGS[1], 'flashlite', ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'tits':
 	gs 'flash', 'exhibitionism', 1
 
-	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-	$flashVars['text_before'] = 'You pull your top back down, feeling the thrill of excitement running down your spine.'
-
-	if ARGS[3] < 1:
-		$flash_text[0] = $flashVars['text_before']
-		$flash_text[1] = $flashVars['text_after']
-	end
-
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
-	if ARGS[4] ! 1: gs 'flash', 'display_image'
-
-	if $flash_text[0] ! '': '<<$flash_text[0]>>'
-	gs 'arousal', 'flashlite', ARGS[2]
-	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
-	if $flash_text[1] ! '': '<<$flash_text[1]>>'
-	gs 'arousal', 'end'
+	$flashVars['text_before'] = 'You glance around to see who is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_after'] = 'You pull your top back down, feeling the thrill of excitement running down your spine.'
+	gs 'flash', 'get_image', 'tits', $ARGS[1]
 
-	gs 'flash', 'cleanup', ARGS[3]
+	gs 'flash', 'generate_output', 'tits', $ARGS[1], 'flash', ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'panty' or $ARGS[0] = 'panties':
 	gs 'flash', 'exhibitionism', 2
 
-	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you ' + iif(PCloSkirt > 0, 'lift the front of your skirt', 'pull down the front of your pants') + ' to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-	$flashVars['text_before'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
-
-	if ARGS[3] < 1:
-		$flash_text[0] = $flashVars['text_before']
-		$flash_text[1] = $flashVars['text_after']
-	end
-
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
-	if ARGS[4] ! 1: gs 'flash', 'display_image'
-
-	if $flash_text[0] ! '': '<<$flash_text[0]>>'
-	gs 'arousal', 'flash', ARGS[2]
-	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
-	if $flash_text[1] ! '': '<<$flash_text[1]>>'
-	gs 'arousal', 'end'
+	$flashVars['text_before'] = 'You glance around to see who is in the area, then you ' + iif(PCloSkirt > 0, 'lift the front of your skirt', 'pull down the front of your pants') + ' to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_after'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+	gs 'flash', 'get_image', 'panty', $ARGS[1]
 
-	gs 'flash', 'cleanup', ARGS[3]
+	gs 'flash', 'generate_output', 'panty', $ARGS[1], 'flash', ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'pantyrear' or $ARGS[0] = 'panties_rear':
 	gs 'flash', 'exhibitionism', 2
 
-	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull ' + iif(PCloSkirt > 0, 'up your skirt', 'down the back of your pants') + ' to show off your panty-clad butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-	$flashVars['text_before'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+	$flashVars['text_before'] = 'You glance around to see who is in the area, then you pull ' + iif(PCloSkirt > 0, 'up your skirt', 'down the back of your pants') + ' to show off your panty-clad butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_after'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+	gs 'flash', 'get_image', 'pantyrear', $ARGS[1]
 
-	if ARGS[3] < 1:
-		$flash_text[0] = $flashVars['text_before']
-		$flash_text[1] = $flashVars['text_after']
-	end
-
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
-	if ARGS[4] ! 1: gs 'flash', 'display_image'
-
-	if $flash_text[0] ! '': '<<$flash_text[0]>>'
-	gs 'arousal', 'flash', ARGS[2]
-	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
-	if $flash_text[1] ! '': '<<$flash_text[1]>>'
-	gs 'arousal', 'end'
-
-	gs 'flash', 'cleanup', ARGS[3]
+	gs 'flash', 'generate_output', 'pantyrear', $ARGS[1], 'flash', ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'butt' or $ARGS[0] = 'butt_plug':
 	gs 'flash', 'exhibitionism', 2
 
-	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull ' + iif(PCloSkirt > 0, 'up the back of your skirt', 'down the back of your pants') + ' to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-	$flashVars['text_before'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+	$flashVars['text_before'] = 'You glance around to see who is in the area, then you pull ' + iif(PCloSkirt > 0, 'up the back of your skirt', 'down the back of your pants') + ' to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_after'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
 
-	if ARGS[3] < 1:
-		$flash_text[0] = $flashVars['text_before']
-		$flash_text[1] = $flashVars['text_after']
+	if analplugin = 0:
+		gs 'flash', 'get_image', 'butt', $ARGS[1]
+		gs 'flash', 'generate_output', 'butt', $ARGS[1], 'flash', ARGS[2], ARGS[3]
+	else
+		gs 'flash', 'get_image', 'butt_plug', $ARGS[1]
+		gs 'flash', 'generate_output', 'butt_plug', $ARGS[1], 'flash', ARGS[2], ARGS[3]
 	end
-
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
-	if ARGS[4] ! 1: gs 'flash', 'display_image'
-
-	if $flash_text[0] ! '': '<<$flash_text[0]>>'
-	gs 'arousal', 'flash', ARGS[2]
-	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
-	if $flash_text[1] ! '': '<<$flash_text[1]>>'
-	gs 'arousal', 'end'
-
-	gs 'flash', 'cleanup', ARGS[3]
 end
 
 if $ARGS[0] = 'pussy':
 	gs 'flash', 'exhibitionism', 3
 
-	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull ' + iif(PCloSkirt > 0, 'up the front of your skirt', 'down the front of your pants') + ' to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-	$flashVars['text_before'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
-
-	if ARGS[3] < 1:
-		$flash_text[0] = $flashVars['text_before']
-		$flash_text[1] = $flashVars['text_after']
-	end
-
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
-	if ARGS[4] ! 1: gs 'flash', 'display_image'
-
-	if $flash_text[0] ! '': '<<$flash_text[0]>>'
-	gs 'arousal', 'flash', ARGS[2]
-	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
-	if $flash_text[1] ! '': '<<$flash_text[1]>>'
-	gs 'arousal', 'end'
+	$flashVars['text_before'] = 'You glance around to see who is in the area, then you pull ' + iif(PCloSkirt > 0, 'up the front of your skirt', 'down the front of your pants') + ' to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_after'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+	gs 'flash', 'get_image', 'pussy', $ARGS[1]
 
-	gs 'flash', 'cleanup', ARGS[3]
+	gs 'flash', 'generate_output', 'pussy', $ARGS[1], 'flash', ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'full':
 	gs 'flash', 'exhibitionism', 3
 
-	$flashflashVars['text_before'] = 'Making sure there are no children around and it''s not too busy you ' + iif(PCloSkirt > 0, 'lift your skirt and top', 'lower your pants and lift your top') + ' to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly.'
-	$flashVars['text_before'] = 'You quickly cover up again enjoying a buzz of excitement.'
-
-	if ARGS[3] < 1:
-		$flash_text[0] = $flashVars['text_before']
-		$flash_text[1] = $flashVars['text_after']
-	end
-
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
-	if ARGS[4] ! 1: gs 'flash', 'display_image'
-
-	if $flash_text[0] ! '': '<<$flash_text[0]>>'
-	gs 'arousal', 'flash', ARGS[2]
-	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
-	if $flash_text[1] ! '': '<<$flash_text[1]>>'
-	gs 'arousal', 'end'
+	$flashVars['text_before'] = 'Making sure there are no children around and it''s not too busy you ' + iif(PCloSkirt > 0, 'lift your skirt and top', 'lower your pants and lift your top') + ' to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly.'
+	$flashVars['text_after'] = 'You quickly cover up again enjoying a buzz of excitement.'
+	gs 'flash', 'get_image', 'full', $ARGS[1]
 
-	gs 'flash', 'cleanup', ARGS[3]
+	gs 'flash', 'generate_output', 'full', $ARGS[1], 'flash', ARGS[2], ARGS[3]
 end
 
 !!For us only when Sveta chooses to flash