Merge remote-tracking branch 'Anjuna/master'

locations/blackmailer.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'init_check':
 		temp_prob_chance -= 100
 	end
 
-	if rand(0, temp_prob_chance) >= 2: exit
+	if rand(0, temp_prob_chance) >= 5: exit
 	killvar 'temp_prob_chance'
 
 	gs 'blackmailer', 'init_blackmail', $ARGS[1]
@@ -46,20 +46,22 @@ if $ARGS[0] = 'init_blackmail':
 	else
 		$blackmailQW['init_flashaction'] = $ARGS[1]
 	end
-		
 
 	$blackmailQW['init_flashimage'] = $flash_image
 	$blackmailQW['init_flashloc'] = $loc
 	$blackmailQW['init_flashloc_arg'] = $loc_arg
 
-
-	if strpos($loc, 'park') >= 0:
+	if strpos($loc, 'park') > -1:
+		$blackmailQW['init_flashloc_desc'] = 'in a park'
 		'A flash of light briefly brightens the surrounding trees and you see a shadow darting between the trees. The light of the camera flash prickling on your exposed skin.'
-	elseif strpos($loc, 'church') >= 0:
+	elseif strpos($loc, 'church') > -1:
+		$blackmailQW['init_flashloc_desc'] = 'in a park'
 		'The flash of a camera illuminates the inside of the church, but the source eludes you.'
-	elseif strpos($loc, 'zaprF') >= 0:
+	elseif strpos($loc, 'zaprF') > -1:
+		$blackmailQW['init_flashloc_desc'] = 'while washing cars'
 		'You briefly think a car turned on their headlights, before you realise it was the flash of a camera, the source of which already gone.'
 	else
+		$blackmailQW['init_flashloc_desc'] = ''
 		'You think you notice the flash of a camera from the corner of your eye, but its source is already out of view.'
 	end
 	if exhibitionist_lvl > 0:
@@ -97,7 +99,7 @@ end
 if $ARGS[0] = 'photo_dream1':
 	if blackmailQW['stage'] = 1: blackmailQW['stage'] = 2
 	blackmailQW['dream_day'] = daystart + 3
-	if strpos('panty_pantyrear_bra', $blackmailQW['init_flashtype']):
+	if strpos('panty_pantyrear_bra', $blackmailQW['init_flashaction']):
 		gs 'arousal', 'flashlite', -5
 	else
 		gs 'arousal', 'flash', -5
@@ -106,22 +108,14 @@ if $ARGS[0] = 'photo_dream1':
 
 	'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>.jpg"></center>'
 	$temp_dream_text = 'You dream about getting caught while flashing your '
-	$temp_dream_text += $blackmailQW['init_flashtype']
-	if strpos($loc, 'church') >= 0:
-		$temp_dream_text += ' in a church'
-	elseif strpos($loc, 'park') >= 0:
-		$temp_dream_text += ' in a park'
-	elseif strpos($loc, 'zaprF') >= 0:
-		$temp_dream_text += ' while washing cars'
-	end
+	$temp_dream_text += $blackmailQW['init_flashaction']
+	$temp_dream_text += ' ' + $blackmailQW['init_flashloc_desc']
 	$temp_dream_text += ', your skin prickling from the light of unending camera flashes.'
 
 	$temp_dream_text
 	killvar 'temp_dream_text'
-
 	gs 'dream_events', 'event_end'
 
-
 elseif $ARGS[0] = 'photo_dream2':
 	if blackmailQW['stage'] = 2: blackmailQW['stage'] = 3
 	blackmailQW['dreamday'] = daystart + 3
@@ -142,14 +136,8 @@ elseif $ARGS[0] = 'photo_dream2':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>.jpg"></center>'
 				$temp_dream_text = 'You get a clear look at the picture depicting you flashing your '
-				$temp_dream_text += $blackmailQW['init_flashtype']
-				if strpos($loc, 'church') >= 0:
-					$temp_dream_text += ' in a church'
-				elseif strpos($loc, 'park') >= 0:
-					$temp_dream_text += ' in a park'
-				elseif strpos($loc, 'zaprF') >= 0:
-					$temp_dream_text += ' while washing cars'
-				end
+				$temp_dream_text += $blackmailQW['init_flashaction']
+				$temp_dream_text += ' ' + $blackmailQW['init_flashloc_desc']
 				$temp_dream_text += '.'
 				$temp_dream_text
 				killvar '$temp_dream_text'
@@ -186,14 +174,8 @@ elseif $ARGS[0] = 'photo_dream2':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>.jpg"></center>'
 			$temp_dream_text = 'You grab one of the pictures and see yourself flashing your '
-			$temp_dream_text += $blackmailQW['init_flashtype']
-			if strpos($loc, 'church') >= 0:
-				$temp_dream_text += ' in a church'
-			elseif strpos($loc, 'park') >= 0:
-				$temp_dream_text += ' in a park'
-			elseif strpos($loc, 'zaprF') >= 0:
-				$temp_dream_text += ' while washing cars'
-			end
+			$temp_dream_text += $blackmailQW['init_flashaction']
+			$temp_dream_text += ' ' + $blackmailQW['init_flashloc_desc']
 			$temp_dream_text += '.'
 			$temp_dream_text
 			killvar '$temp_dream_text'
@@ -217,14 +199,8 @@ elseif $ARGS[0] = 'photo_dream2':
 			act 'Buy a newspaper':
 				'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>.jpg"></center>'
 				$temp_dream_text = 'The postmaster distandly hands you a newspaper, and on the front cover you see a picture of yourself flashing your '
-				$temp_dream_text += $blackmailQW['init_flashtype']
-				if strpos($loc, 'church') >= 0:
-					$temp_dream_text += ' in a church'
-				elseif strpos($loc, 'park') >= 0:
-					$temp_dream_text += ' in a park'
-				elseif strpos($loc, 'zaprF') >= 0:
-					$temp_dream_text += ' while washing cars'
-				end
+				$temp_dream_text += $blackmailQW['init_flashaction']
+				$temp_dream_text += ' ' + $blackmailQW['init_flashloc_desc']
 				$temp_dream_text += '.'
 				$temp_dream_text
 				killvar '$temp_dream_text'

locations/city_experimental_trials_events.qsrc

@@ -480,17 +480,15 @@ end
 if $experimentQW['trial_active'] = 'hair_cream':
 	pcs_hairlng += rand(20, 50)
 	defcurly = rand(0, 1)
+	curly = defcurly
 
 	if experimentQW['trial_duration'] > 1:
 		pcs_haircol = rand(0,22)
-		*nl
-		'You notice that your hair has lengthened and changed in color! This must have been that experimental hair extension shampoo.'
-
 	else
-		pcs_haircol = 23
-		*nl
-		'You notice that your hair has lengthened and changed in color! This must have been that experimental hair extension shampoo.'
+		pcs_haircol = 11
 	end
+	*nl
+	'You notice that your hair has lengthened and changed in color! This must have been that experimental hair extension shampoo.'
 end
 
 

locations/dream_events.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			end
 		end
 
-!!		if blackmailQW['stage'] >= 1 and daystart >= blackmailQW['dreamday']: gs 'blackmailer', 'blackmail_dreams'
+		if blackmailQW['stage'] >= 1 and daystart >= blackmailQW['dreamday']: gs 'blackmailer', 'blackmail_dreams'
 
 		gt 'dream_events', 'mod_sleepevents'
 	end

locations/sleep_reflections.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'event_check':
 		if anushkaQW['sveta_love'] = 10: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''anushka_love'' '
 	end
 	if daystart >= artemQW['sleep_reflection_day'] + 7:
-		if artemQW['bf'] >= 1: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''artem_love'' '
+		if artemQW['bf'] >= 1 and artemQW['love'] <= 0: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''artem_love'' '
 	end
 end
 

locations/wakeup_events.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events[] = 'gs ''wakeup_events'', ''mother_sextalk'' '
 		end
 
-		if $experimentQW['trial_active'] ! '':
+		if $experimentQW['trial_active'] ! '' and experimentQW['trial_duration'] > 0:
 			$sleep_events_priority[] = 'gs ''wakeup_events'', ''experimental_trials'' '
 		end