Merge remote-tracking branch 'Lusticon/master'

locations/Cum_Manage.qsrc

@@ -713,20 +713,15 @@ if $ARGS[0] = 'cum_stat_display':
 			$icon_txtloc = $txtloc
 		elseif i = 11:
 			if pcs_haircol = 0:
-				$cum_face_image = 'brown/'
-				$cum_face_image += rand(1,31)
+				$cum_face_image = 'brown/<<rand(1,31)>>'
 			elseif pcs_haircol = 1:
-				$cum_face_image = 'black/'
-				$cum_face_image += rand(1,23)
+				$cum_face_image = 'black/<<rand(1,23)>>'
 			elseif pcs_haircol = 2:
-				$cum_face_image = 'red/'
-				$cum_face_image += rand(1,19)
+				$cum_face_image = 'red/<<rand(1,19)>>'
 			elseif pcs_haircol = 3:
-				$cum_face_image = 'blonde/'
-				$cum_face_image += rand(1,25)
+				$cum_face_image = 'blonde/<<rand(1,25)>>'
 			elseif pcs_haircol > 3:
-				$cum_face_image = 'custom/'
-				$cum_face_image += rand(1,20)
+				$cum_face_image = 'custom/<<rand(1,20)>>'
 			end
 			$txtloc_adj = 'across '
 			$icon_txtloc = 'your face'

locations/city_experimental_trials_list.qsrc

@@ -138,78 +138,78 @@ if $ARGS[0] = $trial_sections[0]:
 		if temp_rand < 10:
 			$temp_pill_color = 'cyan'
 			$experimentQW['trial_active']     = 'pill_cyan'
-			$experimentQW['pill_cyan_taken'] += 1
-			 experimentQW['trial_duration']   = rand(1,3)
+			experimentQW['pill_cyan_taken'] += 1
+			experimentQW['trial_duration']   = rand(1,3)
 
 		!! Change stren, vital, or agil
 		elseif temp_rand < 20:
 			$temp_pill_color = 'red'
 			$experimentQW['trial_active']    = 'pill_red'
-			$experimentQW['pill_red_taken'] += 1
-			 experimentQW['trial_duration']  = rand(2,4)
+			experimentQW['pill_red_taken'] += 1
+			experimentQW['trial_duration']  = rand(2,4)
 
 		!! Change intel, cha, perception?
 		elseif temp_rand < 30:
 			$temp_pill_color = 'blue'
 			$experimentQW['trial_active']     = 'pill_blue'
-			$experimentQW['pill_blue_taken'] += 1
-			 experimentQW['trial_duration']   = rand(2,4)
+			experimentQW['pill_blue_taken'] += 1
+			experimentQW['trial_duration']   = rand(2,4)
 
 		!! Change skin
 		elseif temp_rand < 40:
 			$temp_pill_color = 'yellow'
 			$experimentQW['trial_active']       = 'pill_yellow'
-			$experimentQW['pill_yellow_taken'] += 1
-			 experimentQW['trial_duration']     = rand(2,5)
+			experimentQW['pill_yellow_taken'] += 1
+			experimentQW['trial_duration']     = rand(2,5)
 
 		!! Change butt
 		elseif temp_rand < 50:
 			$temp_pill_color = 'orange'
 			$experimentQW['trial_active']       = 'pill_orange'
-			$experimentQW['pill_orange_taken'] += 1
-			 experimentQW['trial_duration']     = rand(2,4)
+			experimentQW['pill_orange_taken'] += 1
+			experimentQW['trial_duration']     = rand(2,4)
 
 		!! Change inhib
 		elseif temp_rand < 60:
 			$temp_pill_color = 'violet'
 			$experimentQW['trial_active']       = 'pill_violet'
-			$experimentQW['pill_violet_taken'] += 1
-			 experimentQW['trial_duration']     = 1
+			experimentQW['pill_violet_taken'] += 1
+			experimentQW['trial_duration']     = 1
 
 		!! Change min_arousal
 		elseif temp_rand < 65:
 			$temp_pill_color = 'brown'
 			$experimentQW['trial_active']      = 'pill_brown'
-			$experimentQW['pill_brown_taken'] += 1
-			 experimentQW['trial_duration']    = rand(2,4)
+			experimentQW['pill_brown_taken'] += 1
+			experimentQW['trial_duration']    = rand(2,4)
 		
 		!! Change clit
 		elseif temp_rand < 70:
 			$temp_pill_color = 'purple'
 			$experimentQW['trial_active']     = 'pill_purple'
-			$experimentQW['pill_purple_taken'] += 1
-			 experimentQW['trial_duration']   = rand(2,4)
+			experimentQW['pill_purple_taken'] += 1
+			experimentQW['trial_duration']   = rand(2,4)
 
 		!! Change alko_status
 		elseif temp_rand < 80:
 			$temp_pill_color = 'green'
 			$experimentQW['trial_active']      = 'pill_green'
-			$experimentQW['pill_green_taken'] += 1
-			 experimentQW['trial_duration']    = 1
+			experimentQW['pill_green_taken'] += 1
+			experimentQW['trial_duration']    = 1
 
 		!! Give exhib level or change willwpower
 		elseif temp_rand < 85:
 			$temp_pill_color = 'gray'
 			$experimentQW['trial_active']     = 'pill_gray'
-			$experimentQW['pill_gray_taken'] += 1
-			 experimentQW['trial_duration']   = 1
+			experimentQW['pill_gray_taken'] += 1
+			experimentQW['trial_duration']   = 1
 
 		!! Give bimbo lvl or change willpower?
 		elseif temp_rand < 90:
 			$temp_pill_color = 'pink'
 			$experimentQW['trial_active']     = 'pill_pink'
-			$experimentQW['pill_pink_taken'] += 1
-			 experimentQW['trial_duration']   = 1
+			experimentQW['pill_pink_taken'] += 1
+			experimentQW['trial_duration']   = 1
 		end
 
 		experimentQW['times_participated_0'] += 1

locations/saveupdater.qsrc

@@ -3201,6 +3201,17 @@ end
 
 if temp_current_save_version < 00090301:
 !! use this for updates in 0.9.3
+	if val($experimentQW['pill_cyan_taken'])   > experimentQW['pill_cyan_taken']   : experimentQW['pill_cyan_taken']   = val($experimentQW['pill_cyan_taken'])
+	if val($experimentQW['pill_red_taken'])    > experimentQW['pill_red_taken']    : experimentQW['pill_red_taken']    = val($experimentQW['pill_red_taken'])
+	if val($experimentQW['pill_blue_taken'])   > experimentQW['pill_blue_taken']   : experimentQW['pill_blue_taken']   = val($experimentQW['pill_blue_taken'])
+	if val($experimentQW['pill_yellow_taken']) > experimentQW['pill_yellow_taken'] : experimentQW['pill_yellow_taken'] = val($experimentQW['pill_yellow_taken'])
+	if val($experimentQW['pill_orange_taken']) > experimentQW['pill_orange_taken'] : experimentQW['pill_orange_taken'] = val($experimentQW['pill_orange_taken'])
+	if val($experimentQW['pill_violet_taken']) > experimentQW['pill_violet_taken'] : experimentQW['pill_violet_taken'] = val($experimentQW['pill_violet_taken'])
+	if val($experimentQW['pill_brown_taken'])  > experimentQW['pill_brown_taken']  : experimentQW['pill_brown_taken']  = val($experimentQW['pill_brown_taken'])
+	if val($experimentQW['pill_purple_taken']) > experimentQW['pill_purple_taken'] : experimentQW['pill_purple_taken'] = val($experimentQW['pill_purple_taken'])
+	if val($experimentQW['pill_green_taken'])  > experimentQW['pill_green_taken']  : experimentQW['pill_green_taken']  = val($experimentQW['pill_green_taken'])
+	if val($experimentQW['pill_gray_taken'])   > experimentQW['pill_gray_taken']   : experimentQW['pill_gray_taken']   = val($experimentQW['pill_gray_taken'])
+	if val($experimentQW['pill_pink_taken'])   > experimentQW['pill_pink_taken']   : experimentQW['pill_pink_taken']   = val($experimentQW['pill_pink_taken'])
 end
 
 killvar 'temp_current_save_version'