Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

src/personalAssistant/assistant.js

@@ -32,7 +32,7 @@ window.assistant = (function() {
 		convert('assistantNameAnnounced', 'announcedName');
 		convert('assistantBodyDesire', 'bodyDesire');
 		convert('assistantOptions', 'options');
-		if (V.week >= 11 && V.assistant.options === 'undefined') {
+		if (V.week >= 11 && !V.assistant.options) {
 			V.assistant.options = 1;
 		}
 		convert('assistantFSOptions', 'fsOptions');

src/personalAssistant/assistantOptions.tw

@@ -98,7 +98,7 @@ Seated at your desk, you glance at the visual representation of
 			Although technically an expanded subroutine within the same app, $assistant.name uses a distinct icon to identify these alerts and improve your workflow.
 			<br>
 		<</if>>
-		<br>_HeA is <<set $assistant.market.limit = Math.clamp($assistant.market.limit, 10000, 10000000)>>
+		<br>_HeA is <<set $assistant.market.limit = Math.clamp($assistant.market.limit, 0, 10000000)>>
 		<<if $assistant.market.limit>>
 			''allowed'' to use excess liquid assets over <<print cashFormat($assistant.market.limit)>> to play the menial slave market. [[Disallow|Personal assistant options][$assistant.market.limit = 0]]
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;

src/personalAssistant/assistantVariableDocumentation.txt

+personality (Init, 0-1):
+
+Does the assistant attempt to simulate personality.
+0 - no
+1 - yes
+
+name:
+
+What the assistant is called. Accepts a string.
+
+power:
+
+The assistant's power level.
+0-3
+
+appearance:
+
+The assistant's appearance, is a string.
+
+Extra1:
+
+First additional set of appearance choices.
+If defined the choices are avalibe.
+
+Extra2:
+
+Second additional set of appearance choices.
+
+announcedName:
+
+The assistant has announced that it would like a name.
+
+bodyDesire:
+
+The assistant has announced that it would like a body.
+
+options:
+
+The assistant has additional options unlocked.
+
+fsOptions:
+
+The assistant has FS options unlocked. Set week 11 or greater.
+
+fsAppearance:
+
+The assistant has FS related appearance choices enabled.
+
+market (object):
+
+set when undefined and assistant.power > 1.
+
+relationship:
+
+Relationship status between the assistant and the market assistant, is a string.
+
+limit:
+
+The ammount of credits the market assistant is allowed to use. 10,000,000 maxium.
+
+aggressiveness:
+
+How aggressive the market assistant is buying and selling menial slaves.
\ No newline at end of file