[fixed] Using the "tits and ass ignore body weight" cheat, those now immediately revert to your genetic norm

locations/body.qsrc

@@ -588,9 +588,7 @@ if $ARGS[0] = 'Redistribute_Mass':
 	end
 
 
-	if salobustdo = 0 and cheatVars['body_staticAssets'] = 0:
-		!!This controls the movement of pcs_mass['body'] to/from bust in order of precedence
-
+	if salobustdo = 0:
 		!!===============    MAGIC    ===============!!
 		if magikDostup = 0 and magf2bdo = 1 and daystart > pcs_mass['magic_day'] and pcs_mana >= manamax / 2:
 			bodyVars['bust_magic'] += 1
@@ -602,115 +600,124 @@ if $ARGS[0] = 'Redistribute_Mass':
 			pcs_mana -= max(100, 2000 / pcs_magik)
 		end
 
-		!!===============    Low Weight    ===============!!
-		if pcs_mass['body'] < 10:
-			temp_diff = min(pcs_mass['bust'], 3)
-			pcs_mass['bust'] -= temp_diff
-			pcs_mass['body'] += temp_diff
-
-			temp_diff = min(pcs_mass['butt'], 3)
-			pcs_mass['butt'] -= temp_diff
-			pcs_mass['body'] += temp_diff
+		!!This controls the movement of pcs_mass['body'] to/from bust in order of precedence
+		if cheatVars['body_staticAssets'] ! 0:
+			pcs_mass['bust'] = pcs_mass['bust_gen']
+			pcs_mass['bust_message'] = pcs_mass['bust_gen']
 
+			pcs_mass['butt'] = pcs_mass['butt_gen']
+			pcs_mass['butt_message'] = pcs_mass['butt_gen']
 		else
-			temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
-			temp_tot_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
+			!!===============    Low Weight    ===============!!
+			if pcs_mass['body'] < 10:
+				temp_diff = min(pcs_mass['bust'], 3)
+				pcs_mass['bust'] -= temp_diff
+				pcs_mass['body'] += temp_diff
 
-			!!===============    Bust    ===============!!
-			temp_mass_bust = (pcs_mass['bust_gen'] * temp_total_mass) / temp_tot_gen_mass
+				temp_diff = min(pcs_mass['butt'], 3)
+				pcs_mass['butt'] -= temp_diff
+				pcs_mass['body'] += temp_diff
 
-				!!----------- Small -----------!!
-			if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['bust'] < pcs_mass['bust_gen']:
-				temp_diff = min(pcs_mass['bust_gen'] - pcs_mass['bust'], 2)
-				pcs_mass['bust'] += temp_diff
-				pcs_mass['body'] -= temp_diff
-
-			elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['bust'] = pcs_mass['bust_gen']:
-				!Keep bust at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
-
-				!!-----------    Growth    -----------!!
-			elseif temp_mass_bust > pcs_mass['bust']:
-				pcs_mass['bust'] += 1
-				pcs_mass['body'] -= 1
+			else
+				temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+				temp_tot_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
+
+				!!===============    Bust    ===============!!
+				temp_mass_bust = (pcs_mass['bust_gen'] * temp_total_mass) / temp_tot_gen_mass
+
+					!!----------- Small -----------!!
+				if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['bust'] < pcs_mass['bust_gen']:
+					temp_diff = min(pcs_mass['bust_gen'] - pcs_mass['bust'], 2)
+					pcs_mass['bust'] += temp_diff
+					pcs_mass['body'] -= temp_diff
+
+				elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['bust'] = pcs_mass['bust_gen']:
+					!Keep bust at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
+
+					!!-----------    Growth    -----------!!
+				elseif temp_mass_bust > pcs_mass['bust']:
+					pcs_mass['bust'] += 1
+					pcs_mass['body'] -= 1
+
+					!!-----------    Shrink    -----------!!
+				elseif temp_mass_bust < pcs_mass['bust'] and pcs_mass['bust'] > 0:
+					pcs_mass['bust'] -= 1
+					pcs_mass['body'] += 1
+				end
 
-				!!-----------    Shrink    -----------!!
-			elseif temp_mass_bust < pcs_mass['bust'] and pcs_mass['bust'] > 0:
-				pcs_mass['bust'] -= 1
-				pcs_mass['body'] += 1
-			end
 
+				!!===============    Ass    ===============!!
+				temp_mass_ass  = (pcs_mass['butt_gen']  * temp_total_mass) / temp_tot_gen_mass
 
-			!!===============    Ass    ===============!!
-			temp_mass_ass  = (pcs_mass['butt_gen']  * temp_total_mass) / temp_tot_gen_mass
+					!!----------- Small -----------!!
+				if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['butt'] < pcs_mass['butt_gen']:
+					temp_diff = min(pcs_mass['butt_gen'] - pcs_mass['butt'], 2)
+					pcs_mass['butt'] += temp_diff
+					pcs_mass['body'] -= temp_diff
 
-				!!----------- Small -----------!!
-			if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['butt'] < pcs_mass['butt_gen']:
-				temp_diff = min(pcs_mass['butt_gen'] - pcs_mass['butt'], 2)
-				pcs_mass['butt'] += temp_diff
-				pcs_mass['body'] -= temp_diff
+				elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['butt'] = pcs_mass['butt_gen']:
+					!Keep butt at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
 
-			elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['butt'] = pcs_mass['butt_gen']:
-				!Keep butt at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
+					!!-----------    Rest    -----------!!
+				elseif temp_mass_ass > pcs_mass['butt']:
+					pcs_mass['butt'] += 1
+					pcs_mass['body'] -= 1
 
-				!!-----------    Rest    -----------!!
-			elseif temp_mass_ass > pcs_mass['butt']:
-				pcs_mass['butt'] += 1
-				pcs_mass['body'] -= 1
+				elseif temp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
+					pcs_mass['butt'] -= 1
+					pcs_mass['body'] += 1
+				end
 
-			elseif temp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
-				pcs_mass['butt'] -= 1
-				pcs_mass['body'] += 1
+				killvar 'temp_total_mass'
+				killvar 'temp_tot_gen_mass'
+				killvar 'temp_mass_bust'
+				killvar 'temp_mass_ass'
+				killvar 'temp_diff'
 			end
 
-			killvar 'temp_total_mass'
-			killvar 'temp_tot_gen_mass'
-			killvar 'temp_mass_bust'
-			killvar 'temp_mass_ass'
-			killvar 'temp_diff'
-		end
-
-		if bodyresetflag ! 0:
-			pcs_mass['bust_message'] = pcs_mass['bust']
-			pcs_mass['butt_message'] = pcs_mass['butt']
-		else
-			if pcs_mass['bust'] > pcs_mass['bust_message'] + 3:
+			if bodyresetflag ! 0:
 				pcs_mass['bust_message'] = pcs_mass['bust']
+				pcs_mass['butt_message'] = pcs_mass['butt']
+			else
+				if pcs_mass['bust'] > pcs_mass['bust_message'] + 3:
+					pcs_mass['bust_message'] = pcs_mass['bust']
 
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts and ass seem fuller</b>'
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts and ass seem fuller</b>'
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts seem fuller and ass seems to be getting smaller</b>'
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts seem fuller and ass seems to be getting smaller</b>'
 
-				else
-					'<b>Your breasts seem fuller</b>'
-				end
+					else
+						'<b>Your breasts seem fuller</b>'
+					end
 
-			elseif pcs_mass['bust'] < pcs_mass['bust_message'] - 3:
-				pcs_mass['bust_message'] = pcs_mass['bust']
-
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts seem to be getting smaller and your ass seems fuller</b>'
+				elseif pcs_mass['bust'] < pcs_mass['bust_message'] - 3:
+					pcs_mass['bust_message'] = pcs_mass['bust']
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts and ass seem to be getting smaller</b>'
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts seem to be getting smaller and your ass seems fuller</b>'
 
-				else
-					'<b>Your breasts seem to be getting smaller</b>'
-				end
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts and ass seem to be getting smaller</b>'
 
-			else
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your ass seems fuller</b>'
+					else
+						'<b>Your breasts seem to be getting smaller</b>'
+					end
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your ass seem to be getting smaller</b>'
+				else
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your ass seems fuller</b>'
+
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your ass seem to be getting smaller</b>'
+					end
 				end
 			end
 		end

locations/npc_set_preference.qsrc

@@ -65,7 +65,7 @@ if isnum(mid($ARGS[0], 2)):
 	if temp_set_preference_trait_value ! 0:
 		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_preferences[$ARGS[0]] = $replace({killvar '$npc_pref_traits'
 				killvar 'npc_pref_values'
 				$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
 				npc_pref_values} + "['<<$ARGS[1]>>'] = <<temp_set_preference_trait_value>>" + {
@@ -83,7 +83,7 @@ if isnum(mid($ARGS[0], 2)):
 			else
 				!!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_preferences[$ARGS[0]] += $replace({$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
 					npc_pref_values} + "['<<$ARGS[1]>>'] = <<temp_set_preference_trait_value>>" + {
 				}, '	', '')
 			end
@@ -130,7 +130,7 @@ if $ARGS[0] = 'rebuild_preferences':
 
 
 	!!Overwrite the $npc_pref....[$ARGS[1]] strings with the rebuild string.
-	$npc_preferences[$ARGS[1]] = replace($temp_npc_preferences,    '	', '')
+	$npc_preferences[$ARGS[1]] = $replace($temp_npc_preferences,    '	', '')
 
 	killvar '$temp_npc_preferences'
 	killvar 'rebuild_preferences_index'
@@ -356,6 +356,4 @@ end
 !!				stats_strength_manly
 
 
-
-
---- npc_set_preference ---------------------------------
+--- npc_set_preference ---------------------------------