1
0
Переглянути джерело

[changed] Changed to npc_set_preference from npc_add_preference, for clearer communication of what the function does.
Also implemented automatic cleanup of non-impacting preferences ('neutral' preferences that add 0 to the attraction).

anjuna krokus 7 місяців тому
батько
коміт
6f0d007ef3

+ 1 - 1
glife.qproj

@@ -73,7 +73,7 @@
 		<Location name="npc_relationship"/>
 		<Location name="npc_finder"/>
 		<Location name="npc_reactions"/>
-		<Location name="npc_add_preference"/>
+		<Location name="npc_set_preference"/>
 		<Location name="set_npc_attraction"/>
 		<Location name="pcs_has_attr"/>
 		<Location name="grades"/>

+ 0 - 192
locations/npc_add_preference.qsrc

@@ -1,192 +0,0 @@
-# npc_add_preference
-
-!! npc_code = 'A***', 'B***', 'C***', etc.
-
-!!	Full reset of npc preferences:
-!!		gs 'npc_add_preference', 'reset', npc_code
-!!
-!!	Add a preference to an npc:
-!!		gs 'npc_add_preference', npc_code, trait, amount
-!!		trait: = 'strong', 'cum_on_face', 'tits_big', 'ass_bubble', etc.
-!!
-!!		amount = 'hate', 'dislike', 'neutral', 'like', 'love'
-
-
-
-
-
-if $ARGS[0] = 'reset':
-	$npc_preferences[$ARGS[1]] = ''
-end
-
-
-!! $ARGS[0] = 'A***', 'B***', 'C***', etc.
-if isnum(mid($ARGS[0], 2)):
-	
-	!!Dynamically create the $npc_pref_traits and npc_trait_values arrays
-	dynamic $npc_preferences[$ARGS[0]]
-	dynamic $npc_pref_values[$ARGS[0]]
-	
-	!! Example of these created arrays.
-	!!$npc_pref_traits: npc_pref_traits[i] = 'strong'
-	!!npc_trait_values: npc_trait_values['strong'] = -15
-
-
-	!! Translate 'hate, dislike, etc. into a number and store it.'
-	temp_trait_value = func('npc_add_preference', 'get_value', $ARGS[1], $ARGS[2])
-
-
-	temp_skip_loop = 0
-	:skip_start
-
-	!! Escape the preference loops when overwriting a preference.
-	if temp_skip_loop = 0:
-		!!if the npc has no preferences, create the $npc_preferences and $npc_pref_values entries from scratch.
-		if arrsize('$npc_pref_traits') = 0:
-
-			!!replace(..., '	', '') is there to remove the tabs from the string.
-			$npc_preferences[$ARGS[0]] = replace({killvar '$npc_pref_traits'
-				$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
-			}, '	', '')
-
-			$npc_pref_values[$ARGS[0]] = replace({killvar 'npc_trait_values'
-				npc_trait_values} + "['<<$ARGS[1]>>'] = <<temp_trait_value>>" + {
-			}, '	', '')
-
-		else
-			!!loop over every preference to check if the npc already has a preference for that trait.
-			i = 0
-			:preference_loop
-
-				!!The npc already has a preference for the trait.
-				!!We overwrite the trait and then escape the preference_loop
-				if $npc_pref_traits = $ARGS[1]:
-					npc_trait_values[$ARGS[1]] = temp_trait_value
-
-					!!Rebuild the $npc_pref....[$ARGS[0]] strings from the grounds up
-					$temp_npc_pref_traits = {killvar '$npc_pref_traits'
-					}
-					$temp_npc_trait_values = {killvar 'npc_trait_values'
-					}
-
-					!!Loop over every preference and add it to the $npc_pref....[$ARGS[0]] strings.
-					i = 0
-					:pref_loop_2
-						$temp_npc_pref_traits += {$npc_pref_traits[] = } + "'<<$npc_pref_traits[i]>>'" + {
-						}
-						$temp_npc_trait_values += {npc_trait_values} + "['<<$npc_pref_traits[i]>>'] = <<npc_trait_values[i]>>" + {
-						}
-
-						i += 1
-					if i < arrsize('$npc_pref_traits'): jump 'pref_loop_2'
-
-
-					!!Overwrite the $npc_pref....[$ARGS[0]] strings with the rebuild string.
-					$npc_preferences[$ARGS[0]] = replace($temp_npc_pref_traits,    '	', '')
-					$npc_pref_values[$ARGS[0]] = replace($temp_npc_trait_values,   '	', '')
-
-					killvar '$temp_npc_pref_traits'
-					killvar '$temp_npc_trait_values'
-					killvar 'pref_loop_2'
-
-					temp_skip_loop = 1
-					jump 'skip_start'
-				end
-
-				i += 1
-			if i < arrsize('$npc_pref_traits'): jump 'preference_loop'
-
-			!!We have checked that the npc has no preference for the trait.
-			!!We add the preference to the npc.
-
-			$npc_preferences[$ARGS[0]] += replace({$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
-			}, '	', '')
-
-			$npc_pref_values[$ARGS[0]] += replace({npc_trait_values} + "['<<$ARGS[1]>>'] = <<temp_trait_value>>" + {
-			}, '	', '')
-		end
-	end
-
-	killvar '$npc_pref_traits'
-	killvar 'npc_trait_values'
-
-	killvar 'i'
-	killvar 'temp_skip_loop'
-	killvar 'skip_start'
-	killvar 'temp_value'
-end
-
-
-
-
-
-
-
-!!====================================!!
-!!                                    !!
-!!        Calculate pref_value        !!
-!!                                    !!
-!!====================================!!
-
-
-
-if $ARGS[0] = 'get_value':
-	temp_pref_values['hate']    = -30
-	temp_pref_values['dislike'] = -15
-	temp_pref_values['neutral'] =   0
-	temp_pref_values['like']    =  15
-	temp_pref_values['love']    =  30
-
-	if $ARGS[1] = 'body_fit' or $ARGS[1] = 'body_piercing':
-		temp_pref_values['hate']    = -30
-		temp_pref_values['dislike'] = -15
-	end
-
-
-	if $ARGS[2] = 'hate':
-		result = temp_pref_values['hate']
-
-	elseif $ARGS[2] = 'dislike':
-		result = temp_pref_values['dislike']
-
-	elseif $ARGS[2] = 'like':
-		result = temp_pref_values['like']
-
-	elseif $ARGS[2] = 'love':
-		result = temp_pref_values['love']
-
-	else
-		result = temp_pref_values['neutral']
-	end
-	
-	killvar 'temp_pref_values'
-end
-
-
-!!	To be updated
-!!	'body_tits_big'
-!!	'body_ass_bubble'
-
-!!	Body
-!!	'body_fit'
-!!	'body_piercing'
-!!	'body_pregnant'
-!!	'body_strong'
-!!	'body_tan'
-!!	'body_tatoo'
-
-!!	Clothes
-!!	'clothes_bimbo'
-!!	'clothes_goth'
-!!	'clothes_punk'
-!!	'clothes_skirt_short'
-!!	'clothes_thin'
-
-!!	Cosmetics
-!!	'cosmetics_makeup'
-
-!!	Cum
-!!	'cum_face'
-!!	'cum_clothes'
-
---- npc_add_preference ---------------------------------

+ 221 - 0
locations/npc_set_preference.qsrc

@@ -0,0 +1,221 @@
+# npc_set_preference
+
+!! npc_code = 'A***', 'B***', 'C***', etc.
+
+!!	Full reset of npc preferences:
+!!		gs 'npc_set_preference', 'reset', npc_code
+!!
+!!	Add a preference to an npc:
+!!		gs 'npc_set_preference', npc_code, trait, amount
+!!		trait: = 'strong', 'cum_on_face', 'tits_big', 'ass_bubble', etc.
+!!
+!!		amount = 'hate', 'dislike', 'neutral', 'like', 'love'
+
+
+
+
+
+if $ARGS[0] = 'reset':
+	$npc_preferences[$ARGS[1]] = ''
+end
+
+
+!! $ARGS[0] = 'A***', 'B***', 'C***', etc.
+if isnum(mid($ARGS[0], 2)):
+	
+	!!Dynamically create the $npc_pref_traits and npc_trait_values arrays
+	dynamic $npc_preferences[$ARGS[0]]
+	dynamic $npc_pref_values[$ARGS[0]]
+	
+	!! Example of these created arrays.
+	!!$npc_pref_traits: npc_pref_traits[i] = 'strong'
+	!!npc_trait_values: npc_trait_values['strong'] = -15
+
+
+	!! Translate 'hate, dislike, etc. into a number and store it.'
+	temp_trait_value = func('npc_set_preference', 'get_value', $ARGS[1], $ARGS[2])
+
+
+
+	!! If the trait_value is 0 (aka 'neutral'), it doesn''t add anything to the attraction system. So we don''t bother adding it.
+	if temp_trait_value ! 0:
+			temp_skip_loop = 0
+		:skip_start
+		!! Escape the preference loops when overwriting a preference.
+		if temp_skip_loop = 0:
+			!!if the npc has no preferences, create the $npc_preferences and $npc_pref_values entries from scratch.
+			if arrsize('$npc_pref_traits') = 0:
+
+				!!replace(..., '	', '') is there to remove the tabs from the string.
+				$npc_preferences[$ARGS[0]] = replace({killvar '$npc_pref_traits'
+					$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
+				}, '	', '')
+
+				$npc_pref_values[$ARGS[0]] = replace({killvar 'npc_trait_values'
+					npc_trait_values} + "['<<$ARGS[1]>>'] = <<temp_trait_value>>" + {
+				}, '	', '')
+
+			else
+				!!loop over every preference to check if the npc already has a preference for that trait.
+				i = 0
+				:preference_loop
+
+					!!The npc already has a preference for the trait.
+					!!We overwrite the trait and then escape the preference_loop
+					if $npc_pref_traits = $ARGS[1]:
+						if temp_trait_value ! 0:
+							npc_trait_values[$ARGS[1]] = temp_trait_value
+
+						!!Rebuild the $npc_pref....[$ARGS[0]] strings from the grounds up
+						gs 'npc_set_preference', 'rebuild_preferences', $ARGS[0]
+
+						temp_skip_loop = 1
+						jump 'skip_start'
+					end
+
+					i += 1
+				if i < arrsize('$npc_pref_traits'): jump 'preference_loop'
+
+				!!We have checked that the npc has no preference for the trait.
+				!!We add the preference to the npc.
+
+				$npc_preferences[$ARGS[0]] += replace({$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
+				}, '	', '')
+
+				$npc_pref_values[$ARGS[0]] += replace({npc_trait_values} + "['<<$ARGS[1]>>'] = <<temp_trait_value>>" + {
+				}, '	', '')
+			end
+		end
+
+		killvar '$npc_pref_traits'
+		killvar 'npc_trait_values'
+
+		killvar 'i'
+		killvar 'temp_skip_loop'
+		killvar 'skip_start'
+
+	!! 'neutral' preference removes the preference from our list.
+	else
+		gs 'npc_set_preference', 'remove_preference', $ARGS[0], ARGS[1]
+	end
+
+	killvar 'temp_trait_value'
+end
+
+
+
+
+if $ARGS[0] = 'rebuild_preferences':
+	!!Rebuild the $npc_pref....[$ARGS[0]] strings from the grounds up
+	$temp_npc_pref_traits = {killvar '$npc_pref_traits'
+	}
+	$temp_npc_trait_values = {killvar 'npc_trait_values'
+	}
+
+	!!Loop over every preference and add it to the $npc_pref....[$ARGS[0]] strings.
+	i = 0
+	:pref_loop_2
+		$temp_npc_pref_traits += {$npc_pref_traits[] = } + "'<<$npc_pref_traits[i]>>'" + {
+		}
+		$temp_npc_trait_values += {npc_trait_values} + "['<<$npc_pref_traits[i]>>'] = <<npc_trait_values[i]>>" + {
+		}
+
+		i += 1
+	if i < arrsize('$npc_pref_traits'): jump 'pref_loop_2'
+
+
+	!!Overwrite the $npc_pref....[$ARGS[0]] strings with the rebuild string.
+	$npc_preferences[$ARGS[0]] = replace($temp_npc_pref_traits,    '	', '')
+	$npc_pref_values[$ARGS[0]] = replace($temp_npc_trait_values,   '	', '')
+
+	killvar '$temp_npc_pref_traits'
+	killvar '$temp_npc_trait_values'
+	killvar 'pref_loop_2'
+end
+
+
+
+if $ARGS[0] = 'remove_preference':
+	!! Check the position of the preference in the preference array.
+	temp_trait_position = arrpos('$npc_pref_traits', $ARGS[1])
+	
+	!! If the preference exists:
+	if temp_trait_position ! -1:
+		!! Remove the preference from the array.
+		killvar '$npc_pref_traits', temp_trait_position
+		killvar 'npc_trait_values', $ARGS[1]
+		
+		!! Then rebuild the dynamic string.
+		gs 'npc_set_preference', 'rebuild_preferences', $ARGS[0]
+	end
+end
+
+
+!!====================================!!
+!!                                    !!
+!!        Calculate pref_value        !!
+!!                                    !!
+!!====================================!!
+
+
+
+if $ARGS[0] = 'get_value':
+	temp_pref_values['hate']    = -30
+	temp_pref_values['dislike'] = -15
+	temp_pref_values['neutral'] =   0
+	temp_pref_values['like']    =  15
+	temp_pref_values['love']    =  30
+
+	if $ARGS[1] = 'body_fit' or $ARGS[1] = 'body_piercing':
+		temp_pref_values['hate']    = -30
+		temp_pref_values['dislike'] = -15
+	end
+
+
+	if $ARGS[2] = 'hate':
+		result = temp_pref_values['hate']
+
+	elseif $ARGS[2] = 'dislike':
+		result = temp_pref_values['dislike']
+
+	elseif $ARGS[2] = 'like':
+		result = temp_pref_values['like']
+
+	elseif $ARGS[2] = 'love':
+		result = temp_pref_values['love']
+
+	else
+		result = temp_pref_values['neutral']
+	end
+	
+	killvar 'temp_pref_values'
+end
+
+
+!!	To be updated
+!!	'body_tits_big'
+!!	'body_ass_bubble'
+
+!!	Body
+!!	'body_fit'
+!!	'body_piercing'
+!!	'body_pregnant'
+!!	'body_strong'
+!!	'body_tan'
+!!	'body_tatoo'
+
+!!	Clothes
+!!	'clothes_bimbo'
+!!	'clothes_goth'
+!!	'clothes_punk'
+!!	'clothes_skirt_short'
+!!	'clothes_thin'
+
+!!	Cosmetics
+!!	'cosmetics_makeup'
+
+!!	Cum
+!!	'cum_face'
+!!	'cum_clothes'
+
+--- npc_set_preference ---------------------------------

Різницю між файлами не показано, бо вона завелика
+ 345 - 345
locations/npcstatic1.qsrc


+ 166 - 166
locations/npcstatic2.qsrc

@@ -26,14 +26,14 @@
 !!
 !!
 !! Add a preference to an npc:
-!! gs 'npc_add_preference', 'A<<npctemp>>', $PREF, $VALUE
+!! gs 'npc_set_preference', 'A<<npctemp>>', $PREF, $VALUE
 !!		$PREF: string from the above list. For example: 'clothes_bimbo'
 !!		$VALUE: string detailing their preference. Choose from:
 !!				'hate', 'dislike', 'neutral', 'like', 'love'
 !!
 !!
 !! It is advisable to start an NPC with a call to reset all their preferences.
-!! gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+!! gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 !!
 !! It should not matter, but it ensures that the npc is reset to the factory settings
 !! Any later additions will be removed this way.
@@ -54,28 +54,28 @@ npc_dick['A<<npctemp>>']		= 15
 npc_sexskill['A<<npctemp>>']	= 1
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -140,20 +140,20 @@ $npc_selfie['A<<npctemp>>']		= '<a href="exec:numnpc = 54 & gt ''phone_selfies''
 hotcat_rating['A<<npctemp>>']	= 4
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -173,12 +173,12 @@ npc_dick['A<<npctemp>>']		= 30
 hotcat_rating['A<<npctemp>>']	=  6
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -200,28 +200,28 @@ npc_dick['A<<npctemp>>']		= 17
 hotcat_rating['A<<npctemp>>']	=  6
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -242,28 +242,28 @@ npc_dick['A<<npctemp>>']		= 14
 hotcat_rating['A<<npctemp>>']	=  5
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -285,28 +285,28 @@ npc_intel['A<<npctemp>>']		= 34
 hotcat_rating['A<<npctemp>>']	=  5
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -328,28 +328,28 @@ npc_intel['A<<npctemp>>']		= 38
 hotcat_rating['A<<npctemp>>']	=  6
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -526,17 +526,17 @@ discoenable['A<<npctemp>>']		= 1
 hotcat_rating['A<<npctemp>>']	= 6
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
 
 
@@ -554,14 +554,14 @@ $npc_thdick['A<<npctemp>>']	= 'thick'
 npc_dick['A<<npctemp>>']	= 18
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -579,17 +579,17 @@ $npc_thdick['A<<npctemp>>']	= 'thick'
 npc_dick['A<<npctemp>>']	= 18
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -607,23 +607,23 @@ $npc_thdick['A<<npctemp>>']	= 'thick'
 npc_dick['A<<npctemp>>']	= 19
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -714,18 +714,18 @@ npc_dick['A<<npctemp>>']		= 17
 hotcat_rating['A<<npctemp>>']	= 7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -803,11 +803,11 @@ npc_dick['A<<npctemp>>']		= 24
 hotcat_rating['A<<npctemp>>']	=  7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -829,19 +829,19 @@ npc_dick['A<<npctemp>>']		= 14
 hotcat_rating['A<<npctemp>>']	=  8
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -862,14 +862,14 @@ npc_bust['A<<npctemp>>']		= 24
 hotcat_rating['A<<npctemp>>']	=  7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 npctemp = 85
@@ -950,11 +950,11 @@ npc_bust['A<<npctemp>>']		=    9
 hotcat_rating['A<<npctemp>>']	=    5
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 

+ 275 - 275
locations/npcstatic3.qsrc

@@ -27,14 +27,14 @@
 !!
 !!
 !! Add a preference to an npc:
-!! gs 'npc_add_preference', 'A<<npctemp>>', $PREF, $VALUE
+!! gs 'npc_set_preference', 'A<<npctemp>>', $PREF, $VALUE
 !!		$PREF: string from the above list. For example: 'clothes_bimbo'
 !!		$VALUE: string detailing their preference. Choose from:
 !!				'hate', 'dislike', 'neutral', 'like', 'love'
 !!
 !!
 !! It is advisable to start an NPC with a call to reset all their preferences.
-!! gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+!! gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 !!
 !! It should not matter, but it ensures that the npc is reset to the factory settings
 !! Any later additions will be removed this way.
@@ -58,28 +58,28 @@ $npc_thdick['A<<npctemp>>']	= 'massive'
 npc_dick['A<<npctemp>>']	= 20
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -250,14 +250,14 @@ npc_dick['A<<npctemp>>']		= 16
 hotcat_rating['A<<npctemp>>']	=  6
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -360,28 +360,28 @@ npc_dick['A<<npctemp>>']		= 11
 npc_sexskill['A<<npctemp>>']	= 1
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -442,21 +442,21 @@ $npc_thdick['A<<npctemp>>']	= 'massive'
 npc_dick['A<<npctemp>>']	= 22
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -473,23 +473,23 @@ $npc_thdick['A<<npctemp>>']	= 'well proportioned'
 npc_dick['A<<npctemp>>']	= 14
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -506,22 +506,22 @@ $npc_thdick['A<<npctemp>>']	= 'thicker than average'
 npc_dick['A<<npctemp>>']	= 18
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -538,23 +538,23 @@ $npc_thdick['A<<npctemp>>']	= 'thicker than average'
 npc_dick['A<<npctemp>>']	= 12
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -571,20 +571,20 @@ $npc_thdick['A<<npctemp>>']	= 'thick'
 npc_dick['A<<npctemp>>']	= 16
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -603,19 +603,19 @@ npc_dick['A<<npctemp>>']		= 16
 hotcat_rating['A<<npctemp>>']	=  8
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -638,11 +638,11 @@ npc_dick['A<<npctemp>>']		= 17
 hotcat_rating['A<<npctemp>>']	=  5
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -665,21 +665,21 @@ npc_dick['A<<npctemp>>']		= 22
 hotcat_rating['A<<npctemp>>']	=  5
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -702,13 +702,13 @@ npc_dick['A<<npctemp>>']		= 13
 hotcat_rating['A<<npctemp>>']	=  5
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -731,14 +731,14 @@ npc_dick['A<<npctemp>>']      = 17
 hotcat_rating['A<<npctemp>>'] =  7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -761,21 +761,21 @@ npc_dick['A<<npctemp>>']		= 21
 hotcat_rating['A<<npctemp>>']	=  6
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -798,13 +798,13 @@ npc_dick['A<<npctemp>>']		= 12
 hotcat_rating['A<<npctemp>>']	=  3
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -826,22 +826,22 @@ npc_bust['A<<npctemp>>']		= 20
 hotcat_rating['A<<npctemp>>']	=  7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -863,22 +863,22 @@ npc_bust['A<<npctemp>>']		= 13
 hotcat_rating['A<<npctemp>>']	=  4
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -900,13 +900,13 @@ npc_bust['A<<npctemp>>']		= 24
 hotcat_rating['A<<npctemp>>']	=  7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -928,13 +928,13 @@ npc_bust['A<<npctemp>>']		= 34
 hotcat_rating['A<<npctemp>>']	=  7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -956,12 +956,12 @@ npc_bust['A<<npctemp>>']		= 13
 hotcat_rating['A<<npctemp>>']	=  7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -990,22 +990,22 @@ hotcat_rating['A<<npctemp>>']	=  6
 !!pubic hair = shaved
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -1034,12 +1034,12 @@ hotcat_rating['A<<npctemp>>']	=  7
 !!pubic hair = Neatly trimmed triangle
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -1067,12 +1067,12 @@ npc_rep['A<<npctemp>>']			=  0
 !!pubic hair = Neatly trimmed triangle
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -1101,15 +1101,15 @@ hotcat_rating['A<<npctemp>>']	=  5
 !!pubic hair = untrimmed bush
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -1138,13 +1138,13 @@ npc_rep['A<<npctemp>>']			= 120
 !!pubic hair = neatly trimmed landing strip
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
 
 
 
@@ -1173,20 +1173,20 @@ hotcat_rating['A<<npctemp>>']	=   8
 !!pubic hair = shaved
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -1214,19 +1214,19 @@ npc_rep['A<<npctemp>>']			= 70
 !!pubic hair = untrimmed bush
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -1252,17 +1252,17 @@ npc_rep['A<<npctemp>>']			= 220
 hotcat_rating['A<<npctemp>>']	=   8
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -1288,16 +1288,16 @@ npc_rep['A<<npctemp>>']			= 210
 hotcat_rating['A<<npctemp>>']	=   8
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -1322,28 +1322,28 @@ npc_rep['A<<npctemp>>']			= 130
 npc_intel['A<<npctemp>>']		=  44
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -1369,12 +1369,12 @@ npc_rep['A<<npctemp>>']			= 320
 hotcat_rating['A<<npctemp>>']	=   7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 --- npcstatic3 ---------------------------------

+ 183 - 183
locations/npcstatic4.qsrc

@@ -27,14 +27,14 @@
 !!
 !!
 !! Add a preference to an npc:
-!! gs 'npc_add_preference', 'A<<npctemp>>', $PREF, $VALUE
+!! gs 'npc_set_preference', 'A<<npctemp>>', $PREF, $VALUE
 !!		$PREF: string from the above list. For example: 'clothes_bimbo'
 !!		$VALUE: string detailing their preference. Choose from:
 !!				'hate', 'dislike', 'neutral', 'like', 'love'
 !!
 !!
 !! It is advisable to start an NPC with a call to reset all their preferences.
-!! gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+!! gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 !!
 !! It should not matter, but it ensures that the npc is reset to the factory settings
 !! Any later additions will be removed this way.
@@ -62,28 +62,28 @@ npc_rep['A<<npctemp>>']			= 110
 npc_intel['A<<npctemp>>']		=  26
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -108,12 +108,12 @@ npc_rep['A<<npctemp>>']			=  0
 npc_intel['A<<npctemp>>']		= 87
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -139,18 +139,18 @@ npc_rep['A<<npctemp>>']			= 60
 hotcat_rating['A<<npctemp>>']	=  6
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -176,15 +176,15 @@ npc_rep['A<<npctemp>>']			= 20
 hotcat_rating['A<<npctemp>>']	=  4
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -209,23 +209,23 @@ npc_rep['A<<npctemp>>']			= 370
 npc_intel['A<<npctemp>>']		=  51
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -251,17 +251,17 @@ npc_rep['A<<npctemp>>']			= 240
 hotcat_rating['A<<npctemp>>']	=   7
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -286,18 +286,18 @@ npc_rep['A<<npctemp>>']			= 260
 npc_intel['A<<npctemp>>']		=  42
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -322,17 +322,17 @@ npc_rep['A<<npctemp>>']			= 170
 npc_intel['A<<npctemp>>']		=  34
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
 
 
@@ -357,24 +357,24 @@ npc_rep['A<<npctemp>>']			= 280
 npc_intel['A<<npctemp>>']		=  44
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -400,15 +400,15 @@ npc_rep['A<<npctemp>>']			=  0
 hotcat_rating['A<<npctemp>>']	=  1
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -428,21 +428,21 @@ $npc_thdick['A<<npctemp>>']	= 'thicker than average'
 npc_dick['A<<npctemp>>']	= 17
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -526,28 +526,28 @@ npc_rep['A<<npctemp>>']			= 120
 hotcat_rating['A<<npctemp>>']	=   5
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -566,14 +566,14 @@ $npc_thdick['A<<npctemp>>']	= 'well proportioned'
 npc_dick['A<<npctemp>>']	= 14
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -881,18 +881,18 @@ gs 'npcstaticdefaults', 'defaults'
 npc_bust['A<<npctemp>>'] = 9
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -931,28 +931,28 @@ npc_sexskill['A<<npctemp>>']	=  1
 npc_spermpot['A<<npctemp>>']	= 15000
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -1007,19 +1007,19 @@ npc_rep['A<<npctemp>>']			= 140
 npc_intel['A<<npctemp>>']		=  64
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -1058,28 +1058,28 @@ gs 'npcstaticdefaults', 'defaults'
 npc_bust['A<<npctemp>>'] = 23
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 

+ 134 - 134
locations/npcstatic5.qsrc

@@ -27,14 +27,14 @@
 !!
 !!
 !! Add a preference to an npc:
-!! gs 'npc_add_preference', 'A<<npctemp>>', $PREF, $VALUE
+!! gs 'npc_set_preference', 'A<<npctemp>>', $PREF, $VALUE
 !!		$PREF: string from the above list. For example: 'clothes_bimbo'
 !!		$VALUE: string detailing their preference. Choose from:
 !!				'hate', 'dislike', 'neutral', 'like', 'love'
 !!
 !!
 !! It is advisable to start an NPC with a call to reset all their preferences.
-!! gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+!! gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 !!
 !! It should not matter, but it ensures that the npc is reset to the factory settings
 !! Any later additions will be removed this way.
@@ -60,28 +60,28 @@ npc_height['A<<npctemp>>']		= 172
 npc_spermpot['A<<npctemp>>']	= 9000
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -166,17 +166,17 @@ npc_rel['A<<npctemp>>']			= 30
 npc_spermpot['A<<npctemp>>']	= 8500
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -201,18 +201,18 @@ hotcat_rating['A<<npctemp>>']	=  6
 npc_rel['A<<npctemp>>']			= 30
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -514,15 +514,15 @@ hotcat_rating['A<<npctemp>>']	= 7
 npc_sexskill['A<<npctemp>>']	= 2
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -867,22 +867,22 @@ gs 'npcstaticdefaults', 'body', 'model'
 npc_sexskill['A<<npctemp>>'] = 2
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -904,15 +904,15 @@ npc_dick['A<<npctemp>>']		= 15
 npc_sexskill['A<<npctemp>>']	=  1
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',	'	dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',	'	dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -935,28 +935,28 @@ hotcat_rating['A<<npctemp>>']	=  6
 $npc_body['A<<npctemp>>']		= 's3'
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -999,12 +999,12 @@ npc_sexskill['A<<npctemp>>']	=  3
 npc_intel['A<<npctemp>>']		= 48
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -1029,19 +1029,19 @@ npc_sexskill['A<<npctemp>>']	=  2
 npc_intel['A<<npctemp>>']		= 51
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -1066,12 +1066,12 @@ npc_sexskill['A<<npctemp>>']	= 1
 npc_intel['A<<npctemp>>']		= 63
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
 
 
@@ -1096,15 +1096,15 @@ npc_sexskill['A<<npctemp>>']	=  3
 npc_intel['A<<npctemp>>']		= 57
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -1129,17 +1129,17 @@ npc_sexskill['A<<npctemp>>']	=  2
 npc_intel['A<<npctemp>>']		= 66
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -1167,19 +1167,19 @@ hotcat_rating['A<<npctemp>>']	=  7
 !!pubic hair = shaved
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -1204,28 +1204,28 @@ hotcat_rating['A<<npctemp>>']	=  6
 npc_intel['A<<npctemp>>']		= 47
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 

+ 153 - 153
locations/npcstatic6.qsrc

@@ -27,14 +27,14 @@
 !!
 !!
 !! Add a preference to an npc:
-!! gs 'npc_add_preference', 'A<<npctemp>>', $PREF, $VALUE
+!! gs 'npc_set_preference', 'A<<npctemp>>', $PREF, $VALUE
 !!		$PREF: string from the above list. For example: 'clothes_bimbo'
 !!		$VALUE: string detailing their preference. Choose from:
 !!				'hate', 'dislike', 'neutral', 'like', 'love'
 !!
 !!
 !! It is advisable to start an NPC with a call to reset all their preferences.
-!! gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+!! gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 !!
 !! It should not matter, but it ensures that the npc is reset to the factory settings
 !! Any later additions will be removed this way.
@@ -63,28 +63,28 @@ npc_spermpot['A<<npctemp>>']	= 11000
 npc_haircol['A<<npctemp>>']  = 1
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -158,28 +158,28 @@ npc_intel['A<<npctemp>>']		= 82
 !!pubic hair = undecided
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -207,23 +207,23 @@ npc_spermpot['A<<npctemp>>']	= 11000
 npc_haircol['A<<npctemp>>']		= 1
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			   'like'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			   'like'
 
 
 
@@ -251,22 +251,22 @@ npc_spermpot['A<<npctemp>>']	= 11000
 npc_haircol['A<<npctemp>>']		= 1
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'dislike'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -295,16 +295,16 @@ npc_intel['A<<npctemp>>']		= 88
 !!pubic hair = undecided
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	   'like'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'dislike'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'dislike'
 
 
 
@@ -331,28 +331,28 @@ hotcat_rating['A<<npctemp>>']	=  7
 !!pubic hair = undecided
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -379,28 +379,28 @@ hotcat_rating['A<<npctemp>>']	=  6
 !!pubic hair = bush
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -426,28 +426,28 @@ npc_intel['A<<npctemp>>']		= 20
 !!pubic hair = undecided
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -473,28 +473,28 @@ hotcat_rating['A<<npctemp>>']	=  7
 !!pubic hair = undecided
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 
@@ -518,28 +518,28 @@ npc_intel['A<<npctemp>>']		= 62
 hotcat_rating['A<<npctemp>>']	=  8
 
 
-gs 'npc_add_preference', 'reset', 'A<<npctemp>>'
+gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tatoo',			'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
 
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_add_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
 
 
 

Деякі файли не було показано, через те що забагато файлів було змінено