loreline 0.7.1 → 0.8.0

package/js/loreline.js

@@ -725,6 +725,36 @@ class haxe_NativeStackTrace {
 }
 $hxClasses["haxe.NativeStackTrace"] = haxe_NativeStackTrace;
 haxe_NativeStackTrace.__name__ = "haxe.NativeStackTrace";
+class haxe_Timer {
+	constructor(time_ms) {
+		let me = this;
+		this.id = setInterval(function() {
+			me.run();
+		},time_ms);
+	}
+	stop() {
+		if(this.id == null) {
+			return;
+		}
+		clearInterval(this.id);
+		this.id = null;
+	}
+	run() {
+	}
+	static delay(f,time_ms) {
+		let t = new haxe_Timer(time_ms);
+		t.run = function() {
+			t.stop();
+			f();
+		};
+		return t;
+	}
+}
+$hxClasses["haxe.Timer"] = haxe_Timer;
+haxe_Timer.__name__ = "haxe.Timer";
+Object.assign(haxe_Timer.prototype, {
+	__class__: haxe_Timer
+});
 class haxe_ValueException extends haxe_Exception {
 	constructor(value,previous,native) {
 		super(String(value),previous,native);
@@ -10854,11 +10884,11 @@ class loreline_AstUtils {
 				let bin = child;
 				let _g = bin.op;
 				switch(_g._hx_index) {
-				case 36:
+				case 37:
 					let _g1 = _g.word;
 					bin.op = loreline_TokenType.OpAnd(true);
 					break;
-				case 37:
+				case 38:
 					let _g2 = _g.word;
 					bin.op = loreline_TokenType.OpOr(true);
 					break;
@@ -10873,11 +10903,11 @@ class loreline_AstUtils {
 				let bin = child;
 				let _g = bin.op;
 				switch(_g._hx_index) {
-				case 36:
+				case 37:
 					let _g1 = _g.word;
 					bin.op = loreline_TokenType.OpAnd(false);
 					break;
-				case 37:
+				case 38:
 					let _g2 = _g.word;
 					bin.op = loreline_TokenType.OpOr(false);
 					break;
@@ -12666,6 +12696,10 @@ class loreline_Functions {
 		target.h["map_copy"] = $bind(this,this.map_copy);
 		target.h["current_beat"] = $bind(this,this.current_beat);
 		target.h["has_beat"] = $bind(this,this.has_beat);
+		target.h["beat_visits"] = $bind(this,this.beat_visits);
+		target.h["choices"] = $bind(this,this.choices);
+		target.h["choices_disabled"] = $bind(this,this.choices_disabled);
+		target.h["choices_all"] = $bind(this,this.choices_all);
 	}
 	rng() {
 		if(this._random == null) {
@@ -12713,7 +12747,7 @@ class loreline_Functions {
 	}
 	wait(seconds) {
 		return new loreline_Async(function(done) {
-			done();
+			haxe_Timer.delay(done,seconds * 1000 | 0);
 		});
 	}
 	float_(value) {
@@ -13014,13 +13048,17 @@ class loreline_Functions {
 		while(i >= 0) {
 			let scope = this.interpreter.stack[i];
 			if(scope.beat != null) {
-				return scope.beat.name;
+				return scope.beat;
 			}
 			--i;
 		}
 		return null;
 	}
 	has_beat(name) {
+		if(((name) instanceof loreline_NBeatDecl)) {
+			return true;
+		}
+		let nameStr = name;
 		let i = this.interpreter.stack.length - 1;
 		while(i >= 0) {
 			let scope = this.interpreter.stack[i];
@@ -13032,7 +13070,7 @@ class loreline_Functions {
 					++_g;
 					if(((node) instanceof loreline_NBeatDecl)) {
 						let beatDecl = node;
-						if(beatDecl.name == name) {
+						if(beatDecl.name == nameStr) {
 							return true;
 						}
 					}
@@ -13040,7 +13078,67 @@ class loreline_Functions {
 			}
 			--i;
 		}
-		return Object.prototype.hasOwnProperty.call(this.interpreter.topLevelBeats.h,name);
+		return Object.prototype.hasOwnProperty.call(this.interpreter.topLevelBeats.h,nameStr);
+	}
+	beat_visits(name) {
+		if(name == null) {
+			let i = this.interpreter.stack.length - 1;
+			while(i >= 0) {
+				let scope = this.interpreter.stack[i];
+				if(scope.beat != null) {
+					return this.interpreter.getBeatVisitCount(scope.beat);
+				}
+				--i;
+			}
+			return 0;
+		} else if(((name) instanceof loreline_NBeatDecl)) {
+			return this.interpreter.getBeatVisitCount(name);
+		} else {
+			let beat = this.interpreter.resolveBeatByName(name);
+			if(beat == null) {
+				return 0;
+			}
+			return this.interpreter.getBeatVisitCount(beat);
+		}
+	}
+	choices() {
+		let texts = this.interpreter._choiceEvalTexts;
+		let enabled = this.interpreter._choiceEvalEnabled;
+		let result = [];
+		let _g = 0;
+		let _g1 = texts.length;
+		while(_g < _g1) {
+			let i = _g++;
+			if(enabled[i]) {
+				result.push(texts[i]);
+			}
+		}
+		return result;
+	}
+	choices_disabled() {
+		let texts = this.interpreter._choiceEvalTexts;
+		let enabled = this.interpreter._choiceEvalEnabled;
+		let result = [];
+		let _g = 0;
+		let _g1 = texts.length;
+		while(_g < _g1) {
+			let i = _g++;
+			if(!enabled[i]) {
+				result.push(texts[i]);
+			}
+		}
+		return result;
+	}
+	choices_all() {
+		let texts = this.interpreter._choiceEvalTexts;
+		let result = [];
+		let _g = 0;
+		let _g1 = texts.length;
+		while(_g < _g1) {
+			let i = _g++;
+			result.push(texts[i]);
+		}
+		return result;
 	}
 }
 $hxClasses["loreline.Functions"] = loreline_Functions;
@@ -13455,6 +13553,10 @@ class loreline_HscriptInterp {
 			if(Object.prototype.hasOwnProperty.call(this.interpreter.topLevelFunctions.h,id)) {
 				return this.interpreter.topLevelFunctions.h[id];
 			}
+			let beat = this.interpreter.resolveBeatByName(id);
+			if(beat != null) {
+				return beat;
+			}
 			let e = new hscript_Error(hscript_ErrorDef.EUnknownVariable(id),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
 			throw haxe_Exception.thrown(e);
 		}
@@ -14105,6 +14207,8 @@ class loreline_HscriptInterp {
 			helper = loreline_Objects.getStringHelper(this.interpreter,f);
 		} else if(loreline_Arrays.isArray(o)) {
 			helper = loreline_Objects.getArrayHelper(this.interpreter,f);
+		} else if(((o) instanceof loreline_NBeatDecl)) {
+			helper = loreline_Objects.getBeatHelper(this.interpreter,f);
 		} else if(loreline_Objects.isFields(o)) {
 			helper = loreline_Objects.getMapHelper(this.interpreter,f);
 		}
@@ -14581,8 +14685,9 @@ var loreline_RuntimeAccess = $hxEnums["loreline.RuntimeAccess"] = { __ename__:"l
 	,ArrayAccess: ($_=function(pos,array,index) { return {_hx_index:1,pos:pos,array:array,index:index,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="ArrayAccess",$_.__params__ = ["pos","array","index"],$_)
 	,CharacterAccess: ($_=function(pos,name) { return {_hx_index:2,pos:pos,name:name,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="CharacterAccess",$_.__params__ = ["pos","name"],$_)
 	,FunctionAccess: ($_=function(pos,name) { return {_hx_index:3,pos:pos,name:name,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="FunctionAccess",$_.__params__ = ["pos","name"],$_)
+	,BeatAccess: ($_=function(pos,beat) { return {_hx_index:4,pos:pos,beat:beat,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="BeatAccess",$_.__params__ = ["pos","beat"],$_)
 };
-loreline_RuntimeAccess.__constructs__ = [loreline_RuntimeAccess.FieldAccess,loreline_RuntimeAccess.ArrayAccess,loreline_RuntimeAccess.CharacterAccess,loreline_RuntimeAccess.FunctionAccess];
+loreline_RuntimeAccess.__constructs__ = [loreline_RuntimeAccess.FieldAccess,loreline_RuntimeAccess.ArrayAccess,loreline_RuntimeAccess.CharacterAccess,loreline_RuntimeAccess.FunctionAccess,loreline_RuntimeAccess.BeatAccess];
 class loreline_RuntimeScope {
 	constructor(id,beat,node,beats,state,head,insertion) {
 		this.insertion = null;
@@ -14694,6 +14799,8 @@ Object.assign(loreline_EvalNext.prototype, {
 });
 class loreline_Interpreter {
 	constructor(script,handleDialogue,handleChoice,handleFinish,options) {
+		this._choiceEvalEnabled = [];
+		this._choiceEvalTexts = [];
 		this.pendingChoiceOptions = null;
 		this.beatToResume = null;
 		this.finishTrigger = null;
@@ -14703,6 +14810,7 @@ class loreline_Interpreter {
 		this.nextScopeId = 1;
 		this.stack = [];
 		this.stringLiteralProcessors = [];
+		this.beatHelpers = new haxe_ds_StringMap();
 		this.mapHelpers = new haxe_ds_StringMap();
 		this.arrayHelpers = new haxe_ds_StringMap();
 		this.stringHelpers = new haxe_ds_StringMap();
@@ -14778,15 +14886,20 @@ class loreline_Interpreter {
 				throw haxe_Exception.thrown(new loreline_RuntimeError("Beat " + beatName + " not found",this.script.pos));
 			}
 		} else {
-			let decl = this.script.iterator();
-			while(decl.hasNext()) {
-				let decl1 = decl.next();
-				if(((decl1) instanceof loreline_NBeatDecl)) {
-					let beat = decl1;
+			let _g = 0;
+			let _g1 = this.script.body;
+			while(_g < _g1.length) {
+				let node = _g1[_g];
+				++_g;
+				if(((node) instanceof loreline_NBeatDecl)) {
+					let beat = node;
 					if(beat.name == "_") {
 						resolvedBeat = beat;
+						break;
+					}
+					if(resolvedBeat == null) {
+						resolvedBeat = beat;
 					}
-					break;
 				}
 			}
 			if(resolvedBeat == null) {
@@ -14794,8 +14907,14 @@ class loreline_Interpreter {
 				while(decl.hasNext()) {
 					let decl1 = decl.next();
 					if(((decl1) instanceof loreline_NBeatDecl)) {
-						resolvedBeat = decl1;
-						break;
+						let beat = decl1;
+						if(beat.name == "_") {
+							resolvedBeat = beat;
+							break;
+						}
+						if(resolvedBeat == null) {
+							resolvedBeat = beat;
+						}
 					}
 				}
 			}
@@ -14828,6 +14947,20 @@ class loreline_Interpreter {
 			}
 			result.pendingChoiceOptions = _g;
 		}
+		if(this._choiceEvalTexts.length > 0) {
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = this._choiceEvalTexts.length;
+			while(_g1 < _g2) {
+				let i = _g1++;
+				let entry = { text : this._choiceEvalTexts[i]};
+				if(!this._choiceEvalEnabled[i]) {
+					entry.disabled = true;
+				}
+				_g.push(entry);
+			}
+			result.choiceEvalContext = _g;
+		}
 		if(Reflect.fields(insertions).length > 0) {
 			result.insertions = insertions;
 		}
@@ -14842,6 +14975,8 @@ class loreline_Interpreter {
 		this.nextScopeId = 1;
 		this.nextInsertionId = 1;
 		this.pendingChoiceOptions = null;
+		this._choiceEvalTexts.length = 0;
+		this._choiceEvalEnabled.length = 0;
 		this.restoreState(this.topLevelState,saveData.state);
 		this.restoreCharacters(saveData.characters);
 		this.restoreNodeStates(saveData.nodeStates);
@@ -14862,6 +14997,18 @@ class loreline_Interpreter {
 				}
 			}
 		}
+		if(saveData.choiceEvalContext != null) {
+			this._choiceEvalTexts.length = 0;
+			this._choiceEvalEnabled.length = 0;
+			let _g = 0;
+			let _g1 = saveData.choiceEvalContext;
+			while(_g < _g1.length) {
+				let entry = _g1[_g];
+				++_g;
+				this._choiceEvalTexts.push(entry.text);
+				this._choiceEvalEnabled.push(entry.disabled != true);
+			}
+		}
 	}
 	resume() {
 		if(this.stack.length == 0) {
@@ -14899,6 +15046,72 @@ class loreline_Interpreter {
 		let fields = this.topLevelCharacters.h[character].fields;
 		loreline_Objects.setField(this,fields,name,value);
 	}
+	getStateField(name) {
+		let i = this.stack.length - 1;
+		while(i >= 0) {
+			let scope = this.stack[i];
+			if(scope.state != null) {
+				if(loreline_Objects.fieldExists(this,scope.state.fields,name)) {
+					return loreline_Objects.getField(this,scope.state.fields,name);
+				}
+			}
+			if(scope.node != null) {
+				let key = scope.node.id.thisVal;
+				let stateInNode = this.nodeStates.map._get(key.high,key.low);
+				if(stateInNode != null) {
+					if(loreline_Objects.fieldExists(this,stateInNode.fields,name)) {
+						return loreline_Objects.getField(this,stateInNode.fields,name);
+					}
+				}
+			}
+			--i;
+		}
+		if(loreline_Objects.fieldExists(this,this.topLevelState.fields,name)) {
+			return loreline_Objects.getField(this,this.topLevelState.fields,name);
+		}
+		return null;
+	}
+	setStateField(name,value) {
+		let i = this.stack.length - 1;
+		while(i >= 0) {
+			let scope = this.stack[i];
+			if(scope.state != null) {
+				if(loreline_Objects.fieldExists(this,scope.state.fields,name)) {
+					loreline_Objects.setField(this,scope.state.fields,name,value);
+					return;
+				}
+			}
+			if(scope.node != null) {
+				let key = scope.node.id.thisVal;
+				let stateInNode = this.nodeStates.map._get(key.high,key.low);
+				if(stateInNode != null) {
+					if(loreline_Objects.fieldExists(this,stateInNode.fields,name)) {
+						loreline_Objects.setField(this,stateInNode.fields,name,value);
+						return;
+					}
+				}
+			}
+			--i;
+		}
+		loreline_Objects.setField(this,this.topLevelState.fields,name,value);
+	}
+	getTopLevelStateField(name) {
+		return loreline_Objects.getField(this,this.topLevelState.fields,name);
+	}
+	setTopLevelStateField(name,value) {
+		loreline_Objects.setField(this,this.topLevelState.fields,name,value);
+	}
+	currentNode() {
+		let scope = this.get_currentScope();
+		if(scope == null) {
+			return null;
+		}
+		if(scope.head != null) {
+			return scope.head;
+		} else {
+			return scope.node;
+		}
+	}
 	serializeScope(scope,insertions) {
 		let result = { id : scope.id};
 		if(scope.beat != null) {
@@ -15670,6 +15883,8 @@ class loreline_Interpreter {
 				this.arrayHelpers.h[HxOverrides.substr(key1,6,null)] = func;
 			} else if(key1.startsWith("map_")) {
 				this.mapHelpers.h[HxOverrides.substr(key1,4,null)] = func;
+			} else if(key1.startsWith("beat_")) {
+				this.beatHelpers.h[HxOverrides.substr(key1,5,null)] = func;
 			}
 		}
 	}
@@ -15852,6 +16067,8 @@ class loreline_Interpreter {
 		this.nextScopeId = 1;
 		this.nextInsertionId = 1;
 		this.pendingChoiceOptions = null;
+		this._choiceEvalTexts.length = 0;
+		this._choiceEvalEnabled.length = 0;
 		let done = this.wrapNext($bind(this,this.finish));
 		this.finishTrigger = done;
 		this.evalBeatRun(beat,done.cb);
@@ -15931,6 +16148,7 @@ class loreline_Interpreter {
 		moveNext();
 	}
 	evalBeatRun(beat,next) {
+		this.incrementBeatVisitCount(beat);
 		this.evalNodeBody(beat,beat,beat.body,null,next);
 	}
 	evalStateDecl(state,next) {
@@ -15959,6 +16177,15 @@ class loreline_Interpreter {
 		let restoredOptions = this.pendingChoiceOptions;
 		if(restoredOptions != null) {
 			this.pendingChoiceOptions = null;
+			this._choiceEvalTexts.length = 0;
+			this._choiceEvalEnabled.length = 0;
+			let _g = 0;
+			while(_g < restoredOptions.length) {
+				let opt = restoredOptions[_g];
+				++_g;
+				this._choiceEvalTexts.push(opt.text);
+				this._choiceEvalEnabled.push(opt.enabled);
+			}
 			this.presentChoice(choice,restoredOptions,next);
 			return;
 		}
@@ -15990,10 +16217,21 @@ class loreline_Interpreter {
 		}
 		let index = -1;
 		let _gthis = this;
+		let clearChoiceEval = function() {
+			_gthis._choiceEvalTexts.length = 0;
+			_gthis._choiceEvalEnabled.length = 0;
+		};
 		let choiceCallback = this.wrapNext(function() {
 			_gthis.pendingChoiceOptions = null;
 			if(index >= 0 && index < options.length) {
 				let option = options[index];
+				if(option.node.once) {
+					_gthis.setChoiceOptionChosen(option.node);
+				}
+				let wrappedNext = function() {
+					clearChoiceEval();
+					next();
+				};
 				if(option.insertion != null) {
 					let scopeLevel = _gthis.stack.length;
 					while(_gthis.stack.length > 0) _gthis.stack.pop();
@@ -16009,11 +16247,12 @@ class loreline_Interpreter {
 					}
 					let lastScope = _gthis.stack[_gthis.stack.length - 1];
 					_gthis.push(new loreline_RuntimeScope(null,lastScope.beat,_gthis.lens.getParentNode(option.node),null,null,option.node,null));
-					_gthis.resumeFromLevel(scopeLevel,next);
+					_gthis.resumeFromLevel(scopeLevel,wrappedNext);
 				} else {
-					_gthis.evalChoiceOption(option.node,next);
+					_gthis.evalChoiceOption(option.node,wrappedNext);
 				}
 			} else {
+				clearChoiceEval();
 				next();
 			}
 		});
@@ -16025,6 +16264,8 @@ class loreline_Interpreter {
 	}
 	evalChoiceOptionsAndInsertions(beat,choice,result,next,startIndex) {
 		let options = choice.options;
+		this._choiceEvalTexts.length = 0;
+		this._choiceEvalEnabled.length = 0;
 		let index = startIndex != null ? startIndex : 0;
 		let moveNext = null;
 		let insertion = null;
@@ -16037,26 +16278,35 @@ class loreline_Interpreter {
 					let i = _g++;
 					let opt = insertion.options[i];
 					result.push(opt);
+					_gthis._choiceEvalTexts.push(opt.text);
+					_gthis._choiceEvalEnabled.push(opt.enabled);
 				}
 				insertion = null;
 			}
 			if(index < options.length) {
 				let option = options[index];
 				index += 1;
-				let enabled = option.condition == null || _gthis.evaluateCondition(option.condition);
+				let onceDisabled = option.once && _gthis.isChoiceOptionChosen(option);
+				let enabled = !onceDisabled && (option.condition == null || _gthis.evaluateCondition(option.condition));
 				if(option.text != null) {
 					let done = _gthis.wrapNext(moveNext);
 					let str = _gthis.getTranslatedString(option,option.text);
 					let content = _gthis.evaluateString(str);
 					result.push(new loreline_ChoiceOption(content.text,content.tags,enabled,option,_gthis.get_currentInsertion()));
+					_gthis._choiceEvalTexts.push(content.text);
+					_gthis._choiceEvalEnabled.push(enabled);
 					done.cb();
 					done.sync = false;
 				} else if(option.insertion != null) {
 					let done = _gthis.wrapNext(moveNext);
-					insertion = new loreline_RuntimeInsertion(_gthis.nextInsertionId++,option.insertion);
-					insertion.parentPartialOptions = [].concat(result);
-					insertion.parentNextOptionIndex = index;
-					_gthis.evalInsertion(insertion,done.cb);
+					if(!enabled) {
+						done.cb();
+					} else {
+						insertion = new loreline_RuntimeInsertion(_gthis.nextInsertionId++,option.insertion);
+						insertion.parentPartialOptions = [].concat(result);
+						insertion.parentNextOptionIndex = index;
+						_gthis.evalInsertion(insertion,done.cb);
+					}
 					done.sync = false;
 				} else {
 					throw haxe_Exception.thrown(new loreline_RuntimeError("Invalid choice option",option.pos));
@@ -16169,6 +16419,30 @@ class loreline_Interpreter {
 			_gthis.evalShuffledItems(alt,indices,idx + 1,next);
 		});
 	}
+	getBeatVisitCount(beat) {
+		let key = beat.id.thisVal;
+		let state = this.nodeStates.map._get(key.high,key.low);
+		if(state == null) {
+			return 0;
+		}
+		let count = loreline_Objects.getField(this,state.fields,"_visitCount");
+		if(count == null) {
+			return 0;
+		}
+		return count;
+	}
+	incrementBeatVisitCount(beat) {
+		let key = beat.id.thisVal;
+		let state = this.nodeStates.map._get(key.high,key.low);
+		if(state == null) {
+			state = new loreline_RuntimeState(this,beat,null,null);
+			let key = beat.id.thisVal;
+			this.nodeStates.map._set(key.high,key.low,state);
+		}
+		let tmp = loreline_Objects.getField(this,state.fields,"_visitCount");
+		let count = tmp != null ? tmp : 0;
+		loreline_Objects.setField(this,state.fields,"_visitCount",count + 1);
+	}
 	getAlternativeVisitCount(alt) {
 		let key = alt.id.thisVal;
 		let state = this.nodeStates.map._get(key.high,key.low);
@@ -16191,14 +16465,33 @@ class loreline_Interpreter {
 		}
 		loreline_Objects.setField(this,state.fields,"_visitCount",count);
 	}
+	isChoiceOptionChosen(option) {
+		let key = option.id.thisVal;
+		let state = this.nodeStates.map._get(key.high,key.low);
+		if(state == null) {
+			return false;
+		}
+		let chosen = loreline_Objects.getField(this,state.fields,"_chosen");
+		if(chosen == null) {
+			return false;
+		}
+		return chosen;
+	}
+	setChoiceOptionChosen(option) {
+		let key = option.id.thisVal;
+		let state = this.nodeStates.map._get(key.high,key.low);
+		if(state == null) {
+			state = new loreline_RuntimeState(this,option,null,null);
+			let key = option.id.thisVal;
+			this.nodeStates.map._set(key.high,key.low,state);
+		}
+		loreline_Objects.setField(this,state.fields,"_chosen",true);
+	}
 	evalAssignment(assign,next) {
 		let target = this.resolveAssignmentTarget(assign.target);
 		let value = this.evaluateExpression(assign.value);
 		let currentValue;
 		switch(assign.op._hx_index) {
-		case 20:
-			currentValue = value;
-			break;
 		case 21:
 			currentValue = this.performOperation(loreline_TokenType.OpPlus,this.readAccess(target),value,assign.pos);
 			break;
@@ -16211,6 +16504,9 @@ class loreline_Interpreter {
 		case 24:
 			currentValue = this.performOperation(loreline_TokenType.OpDivide,this.readAccess(target),value,assign.pos);
 			break;
+		case 20:case 25:
+			currentValue = value;
+			break;
 		default:
 			throw haxe_Exception.thrown(new loreline_RuntimeError("Invalid assignment operator",assign.pos));
 		}
@@ -16300,6 +16596,20 @@ class loreline_Interpreter {
 		}
 		return false;
 	}
+	resolveBeatByName(name,scopeLevel) {
+		if(scopeLevel == null) {
+			scopeLevel = -1;
+		}
+		let i = scopeLevel == -1 ? this.stack.length - 1 : scopeLevel;
+		while(i >= 0) {
+			let b = this.stack[i].beatByName(name);
+			if(b != null) {
+				return b;
+			}
+			--i;
+		}
+		return this.topLevelBeats.h[name];
+	}
 	resolveBeatFromCall(call,scopeLevel) {
 		if(scopeLevel == null) {
 			scopeLevel = -1;
@@ -16307,21 +16617,7 @@ class loreline_Interpreter {
 		if(((call.target) instanceof loreline_NAccess)) {
 			let access = call.target;
 			if(access.target == null) {
-				let beatName = access.name;
-				let resolvedBeat = null;
-				let i = scopeLevel == -1 ? this.stack.length - 1 : scopeLevel;
-				while(i >= 0) {
-					let scope = this.stack[i];
-					let beatInScope = scope.beatByName(beatName);
-					if(beatInScope != null) {
-						resolvedBeat = beatInScope;
-						break;
-					}
-					--i;
-				}
-				if(resolvedBeat == null && Object.prototype.hasOwnProperty.call(this.topLevelBeats.h,beatName)) {
-					resolvedBeat = this.topLevelBeats.h[beatName];
-				}
+				let resolvedBeat = this.resolveBeatByName(access.name,scopeLevel);
 				if(resolvedBeat != null) {
 					return resolvedBeat;
 				}
@@ -16909,6 +17205,8 @@ class loreline_Interpreter {
 					helper = loreline_Objects.getStringHelper(this,access.name);
 				} else if(loreline_Arrays.isArray(obj)) {
 					helper = loreline_Objects.getArrayHelper(this,access.name);
+				} else if(((obj) instanceof loreline_NBeatDecl)) {
+					helper = loreline_Objects.getBeatHelper(this,access.name);
 				} else if(loreline_Objects.isFields(obj)) {
 					helper = loreline_Objects.getMapHelper(this,access.name);
 				}
@@ -17055,11 +17353,20 @@ class loreline_Interpreter {
 				return this.evaluateString(str).text;
 			}
 			break;
+		case loreline_NTernary:
+			let ternary = expr;
+			let condValue = this.evaluateCondition(ternary.condition);
+			if(condValue) {
+				return this.evaluateExpression(ternary.trueExpr);
+			} else {
+				return this.evaluateExpression(ternary.falseExpr);
+			}
+			break;
 		case loreline_NUnary:
 			let un = expr;
 			let operand = this.evaluateExpression(un.operand);
 			switch(un.op._hx_index) {
-			case 26:
+			case 27:
 				if(typeof(operand) == "number" && ((operand | 0) === operand)) {
 					let v = operand;
 					return -v;
@@ -17070,7 +17377,7 @@ class loreline_Interpreter {
 					throw haxe_Exception.thrown(new loreline_RuntimeError("Invalid unary operation",un.pos));
 				}
 				break;
-			case 38:
+			case 39:
 				if(typeof(operand) == "boolean") {
 					let v = operand;
 					return !v;
@@ -17140,6 +17447,10 @@ class loreline_Interpreter {
 				throw haxe_Exception.thrown(new loreline_RuntimeError("Function not found: " + name2,pos3));
 			}
 			break;
+		case 4:
+			let pos4 = access.pos;
+			let beat = access.beat;
+			return beat;
 		}
 	}
 	writeAccess(access,value) {
@@ -17167,6 +17478,10 @@ class loreline_Interpreter {
 			let pos3 = access.pos;
 			let name2 = access.name;
 			throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot overwrite function: " + name2,pos3));
+		case 4:
+			let pos4 = access.pos;
+			let beat = access.beat;
+			throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot overwrite beat: " + beat.name,pos4));
 		}
 	}
 	resolveAssignmentTarget(target) {
@@ -17271,6 +17586,19 @@ class loreline_Interpreter {
 			}
 			return loreline_RuntimeAccess.FunctionAccess(tmp1 != null ? tmp1 : this.script.pos,name);
 		}
+		let beat = this.resolveBeatByName(name);
+		if(beat != null) {
+			let tmp = access != null ? access.pos : null;
+			let tmp1;
+			if(tmp != null) {
+				tmp1 = tmp;
+			} else {
+				let tmp = this.get_currentScope();
+				let tmp2 = tmp != null ? tmp.node : null;
+				tmp1 = tmp2 != null ? tmp2.pos : null;
+			}
+			return loreline_RuntimeAccess.BeatAccess(tmp1 != null ? tmp1 : this.script.pos,beat);
+		}
 		if(!this.strictAccess) {
 			let tmp = access != null ? access.pos : null;
 			let tmp1;
@@ -17322,7 +17650,7 @@ class loreline_Interpreter {
 		let leftType = Type.typeof(left);
 		let rightType = Type.typeof(right);
 		switch(op._hx_index) {
-		case 25:
+		case 26:
 			switch(leftType._hx_index) {
 			case 1:
 				switch(rightType._hx_index) {
@@ -17459,7 +17787,7 @@ class loreline_Interpreter {
 				}
 			}
 			break;
-		case 26:case 27:case 28:case 29:
+		case 27:case 28:case 29:case 30:
 			switch(leftType._hx_index) {
 			case 1:case 2:
 				switch(rightType._hx_index) {
@@ -17467,11 +17795,11 @@ class loreline_Interpreter {
 					let leftNum = parseFloat(Std.string(left));
 					let rightNum = parseFloat(Std.string(right));
 					switch(op._hx_index) {
-					case 26:
-						return leftNum - rightNum;
 					case 27:
-						return leftNum * rightNum;
+						return leftNum - rightNum;
 					case 28:
+						return leftNum * rightNum;
+					case 29:
 						if(rightNum == 0) {
 							let tmp = pos;
 							let tmp1;
@@ -17485,7 +17813,7 @@ class loreline_Interpreter {
 							throw haxe_Exception.thrown(new loreline_RuntimeError("Division by zero",tmp1 != null ? tmp1 : this.script.pos));
 						}
 						return leftNum / rightNum;
-					case 29:
+					case 30:
 						if(rightNum == 0) {
 							let tmp = pos;
 							let tmp1;
@@ -17506,16 +17834,16 @@ class loreline_Interpreter {
 				default:
 					let opName;
 					switch(op._hx_index) {
-					case 26:
+					case 27:
 						opName = "subtract";
 						break;
-					case 27:
+					case 28:
 						opName = "multiply";
 						break;
-					case 28:
+					case 29:
 						opName = "divide";
 						break;
-					case 29:
+					case 30:
 						opName = "modulo";
 						break;
 					default:
@@ -17537,16 +17865,16 @@ class loreline_Interpreter {
 			default:
 				let opName1;
 				switch(op._hx_index) {
-				case 26:
+				case 27:
 					opName1 = "subtract";
 					break;
-				case 27:
+				case 28:
 					opName1 = "multiply";
 					break;
-				case 28:
+				case 29:
 					opName1 = "divide";
 					break;
-				case 29:
+				case 30:
 					opName1 = "modulo";
 					break;
 				default:
@@ -17565,17 +17893,18 @@ class loreline_Interpreter {
 				throw haxe_Exception.thrown(new loreline_RuntimeError(tmp9,tmp11 != null ? tmp11 : this.script.pos));
 			}
 			break;
-		case 30:case 31:
+		case 31:case 32:
+			let result = ((left) instanceof loreline_NBeatDecl) && typeof(right) == "string" ? left.name == right : typeof(left) == "string" && ((right) instanceof loreline_NBeatDecl) ? left == right.name : ((left) instanceof loreline_NBeatDecl) && ((right) instanceof loreline_NBeatDecl) ? left.name == right.name : left == right;
 			switch(op._hx_index) {
-			case 30:
-				return left == right;
 			case 31:
-				return left != right;
+				return result;
+			case 32:
+				return !result;
 			default:
 				throw haxe_Exception.thrown("Unreachable");
 			}
 			break;
-		case 32:case 33:case 34:case 35:
+		case 33:case 34:case 35:case 36:
 			switch(leftType._hx_index) {
 			case 1:case 2:
 				switch(rightType._hx_index) {
@@ -17583,13 +17912,13 @@ class loreline_Interpreter {
 					let leftNum1 = parseFloat(Std.string(left));
 					let rightNum1 = parseFloat(Std.string(right));
 					switch(op._hx_index) {
-					case 32:
-						return leftNum1 > rightNum1;
 					case 33:
-						return leftNum1 < rightNum1;
+						return leftNum1 > rightNum1;
 					case 34:
-						return leftNum1 >= rightNum1;
+						return leftNum1 < rightNum1;
 					case 35:
+						return leftNum1 >= rightNum1;
+					case 36:
 						return leftNum1 <= rightNum1;
 					default:
 						throw haxe_Exception.thrown("Unreachable");
@@ -17623,12 +17952,12 @@ class loreline_Interpreter {
 				throw haxe_Exception.thrown(new loreline_RuntimeError(tmp15,tmp17 != null ? tmp17 : this.script.pos));
 			}
 			break;
-		case 36:
+		case 37:
 			let _g = op.word;
 			if(leftType._hx_index == 3) {
 				if(rightType._hx_index == 3) {
 					switch(op._hx_index) {
-					case 36:
+					case 37:
 						let _g = op.word;
 						if(left) {
 							return right;
@@ -17636,7 +17965,7 @@ class loreline_Interpreter {
 							return false;
 						}
 						break;
-					case 37:
+					case 38:
 						let _g1 = op.word;
 						if(!left) {
 							return right;
@@ -17674,12 +18003,12 @@ class loreline_Interpreter {
 				throw haxe_Exception.thrown(new loreline_RuntimeError(tmp,tmp2 != null ? tmp2 : this.script.pos));
 			}
 			break;
-		case 37:
+		case 38:
 			let _g1 = op.word;
 			if(leftType._hx_index == 3) {
 				if(rightType._hx_index == 3) {
 					switch(op._hx_index) {
-					case 36:
+					case 37:
 						let _g = op.word;
 						if(left) {
 							return right;
@@ -17687,7 +18016,7 @@ class loreline_Interpreter {
 							return false;
 						}
 						break;
-					case 37:
+					case 38:
 						let _g1 = op.word;
 						if(!left) {
 							return right;
@@ -17740,14 +18069,92 @@ class loreline_Interpreter {
 		}
 	}
 	valueToString(value) {
+		return this.valueToStringImpl(value,null);
+	}
+	valueToStringImpl(value,seen) {
 		if(value == null) {
 			return "null";
-		} else {
-			return Std.string(value);
 		}
-	}
-	printLoreline(node) {
-		try {
+		if(typeof(value) == "string") {
+			return value;
+		}
+		if(typeof(value) == "boolean" || typeof(value) == "number" && ((value | 0) === value) || typeof(value) == "number") {
+			if(value == null) {
+				return "null";
+			} else {
+				return Std.string(value);
+			}
+		}
+		if(seen == null) {
+			seen = [];
+		}
+		let _g = 0;
+		while(_g < seen.length) {
+			let s = seen[_g];
+			++_g;
+			if(s == value) {
+				return "...";
+			}
+		}
+		seen.push(value);
+		if(loreline_Arrays.isArray(value)) {
+			let len = loreline_Arrays.arrayLength(value);
+			let buf_b = "";
+			buf_b += "[";
+			let _g = 0;
+			let _g1 = len;
+			while(_g < _g1) {
+				let i = _g++;
+				if(i > 0) {
+					buf_b += ", ";
+				}
+				buf_b += Std.string(this.valueToStringImpl(loreline_Arrays.arrayGet(value,i),seen));
+			}
+			buf_b += "]";
+			seen.pop();
+			return buf_b;
+		}
+		if(((value) instanceof loreline_NBeatDecl)) {
+			seen.pop();
+			return value.name;
+		}
+		if(loreline_Objects.isFields(value)) {
+			let keys = loreline_Objects.getFields(this,value);
+			keys.sort(function(a,b) {
+				if(a < b) {
+					return -1;
+				} else if(a > b) {
+					return 1;
+				} else {
+					return 0;
+				}
+			});
+			let buf_b = "";
+			buf_b += "{";
+			let _g = 0;
+			let _g1 = keys.length;
+			while(_g < _g1) {
+				let i = _g++;
+				if(i > 0) {
+					buf_b += ", ";
+				}
+				buf_b += Std.string(keys[i]);
+				buf_b += ": ";
+				buf_b += Std.string(this.valueToStringImpl(loreline_Objects.getField(this,value,keys[i]),seen));
+			}
+			buf_b += "}";
+			seen.pop();
+			return buf_b;
+		}
+		seen.pop();
+		if(value == null) {
+			return "null";
+		} else {
+			return Std.string(value);
+		}
+	}
+	printLoreline(node) {
+		try {
 			let printer = new loreline_Printer();
 			printer.enableComments = false;
 			return StringTools.trim(printer.print(node));
@@ -17775,6 +18182,686 @@ class loreline_Json {
 }
 $hxClasses["loreline.Json"] = loreline_Json;
 loreline_Json.__name__ = "loreline.Json";
+class loreline_JsonToAst {
+	static scriptFromJson(json) {
+		if(json == null) {
+			throw haxe_Exception.thrown("Cannot create Script from null JSON");
+		}
+		let nodeType = json.type;
+		if(nodeType != "Script") {
+			throw haxe_Exception.thrown("Expected Script node, got: " + nodeType);
+		}
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let bodyArr = json.body;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < bodyArr.length) {
+			let item = bodyArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(item));
+		}
+		let body = _g;
+		let script = new loreline_Script(id,pos,body);
+		script.indentSize = json.indentSize != null ? json.indentSize : 2;
+		loreline_JsonToAst.applyComments(script,json);
+		return script;
+	}
+	static nodeFromJson(json) {
+		if(json == null) {
+			return null;
+		}
+		let nodeType = json.type;
+		switch(nodeType) {
+		case "Access":
+			return loreline_JsonToAst.accessFromJson(json);
+		case "Alternative":
+			return loreline_JsonToAst.alternativeFromJson(json);
+		case "ArrayAccess":
+			return loreline_JsonToAst.arrayAccessFromJson(json);
+		case "Assign":
+			return loreline_JsonToAst.assignFromJson(json);
+		case "Beat":
+			return loreline_JsonToAst.beatFromJson(json);
+		case "Binary":
+			return loreline_JsonToAst.binaryFromJson(json);
+		case "Block":
+			return loreline_JsonToAst.blockFromJson(json);
+		case "Call":
+			return loreline_JsonToAst.callFromJson(json);
+		case "Character":
+			return loreline_JsonToAst.characterFromJson(json);
+		case "Choice":
+			return loreline_JsonToAst.choiceStatementFromJson(json);
+		case "Comment":
+			return loreline_JsonToAst.commentFromJson(json);
+		case "Dialogue":
+			return loreline_JsonToAst.dialogueStatementFromJson(json);
+		case "Field":
+			return loreline_JsonToAst.objectFieldFromJson(json);
+		case "Function":
+			return loreline_JsonToAst.functionDeclFromJson(json);
+		case "If":
+			return loreline_JsonToAst.ifStatementFromJson(json);
+		case "Import":
+			return loreline_JsonToAst.importStatementFromJson(json);
+		case "Insertion":
+			return loreline_JsonToAst.insertionFromJson(json);
+		case "Literal":
+			return loreline_JsonToAst.literalFromJson(json);
+		case "Option":
+			return loreline_JsonToAst.choiceOptionFromJson(json);
+		case "Part":
+			return loreline_JsonToAst.stringPartFromJson(json);
+		case "Script":
+			return loreline_JsonToAst.scriptFromJson(json);
+		case "State":
+			return loreline_JsonToAst.stateFromJson(json);
+		case "String":
+			return loreline_JsonToAst.stringLiteralFromJson(json);
+		case "Ternary":
+			return loreline_JsonToAst.ternaryFromJson(json);
+		case "Text":
+			return loreline_JsonToAst.textStatementFromJson(json);
+		case "Transition":
+			return loreline_JsonToAst.transitionFromJson(json);
+		case "Unary":
+			return loreline_JsonToAst.unaryFromJson(json);
+		default:
+			throw haxe_Exception.thrown("Unknown node type: " + nodeType);
+		}
+	}
+	static commentFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let isHash = json.isHash != null && json.isHash;
+		return new loreline_Comment(id,pos,json.content,json.multiline,isHash);
+	}
+	static stateFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let fieldsArr = json.fields;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < fieldsArr.length) {
+			let f = fieldsArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(f));
+		}
+		let fields = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NStateDecl(id,pos,json.temporary,fields,comments.leading,comments.trailing);
+		node.style = loreline_JsonToAst.blockStyleFromString(json.style);
+		return node;
+	}
+	static objectFieldFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NObjectField(id,pos,json.name,loreline_JsonToAst.nodeFromJson(json.value),comments.leading,comments.trailing);
+	}
+	static characterFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let namePos = loreline_JsonToAst.positionFromJson(json.namePos);
+		let fieldsArr = json.fields;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < fieldsArr.length) {
+			let f = fieldsArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(f));
+		}
+		let fields = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NCharacterDecl(id,pos,json.name,namePos,fields,comments.leading,comments.trailing);
+		node.style = loreline_JsonToAst.blockStyleFromString(json.style);
+		return node;
+	}
+	static beatFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let bodyArr = json.body;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < bodyArr.length) {
+			let item = bodyArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(item));
+		}
+		let body = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NBeatDecl(id,pos,json.name,body,comments.leading,comments.trailing);
+		node.style = loreline_JsonToAst.blockStyleFromString(json.style);
+		return node;
+	}
+	static stringPartFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let partStr = json.part;
+		let partType;
+		switch(partStr) {
+		case "Expr":
+			partType = loreline_StringPartType.Expr(loreline_JsonToAst.nodeFromJson(json.expression));
+			break;
+		case "Raw":
+			partType = loreline_StringPartType.Raw(json.text);
+			break;
+		case "Tag":
+			partType = loreline_StringPartType.Tag(json.closing,loreline_JsonToAst.nodeFromJson(json.content));
+			break;
+		default:
+			throw haxe_Exception.thrown("Unknown string part type: " + partStr);
+		}
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NStringPart(id,pos,partType,comments.leading,comments.trailing);
+	}
+	static stringLiteralFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let quotes = loreline_JsonToAst.quotesFromString(json.quotes);
+		let partsArr = json.parts;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < partsArr.length) {
+			let p = partsArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(p));
+		}
+		let parts = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NStringLiteral(id,pos,quotes,parts,comments.leading,comments.trailing);
+	}
+	static textStatementFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let content = loreline_JsonToAst.nodeFromJson(json.content);
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NTextStatement(id,pos,content,comments.leading,comments.trailing);
+		if(json.condition != null) {
+			node.condition = loreline_JsonToAst.nodeFromJson(json.condition);
+			node.conditionStyle = loreline_JsonToAst.conditionStyleFromString(json.conditionStyle);
+			node.conditionPos = loreline_JsonToAst.positionFromJson(json.conditionPos);
+		}
+		return node;
+	}
+	static dialogueStatementFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let characterPos = loreline_JsonToAst.positionFromJson(json.characterPos);
+		let content = loreline_JsonToAst.nodeFromJson(json.content);
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NDialogueStatement(id,pos,json.character,characterPos,content,comments.leading,comments.trailing);
+		if(json.condition != null) {
+			node.condition = loreline_JsonToAst.nodeFromJson(json.condition);
+			node.conditionStyle = loreline_JsonToAst.conditionStyleFromString(json.conditionStyle);
+			node.conditionPos = loreline_JsonToAst.positionFromJson(json.conditionPos);
+		}
+		return node;
+	}
+	static choiceStatementFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let optionsArr = json.options;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < optionsArr.length) {
+			let o = optionsArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(o));
+		}
+		let options = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NChoiceStatement(id,pos,options,comments.leading,comments.trailing);
+		node.style = loreline_JsonToAst.blockStyleFromString(json.style);
+		return node;
+	}
+	static choiceOptionFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let text = json.text != null ? loreline_JsonToAst.nodeFromJson(json.text) : null;
+		let insertion = json.insertion != null ? loreline_JsonToAst.nodeFromJson(json.insertion) : null;
+		let condition = json.condition != null ? loreline_JsonToAst.nodeFromJson(json.condition) : null;
+		let condStyle = json.conditionStyle != null ? loreline_JsonToAst.conditionStyleFromString(json.conditionStyle) : 0;
+		let bodyArr = json.body;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < bodyArr.length) {
+			let item = bodyArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(item));
+		}
+		let body = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NChoiceOption(id,pos,text,insertion,condition,condStyle,body,comments.leading,comments.trailing);
+		node.style = loreline_JsonToAst.blockStyleFromString(json.style);
+		if(json.once != null && json.once) {
+			node.once = true;
+		}
+		if(json.conditionPos != null) {
+			node.conditionPos = loreline_JsonToAst.positionFromJson(json.conditionPos);
+		}
+		return node;
+	}
+	static blockFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let bodyArr = json.body;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < bodyArr.length) {
+			let item = bodyArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(item));
+		}
+		let body = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NBlock(id,pos,body,comments.leading,comments.trailing);
+		node.style = loreline_JsonToAst.blockStyleFromString(json.style);
+		return node;
+	}
+	static ifStatementFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let condition = loreline_JsonToAst.nodeFromJson(json.condition);
+		let condStyle = loreline_JsonToAst.conditionStyleFromString(json.conditionStyle);
+		let thenArr = json.thenBranch;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < thenArr.length) {
+			let item = thenArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(item));
+		}
+		let thenBody = _g;
+		let thenBlock = new loreline_NBlock(loreline_NodeId.UNDEFINED,pos,thenBody);
+		thenBlock.style = loreline_JsonToAst.blockStyleFromString(json.thenStyle);
+		let elseBlock = null;
+		if(json.elseBranch != null) {
+			let elseArr = json.elseBranch;
+			let _g = [];
+			let _g1 = 0;
+			while(_g1 < elseArr.length) {
+				let item = elseArr[_g1];
+				++_g1;
+				_g.push(loreline_JsonToAst.nodeFromJson(item));
+			}
+			let elseBody = _g;
+			elseBlock = new loreline_NBlock(loreline_NodeId.UNDEFINED,pos,elseBody);
+			elseBlock.style = loreline_JsonToAst.blockStyleFromString(json.elseStyle);
+		}
+		let comments = loreline_JsonToAst.extractComments(json);
+		let elseLeading = null;
+		let elseTrailing = null;
+		if(json.comments != null) {
+			if(json.comments.elseLeading != null) {
+				let arr = json.comments.elseLeading;
+				let _g = [];
+				let _g1 = 0;
+				while(_g1 < arr.length) {
+					let c = arr[_g1];
+					++_g1;
+					_g.push(loreline_JsonToAst.commentFromJson(c));
+				}
+				elseLeading = _g;
+			}
+			if(json.comments.elseTrailing != null) {
+				let arr = json.comments.elseTrailing;
+				let _g = [];
+				let _g1 = 0;
+				while(_g1 < arr.length) {
+					let c = arr[_g1];
+					++_g1;
+					_g.push(loreline_JsonToAst.commentFromJson(c));
+				}
+				elseTrailing = _g;
+			}
+		}
+		return new loreline_NIfStatement(id,pos,condition,condStyle,thenBlock,elseBlock,comments.leading,comments.trailing,elseLeading,elseTrailing);
+	}
+	static alternativeFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let mode = loreline_JsonToAst.alternativeModeFromString(json.mode);
+		let itemsArr = json.items;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < itemsArr.length) {
+			let item = itemsArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(item));
+		}
+		let items = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NAlternative(id,pos,mode,items,comments.leading,comments.trailing);
+		node.style = loreline_JsonToAst.blockStyleFromString(json.style);
+		if(json.separatorComments != null) {
+			let sepArr = json.separatorComments;
+			let _g = [];
+			let _g1 = 0;
+			while(_g1 < sepArr.length) {
+				let commentsGroup = sepArr[_g1];
+				++_g1;
+				if(commentsGroup != null) {
+					let group = commentsGroup;
+					let _g1 = [];
+					let _g2 = 0;
+					while(_g2 < group.length) {
+						let c = group[_g2];
+						++_g2;
+						_g1.push(loreline_JsonToAst.commentFromJson(c));
+					}
+					_g.push(_g1);
+				} else {
+					_g.push(null);
+				}
+			}
+			node.separatorComments = _g;
+		}
+		return node;
+	}
+	static callFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let target = loreline_JsonToAst.nodeFromJson(json.target);
+		let argsArr = json.args;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < argsArr.length) {
+			let a = argsArr[_g1];
+			++_g1;
+			_g.push(loreline_JsonToAst.nodeFromJson(a));
+		}
+		let args = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NCall(id,pos,target,args,comments.leading,comments.trailing);
+	}
+	static transitionFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let targetPos = loreline_JsonToAst.positionFromJson(json.targetPos);
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NTransition(id,pos,json.target,targetPos,comments.leading,comments.trailing);
+	}
+	static insertionFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let targetPos = loreline_JsonToAst.positionFromJson(json.targetPos);
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NInsertion(id,pos,json.target,targetPos,comments.leading,comments.trailing);
+	}
+	static functionDeclFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let name = json.name;
+		let argsArr = json.args;
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < argsArr.length) {
+			let a = argsArr[_g1];
+			++_g1;
+			_g.push(a);
+		}
+		let args = _g;
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NFunctionDecl(id,pos,name,args,json.code,json.external,comments.leading,comments.trailing);
+	}
+	static literalFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let litStr = json.literal;
+		let comments = loreline_JsonToAst.extractComments(json);
+		let literalType;
+		let value;
+		switch(litStr) {
+		case "Array":
+			literalType = loreline_LiteralType.Array;
+			if(json.value != null) {
+				let arr = json.value;
+				let _g = [];
+				let _g1 = 0;
+				while(_g1 < arr.length) {
+					let elem = arr[_g1];
+					++_g1;
+					if(Object.prototype.hasOwnProperty.call(elem,"type")) {
+						_g.push(loreline_JsonToAst.nodeFromJson(elem));
+					} else {
+						_g.push(elem);
+					}
+				}
+				value = _g;
+			} else {
+				value = null;
+			}
+			break;
+		case "Boolean":
+			literalType = loreline_LiteralType.Boolean;
+			value = json.value;
+			break;
+		case "Null":
+			literalType = loreline_LiteralType.Null;
+			value = null;
+			break;
+		case "Number":
+			literalType = loreline_LiteralType.Number;
+			value = json.value;
+			break;
+		case "Object":
+			let style = loreline_JsonToAst.blockStyleFromString(json.style);
+			literalType = loreline_LiteralType.Object(style);
+			if(json.value != null) {
+				let arr = json.value;
+				let _g = [];
+				let _g1 = 0;
+				while(_g1 < arr.length) {
+					let f = arr[_g1];
+					++_g1;
+					_g.push(loreline_JsonToAst.nodeFromJson(f));
+				}
+				value = _g;
+			} else {
+				value = [];
+			}
+			break;
+		default:
+			throw haxe_Exception.thrown("Unknown literal type: " + litStr);
+		}
+		return new loreline_NLiteral(id,pos,value,literalType,comments.leading,comments.trailing);
+	}
+	static accessFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let target = json.target != null ? loreline_JsonToAst.nodeFromJson(json.target) : null;
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NAccess(id,pos,target,json.name,comments.leading,comments.trailing);
+	}
+	static assignFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let target = loreline_JsonToAst.nodeFromJson(json.target);
+		let op = loreline_JsonToAst.tokenTypeFromString(json.op);
+		let value = loreline_JsonToAst.nodeFromJson(json.value);
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NAssign(id,pos,target,op,value,comments.leading,comments.trailing);
+	}
+	static arrayAccessFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let target = loreline_JsonToAst.nodeFromJson(json.target);
+		let index = loreline_JsonToAst.nodeFromJson(json.index);
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NArrayAccess(id,pos,target,index,comments.leading,comments.trailing);
+	}
+	static binaryFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let left = loreline_JsonToAst.nodeFromJson(json.left);
+		let op = loreline_JsonToAst.tokenTypeFromString(json.op);
+		let right = loreline_JsonToAst.nodeFromJson(json.right);
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NBinary(id,pos,left,op,right,comments.leading,comments.trailing);
+	}
+	static unaryFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let op = loreline_JsonToAst.tokenTypeFromString(json.op);
+		let operand = loreline_JsonToAst.nodeFromJson(json.operand);
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NUnary(id,pos,op,operand,comments.leading,comments.trailing);
+	}
+	static ternaryFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let condition = loreline_JsonToAst.nodeFromJson(json.condition);
+		let trueExpr = loreline_JsonToAst.nodeFromJson(json.trueExpr);
+		let falseExpr = loreline_JsonToAst.nodeFromJson(json.falseExpr);
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NTernary(id,pos,condition,trueExpr,falseExpr,comments.leading,comments.trailing);
+	}
+	static importStatementFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let path = loreline_JsonToAst.nodeFromJson(json.path);
+		let script = json.script != null ? loreline_JsonToAst.scriptFromJson(json.script) : null;
+		let comments = loreline_JsonToAst.extractComments(json);
+		return new loreline_NImportStatement(id,pos,path,script,comments.leading,comments.trailing);
+	}
+	static idFromJson(json) {
+		let idStr = json.id;
+		if(idStr != null) {
+			return loreline_NodeId.fromString(idStr);
+		} else {
+			return loreline_NodeId.UNDEFINED;
+		}
+	}
+	static positionFromJson(json) {
+		if(json == null) {
+			return new loreline_Position(0,0,0,0);
+		}
+		let length = json.length != null ? json.length : 0;
+		return new loreline_Position(json.line,json.column,json.offset,length);
+	}
+	static extractComments(json) {
+		if(json.comments == null) {
+			return { leading : null, trailing : null};
+		}
+		let leading = null;
+		let trailing = null;
+		if(json.comments.leading != null) {
+			let arr = json.comments.leading;
+			let _g = [];
+			let _g1 = 0;
+			while(_g1 < arr.length) {
+				let c = arr[_g1];
+				++_g1;
+				_g.push(loreline_JsonToAst.commentFromJson(c));
+			}
+			leading = _g;
+		}
+		if(json.comments.trailing != null) {
+			let arr = json.comments.trailing;
+			let _g = [];
+			let _g1 = 0;
+			while(_g1 < arr.length) {
+				let c = arr[_g1];
+				++_g1;
+				_g.push(loreline_JsonToAst.commentFromJson(c));
+			}
+			trailing = _g;
+		}
+		return { leading : leading, trailing : trailing};
+	}
+	static applyComments(node,json) {
+		let comments = loreline_JsonToAst.extractComments(json);
+		node.leadingComments = comments.leading;
+		node.trailingComments = comments.trailing;
+	}
+	static blockStyleFromString(s) {
+		if(s == "Braces") {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+	static conditionStyleFromString(s) {
+		if(s == "Parens") {
+			return 2;
+		} else {
+			return 0;
+		}
+	}
+	static alternativeModeFromString(s) {
+		switch(s) {
+		case "Cycle":
+			return 1;
+		case "Once":
+			return 2;
+		case "Pick":
+			return 3;
+		case "Shuffle":
+			return 4;
+		default:
+			return 0;
+		}
+	}
+	static quotesFromString(s) {
+		if(s == "DoubleQuotes") {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+	static tokenTypeFromString(s) {
+		switch(s) {
+		case "OpAssign":
+			return loreline_TokenType.OpAssign;
+		case "OpDivide":
+			return loreline_TokenType.OpDivide;
+		case "OpDivideAssign":
+			return loreline_TokenType.OpDivideAssign;
+		case "OpEquals":
+			return loreline_TokenType.OpEquals;
+		case "OpGreater":
+			return loreline_TokenType.OpGreater;
+		case "OpGreaterEq":
+			return loreline_TokenType.OpGreaterEq;
+		case "OpLess":
+			return loreline_TokenType.OpLess;
+		case "OpLessEq":
+			return loreline_TokenType.OpLessEq;
+		case "OpMinus":
+			return loreline_TokenType.OpMinus;
+		case "OpMinusAssign":
+			return loreline_TokenType.OpMinusAssign;
+		case "OpModulo":
+			return loreline_TokenType.OpModulo;
+		case "OpMultiply":
+			return loreline_TokenType.OpMultiply;
+		case "OpMultiplyAssign":
+			return loreline_TokenType.OpMultiplyAssign;
+		case "OpNot":
+			return loreline_TokenType.OpNot;
+		case "OpNotEquals":
+			return loreline_TokenType.OpNotEquals;
+		case "OpPlus":
+			return loreline_TokenType.OpPlus;
+		case "OpPlusAssign":
+			return loreline_TokenType.OpPlusAssign;
+		case "OpUnquotedAssign":
+			return loreline_TokenType.OpUnquotedAssign;
+		default:
+			if(s.startsWith("OpAnd")) {
+				return loreline_TokenType.OpAnd(s.indexOf("true") != -1);
+			} else if(s.startsWith("OpOr")) {
+				return loreline_TokenType.OpOr(s.indexOf("true") != -1);
+			} else {
+				throw haxe_Exception.thrown("Unknown operator: " + s);
+			}
+		}
+	}
+}
+$hxClasses["loreline.JsonToAst"] = loreline_JsonToAst;
+loreline_JsonToAst.__name__ = "loreline.JsonToAst";
 class loreline_Reference {
 	constructor(target,origin) {
 		this.target = target;
@@ -19057,39 +20144,41 @@ var loreline_TokenType = $hxEnums["loreline.TokenType"] = { __ename__:"loreline.
 	,OpMinusAssign: {_hx_name:"OpMinusAssign",_hx_index:22,__enum__:"loreline.TokenType",toString:$estr}
 	,OpMultiplyAssign: {_hx_name:"OpMultiplyAssign",_hx_index:23,__enum__:"loreline.TokenType",toString:$estr}
 	,OpDivideAssign: {_hx_name:"OpDivideAssign",_hx_index:24,__enum__:"loreline.TokenType",toString:$estr}
-	,OpPlus: {_hx_name:"OpPlus",_hx_index:25,__enum__:"loreline.TokenType",toString:$estr}
-	,OpMinus: {_hx_name:"OpMinus",_hx_index:26,__enum__:"loreline.TokenType",toString:$estr}
-	,OpMultiply: {_hx_name:"OpMultiply",_hx_index:27,__enum__:"loreline.TokenType",toString:$estr}
-	,OpDivide: {_hx_name:"OpDivide",_hx_index:28,__enum__:"loreline.TokenType",toString:$estr}
-	,OpModulo: {_hx_name:"OpModulo",_hx_index:29,__enum__:"loreline.TokenType",toString:$estr}
-	,OpEquals: {_hx_name:"OpEquals",_hx_index:30,__enum__:"loreline.TokenType",toString:$estr}
-	,OpNotEquals: {_hx_name:"OpNotEquals",_hx_index:31,__enum__:"loreline.TokenType",toString:$estr}
-	,OpGreater: {_hx_name:"OpGreater",_hx_index:32,__enum__:"loreline.TokenType",toString:$estr}
-	,OpLess: {_hx_name:"OpLess",_hx_index:33,__enum__:"loreline.TokenType",toString:$estr}
-	,OpGreaterEq: {_hx_name:"OpGreaterEq",_hx_index:34,__enum__:"loreline.TokenType",toString:$estr}
-	,OpLessEq: {_hx_name:"OpLessEq",_hx_index:35,__enum__:"loreline.TokenType",toString:$estr}
-	,OpAnd: ($_=function(word) { return {_hx_index:36,word:word,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="OpAnd",$_.__params__ = ["word"],$_)
-	,OpOr: ($_=function(word) { return {_hx_index:37,word:word,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="OpOr",$_.__params__ = ["word"],$_)
-	,OpNot: {_hx_name:"OpNot",_hx_index:38,__enum__:"loreline.TokenType",toString:$estr}
-	,Arrow: {_hx_name:"Arrow",_hx_index:39,__enum__:"loreline.TokenType",toString:$estr}
-	,Colon: {_hx_name:"Colon",_hx_index:40,__enum__:"loreline.TokenType",toString:$estr}
-	,Comma: {_hx_name:"Comma",_hx_index:41,__enum__:"loreline.TokenType",toString:$estr}
-	,Dot: {_hx_name:"Dot",_hx_index:42,__enum__:"loreline.TokenType",toString:$estr}
-	,LBrace: {_hx_name:"LBrace",_hx_index:43,__enum__:"loreline.TokenType",toString:$estr}
-	,RBrace: {_hx_name:"RBrace",_hx_index:44,__enum__:"loreline.TokenType",toString:$estr}
-	,LParen: {_hx_name:"LParen",_hx_index:45,__enum__:"loreline.TokenType",toString:$estr}
-	,RParen: {_hx_name:"RParen",_hx_index:46,__enum__:"loreline.TokenType",toString:$estr}
-	,LBracket: {_hx_name:"LBracket",_hx_index:47,__enum__:"loreline.TokenType",toString:$estr}
-	,RBracket: {_hx_name:"RBracket",_hx_index:48,__enum__:"loreline.TokenType",toString:$estr}
-	,CommentLine: ($_=function(content) { return {_hx_index:49,content:content,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="CommentLine",$_.__params__ = ["content"],$_)
-	,CommentMultiLine: ($_=function(content) { return {_hx_index:50,content:content,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="CommentMultiLine",$_.__params__ = ["content"],$_)
-	,CommentHash: ($_=function(content) { return {_hx_index:51,content:content,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="CommentHash",$_.__params__ = ["content"],$_)
-	,Indent: {_hx_name:"Indent",_hx_index:52,__enum__:"loreline.TokenType",toString:$estr}
-	,Unindent: {_hx_name:"Unindent",_hx_index:53,__enum__:"loreline.TokenType",toString:$estr}
-	,LineBreak: {_hx_name:"LineBreak",_hx_index:54,__enum__:"loreline.TokenType",toString:$estr}
-	,Eof: {_hx_name:"Eof",_hx_index:55,__enum__:"loreline.TokenType",toString:$estr}
+	,OpUnquotedAssign: {_hx_name:"OpUnquotedAssign",_hx_index:25,__enum__:"loreline.TokenType",toString:$estr}
+	,OpPlus: {_hx_name:"OpPlus",_hx_index:26,__enum__:"loreline.TokenType",toString:$estr}
+	,OpMinus: {_hx_name:"OpMinus",_hx_index:27,__enum__:"loreline.TokenType",toString:$estr}
+	,OpMultiply: {_hx_name:"OpMultiply",_hx_index:28,__enum__:"loreline.TokenType",toString:$estr}
+	,OpDivide: {_hx_name:"OpDivide",_hx_index:29,__enum__:"loreline.TokenType",toString:$estr}
+	,OpModulo: {_hx_name:"OpModulo",_hx_index:30,__enum__:"loreline.TokenType",toString:$estr}
+	,OpEquals: {_hx_name:"OpEquals",_hx_index:31,__enum__:"loreline.TokenType",toString:$estr}
+	,OpNotEquals: {_hx_name:"OpNotEquals",_hx_index:32,__enum__:"loreline.TokenType",toString:$estr}
+	,OpGreater: {_hx_name:"OpGreater",_hx_index:33,__enum__:"loreline.TokenType",toString:$estr}
+	,OpLess: {_hx_name:"OpLess",_hx_index:34,__enum__:"loreline.TokenType",toString:$estr}
+	,OpGreaterEq: {_hx_name:"OpGreaterEq",_hx_index:35,__enum__:"loreline.TokenType",toString:$estr}
+	,OpLessEq: {_hx_name:"OpLessEq",_hx_index:36,__enum__:"loreline.TokenType",toString:$estr}
+	,OpAnd: ($_=function(word) { return {_hx_index:37,word:word,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="OpAnd",$_.__params__ = ["word"],$_)
+	,OpOr: ($_=function(word) { return {_hx_index:38,word:word,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="OpOr",$_.__params__ = ["word"],$_)
+	,OpNot: {_hx_name:"OpNot",_hx_index:39,__enum__:"loreline.TokenType",toString:$estr}
+	,Arrow: {_hx_name:"Arrow",_hx_index:40,__enum__:"loreline.TokenType",toString:$estr}
+	,Colon: {_hx_name:"Colon",_hx_index:41,__enum__:"loreline.TokenType",toString:$estr}
+	,Question: {_hx_name:"Question",_hx_index:42,__enum__:"loreline.TokenType",toString:$estr}
+	,Comma: {_hx_name:"Comma",_hx_index:43,__enum__:"loreline.TokenType",toString:$estr}
+	,Dot: {_hx_name:"Dot",_hx_index:44,__enum__:"loreline.TokenType",toString:$estr}
+	,LBrace: {_hx_name:"LBrace",_hx_index:45,__enum__:"loreline.TokenType",toString:$estr}
+	,RBrace: {_hx_name:"RBrace",_hx_index:46,__enum__:"loreline.TokenType",toString:$estr}
+	,LParen: {_hx_name:"LParen",_hx_index:47,__enum__:"loreline.TokenType",toString:$estr}
+	,RParen: {_hx_name:"RParen",_hx_index:48,__enum__:"loreline.TokenType",toString:$estr}
+	,LBracket: {_hx_name:"LBracket",_hx_index:49,__enum__:"loreline.TokenType",toString:$estr}
+	,RBracket: {_hx_name:"RBracket",_hx_index:50,__enum__:"loreline.TokenType",toString:$estr}
+	,CommentLine: ($_=function(content) { return {_hx_index:51,content:content,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="CommentLine",$_.__params__ = ["content"],$_)
+	,CommentMultiLine: ($_=function(content) { return {_hx_index:52,content:content,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="CommentMultiLine",$_.__params__ = ["content"],$_)
+	,CommentHash: ($_=function(content) { return {_hx_index:53,content:content,__enum__:"loreline.TokenType",toString:$estr}; },$_._hx_name="CommentHash",$_.__params__ = ["content"],$_)
+	,Indent: {_hx_name:"Indent",_hx_index:54,__enum__:"loreline.TokenType",toString:$estr}
+	,Unindent: {_hx_name:"Unindent",_hx_index:55,__enum__:"loreline.TokenType",toString:$estr}
+	,LineBreak: {_hx_name:"LineBreak",_hx_index:56,__enum__:"loreline.TokenType",toString:$estr}
+	,Eof: {_hx_name:"Eof",_hx_index:57,__enum__:"loreline.TokenType",toString:$estr}
 };
-loreline_TokenType.__constructs__ = [loreline_TokenType.KwImport,loreline_TokenType.KwState,loreline_TokenType.KwBeat,loreline_TokenType.KwCharacter,loreline_TokenType.KwChoice,loreline_TokenType.KwIf,loreline_TokenType.KwElse,loreline_TokenType.KwNew,loreline_TokenType.KwSequence,loreline_TokenType.KwCycle,loreline_TokenType.KwOnce,loreline_TokenType.KwPick,loreline_TokenType.KwShuffle,loreline_TokenType.Separator,loreline_TokenType.Function,loreline_TokenType.LString,loreline_TokenType.LNumber,loreline_TokenType.LBoolean,loreline_TokenType.LNull,loreline_TokenType.Identifier,loreline_TokenType.OpAssign,loreline_TokenType.OpPlusAssign,loreline_TokenType.OpMinusAssign,loreline_TokenType.OpMultiplyAssign,loreline_TokenType.OpDivideAssign,loreline_TokenType.OpPlus,loreline_TokenType.OpMinus,loreline_TokenType.OpMultiply,loreline_TokenType.OpDivide,loreline_TokenType.OpModulo,loreline_TokenType.OpEquals,loreline_TokenType.OpNotEquals,loreline_TokenType.OpGreater,loreline_TokenType.OpLess,loreline_TokenType.OpGreaterEq,loreline_TokenType.OpLessEq,loreline_TokenType.OpAnd,loreline_TokenType.OpOr,loreline_TokenType.OpNot,loreline_TokenType.Arrow,loreline_TokenType.Colon,loreline_TokenType.Comma,loreline_TokenType.Dot,loreline_TokenType.LBrace,loreline_TokenType.RBrace,loreline_TokenType.LParen,loreline_TokenType.RParen,loreline_TokenType.LBracket,loreline_TokenType.RBracket,loreline_TokenType.CommentLine,loreline_TokenType.CommentMultiLine,loreline_TokenType.CommentHash,loreline_TokenType.Indent,loreline_TokenType.Unindent,loreline_TokenType.LineBreak,loreline_TokenType.Eof];
+loreline_TokenType.__constructs__ = [loreline_TokenType.KwImport,loreline_TokenType.KwState,loreline_TokenType.KwBeat,loreline_TokenType.KwCharacter,loreline_TokenType.KwChoice,loreline_TokenType.KwIf,loreline_TokenType.KwElse,loreline_TokenType.KwNew,loreline_TokenType.KwSequence,loreline_TokenType.KwCycle,loreline_TokenType.KwOnce,loreline_TokenType.KwPick,loreline_TokenType.KwShuffle,loreline_TokenType.Separator,loreline_TokenType.Function,loreline_TokenType.LString,loreline_TokenType.LNumber,loreline_TokenType.LBoolean,loreline_TokenType.LNull,loreline_TokenType.Identifier,loreline_TokenType.OpAssign,loreline_TokenType.OpPlusAssign,loreline_TokenType.OpMinusAssign,loreline_TokenType.OpMultiplyAssign,loreline_TokenType.OpDivideAssign,loreline_TokenType.OpUnquotedAssign,loreline_TokenType.OpPlus,loreline_TokenType.OpMinus,loreline_TokenType.OpMultiply,loreline_TokenType.OpDivide,loreline_TokenType.OpModulo,loreline_TokenType.OpEquals,loreline_TokenType.OpNotEquals,loreline_TokenType.OpGreater,loreline_TokenType.OpLess,loreline_TokenType.OpGreaterEq,loreline_TokenType.OpLessEq,loreline_TokenType.OpAnd,loreline_TokenType.OpOr,loreline_TokenType.OpNot,loreline_TokenType.Arrow,loreline_TokenType.Colon,loreline_TokenType.Question,loreline_TokenType.Comma,loreline_TokenType.Dot,loreline_TokenType.LBrace,loreline_TokenType.RBrace,loreline_TokenType.LParen,loreline_TokenType.RParen,loreline_TokenType.LBracket,loreline_TokenType.RBracket,loreline_TokenType.CommentLine,loreline_TokenType.CommentMultiLine,loreline_TokenType.CommentHash,loreline_TokenType.Indent,loreline_TokenType.Unindent,loreline_TokenType.LineBreak,loreline_TokenType.Eof];
 class loreline_TokenTypeHelpers {
 	static equals(a,b) {
 		switch(a._hx_index) {
@@ -19344,16 +20433,14 @@ class loreline_TokenTypeHelpers {
 			}
 			break;
 		case 36:
-			let _g2 = a.word;
 			if(b._hx_index == 36) {
-				let _g = b.word;
 				return true;
 			} else {
 				return Type.enumEq(a,b);
 			}
 			break;
 		case 37:
-			let _g3 = a.word;
+			let _g2 = a.word;
 			if(b._hx_index == 37) {
 				let _g = b.word;
 				return true;
@@ -19362,7 +20449,9 @@ class loreline_TokenTypeHelpers {
 			}
 			break;
 		case 38:
+			let _g3 = a.word;
 			if(b._hx_index == 38) {
+				let _g = b.word;
 				return true;
 			} else {
 				return Type.enumEq(a,b);
@@ -19382,15 +20471,15 @@ class loreline_TokenTypeHelpers {
 				return Type.enumEq(a,b);
 			}
 			break;
-		case 42:
-			if(b._hx_index == 42) {
+		case 41:
+			if(b._hx_index == 41) {
 				return true;
 			} else {
 				return Type.enumEq(a,b);
 			}
 			break;
-		case 43:
-			if(b._hx_index == 43) {
+		case 42:
+			if(b._hx_index == 42) {
 				return true;
 			} else {
 				return Type.enumEq(a,b);
@@ -19433,18 +20522,14 @@ class loreline_TokenTypeHelpers {
 			break;
 		case 49:
 			if(b._hx_index == 49) {
-				let c2 = b.content;
-				let c1 = a.content;
-				return c1 == c2;
+				return true;
 			} else {
 				return Type.enumEq(a,b);
 			}
 			break;
 		case 50:
 			if(b._hx_index == 50) {
-				let c2 = b.content;
-				let c1 = a.content;
-				return c1 == c2;
+				return true;
 			} else {
 				return Type.enumEq(a,b);
 			}
@@ -19460,14 +20545,18 @@ class loreline_TokenTypeHelpers {
 			break;
 		case 52:
 			if(b._hx_index == 52) {
-				return true;
+				let c2 = b.content;
+				let c1 = a.content;
+				return c1 == c2;
 			} else {
 				return Type.enumEq(a,b);
 			}
 			break;
 		case 53:
 			if(b._hx_index == 53) {
-				return true;
+				let c2 = b.content;
+				let c1 = a.content;
+				return c1 == c2;
 			} else {
 				return Type.enumEq(a,b);
 			}
@@ -19486,19 +20575,33 @@ class loreline_TokenTypeHelpers {
 				return Type.enumEq(a,b);
 			}
 			break;
+		case 56:
+			if(b._hx_index == 56) {
+				return true;
+			} else {
+				return Type.enumEq(a,b);
+			}
+			break;
+		case 57:
+			if(b._hx_index == 57) {
+				return true;
+			} else {
+				return Type.enumEq(a,b);
+			}
+			break;
 		default:
 			return Type.enumEq(a,b);
 		}
 	}
 	static isComment(a) {
 		switch(a._hx_index) {
-		case 49:
+		case 51:
 			let _g = a.content;
 			return true;
-		case 50:
+		case 52:
 			let _g1 = a.content;
 			return true;
-		case 51:
+		case 53:
 			let _g2 = a.content;
 			return true;
 		default:
@@ -19507,7 +20610,7 @@ class loreline_TokenTypeHelpers {
 	}
 	static isAssignOp(a) {
 		switch(a._hx_index) {
-		case 20:case 21:case 22:case 23:case 24:
+		case 20:case 21:case 22:case 23:case 24:case 25:
 			return true;
 		default:
 			return false;
@@ -19594,28 +20697,30 @@ class loreline_TokenTypeHelpers {
 		case 24:
 			return "/=";
 		case 25:
-			return "+";
+			return ":=";
 		case 26:
-			return "-";
+			return "+";
 		case 27:
-			return "*";
+			return "-";
 		case 28:
-			return "/";
+			return "*";
 		case 29:
-			return "%";
+			return "/";
 		case 30:
-			return "==";
+			return "%";
 		case 31:
-			return "!=";
+			return "==";
 		case 32:
-			return ">";
+			return "!=";
 		case 33:
-			return "<";
+			return ">";
 		case 34:
-			return ">=";
+			return "<";
 		case 35:
-			return "<=";
+			return ">=";
 		case 36:
+			return "<=";
+		case 37:
 			let word = a.word;
 			if(word) {
 				return "and";
@@ -19623,7 +20728,7 @@ class loreline_TokenTypeHelpers {
 				return "&&";
 			}
 			break;
-		case 37:
+		case 38:
 			let word1 = a.word;
 			if(word1) {
 				return "or";
@@ -19631,44 +20736,46 @@ class loreline_TokenTypeHelpers {
 				return "||";
 			}
 			break;
-		case 38:
-			return "!";
 		case 39:
-			return "->";
+			return "!";
 		case 40:
-			return ":";
+			return "->";
 		case 41:
-			return ",";
+			return ":";
 		case 42:
-			return ".";
+			return "?";
 		case 43:
-			return "{";
+			return ",";
 		case 44:
-			return "}";
+			return ".";
 		case 45:
-			return "(";
+			return "{";
 		case 46:
-			return ")";
+			return "}";
 		case 47:
-			return "[";
+			return "(";
 		case 48:
-			return "]";
+			return ")";
 		case 49:
+			return "[";
+		case 50:
+			return "]";
+		case 51:
 			let content = a.content;
 			return "comment";
-		case 50:
+		case 52:
 			let content1 = a.content;
 			return "multiline comment";
-		case 51:
+		case 53:
 			let content2 = a.content;
 			return "hash comment";
-		case 52:
+		case 54:
 			return "indent";
-		case 53:
+		case 55:
 			return "unindent";
-		case 54:
+		case 56:
 			return "line break";
-		case 55:
+		case 57:
 			return "end of file";
 		}
 	}
@@ -19758,7 +20865,7 @@ class loreline_Lexer {
 			case 8:case 9:case 10:case 11:case 12:case 13:
 				this.nextBlock = 9;
 				break;
-			case 43:
+			case 45:
 				let tmp;
 				switch(this.nextBlock) {
 				case 0:case 1:
@@ -19783,15 +20890,15 @@ class loreline_Lexer {
 				this.stack.push(tmp);
 				this.nextBlock = 10;
 				break;
-			case 47:
+			case 49:
 				this.stack.push(12);
 				this.nextBlock = 10;
 				break;
-			case 44:case 48:case 53:
+			case 46:case 50:case 55:
 				this.stack.pop();
 				this.nextBlock = 10;
 				break;
-			case 52:
+			case 54:
 				let tmp1;
 				switch(this.nextBlock) {
 				case 0:case 1:
@@ -19879,7 +20986,13 @@ class loreline_Lexer {
 		}
 		switch(c1) {
 		case 34:
-			return this.readString(startPos);
+			let tmp = this.tryReadUnquotedString();
+			if(tmp != null) {
+				return tmp;
+			} else {
+				return this.readString(startPos);
+			}
+			break;
 		case 91:
 			let _g = 0;
 			let _g1 = 1;
@@ -19957,9 +21070,9 @@ class loreline_Lexer {
 			this.previous = token2;
 			return token2;
 		default:
-			let tmp = this.tryReadUnquotedString();
-			if(tmp != null) {
-				return tmp;
+			let tmp1 = this.tryReadUnquotedString();
+			if(tmp1 != null) {
+				return tmp1;
 			} else {
 				switch(c1) {
 				case 33:
@@ -20669,30 +21782,69 @@ class loreline_Lexer {
 					}
 					break;
 				case 58:
-					let _g14 = 0;
-					let _g15 = 1;
-					while(_g14 < _g15) {
-						let _ = _g14++;
-						if(this.pos >= this.length) {
-							break;
+					let tmp2;
+					if(this.pos + 1 < this.length) {
+						let c = HxOverrides.cca(this.input,this.pos + 1);
+						tmp2 = c == null ? -1 : c;
+					} else {
+						tmp2 = 0;
+					}
+					if(tmp2 == 61) {
+						let count = 2;
+						if(count == null) {
+							count = 1;
 						}
-						let c = HxOverrides.cca(this.input,this.pos);
-						if((c == null ? -1 : c) == 10) {
-							this.line++;
-							this.column = 1;
-						} else {
-							this.column++;
+						let _g = 0;
+						let _g1 = count;
+						while(_g < _g1) {
+							let _ = _g++;
+							if(this.pos >= this.length) {
+								break;
+							}
+							let c = HxOverrides.cca(this.input,this.pos);
+							if((c == null ? -1 : c) == 10) {
+								this.line++;
+								this.column = 1;
+							} else {
+								this.column++;
+							}
+							this.pos++;
 						}
-						this.pos++;
-					}
-					let position7 = startPos;
-					if(position7 == null) {
-						position7 = new loreline_Position(this.startLine,this.startColumn,this.pos);
+						let position = startPos;
+						if(position == null) {
+							position = new loreline_Position(this.startLine,this.startColumn,this.pos);
+						}
+						position.length = this.pos - position.offset;
+						let token = new loreline_Token(loreline_TokenType.OpUnquotedAssign,position);
+						this.previous = token;
+						return token;
+					} else {
+						let _g = 0;
+						let _g1 = 1;
+						while(_g < _g1) {
+							let _ = _g++;
+							if(this.pos >= this.length) {
+								break;
+							}
+							let c = HxOverrides.cca(this.input,this.pos);
+							if((c == null ? -1 : c) == 10) {
+								this.line++;
+								this.column = 1;
+							} else {
+								this.column++;
+							}
+							this.pos++;
+						}
+						let position = startPos;
+						if(position == null) {
+							position = new loreline_Position(this.startLine,this.startColumn,this.pos);
+						}
+						position.length = this.pos - position.offset;
+						let token = new loreline_Token(loreline_TokenType.Colon,position);
+						this.previous = token;
+						return token;
 					}
-					position7.length = this.pos - position7.offset;
-					let token7 = new loreline_Token(loreline_TokenType.Colon,position7);
-					this.previous = token7;
-					return token7;
+					break;
 				case 60:
 					let c10 = c1;
 					if(c10 >= 48 && c10 <= 57) {
@@ -20915,11 +22067,32 @@ class loreline_Lexer {
 						}
 					}
 					break;
+				case 63:
+					let c13 = c1;
+					if(c13 >= 48 && c13 <= 57) {
+						return this.readNumber();
+					} else {
+						let c = c1;
+						if(c >= 97 && c <= 122 || c >= 65 && c <= 90 || c == 95) {
+							return this.readIdentifier();
+						} else {
+							this.pos++;
+							let position = null;
+							if(position == null) {
+								position = new loreline_Position(this.startLine,this.startColumn,this.pos);
+							}
+							position.length = this.pos - position.offset;
+							let token = new loreline_Token(loreline_TokenType.Question,position);
+							this.previous = token;
+							return token;
+						}
+					}
+					break;
 				case 93:
-					let _g16 = 0;
-					let _g17 = 1;
-					while(_g16 < _g17) {
-						let _ = _g16++;
+					let _g14 = 0;
+					let _g15 = 1;
+					while(_g14 < _g15) {
+						let _ = _g14++;
 						if(this.pos >= this.length) {
 							break;
 						}
@@ -20933,17 +22106,17 @@ class loreline_Lexer {
 						this.pos++;
 					}
 					this.strictExprs.pop();
-					let position8 = startPos;
-					if(position8 == null) {
-						position8 = new loreline_Position(this.startLine,this.startColumn,this.pos);
-					}
-					position8.length = this.pos - position8.offset;
-					let token8 = new loreline_Token(loreline_TokenType.RBracket,position8);
-					this.previous = token8;
-					return token8;
+					let position7 = startPos;
+					if(position7 == null) {
+						position7 = new loreline_Position(this.startLine,this.startColumn,this.pos);
+					}
+					position7.length = this.pos - position7.offset;
+					let token7 = new loreline_Token(loreline_TokenType.RBracket,position7);
+					this.previous = token7;
+					return token7;
 				case 124:
-					let c13 = c1;
-					if(c13 >= 48 && c13 <= 57) {
+					let c14 = c1;
+					if(c14 >= 48 && c14 <= 57) {
 						return this.readNumber();
 					} else {
 						let c = c1;
@@ -21017,8 +22190,8 @@ class loreline_Lexer {
 					}
 					break;
 				default:
-					let c14 = c1;
-					if(c14 >= 48 && c14 <= 57) {
+					let c15 = c1;
+					if(c15 >= 48 && c15 <= 57) {
 						return this.readNumber();
 					} else {
 						let c = c1;
@@ -22007,12 +23180,50 @@ class loreline_Lexer {
 		if(pos < this.length) {
 			let c = HxOverrides.cca(this.input,pos);
 			let c1 = c == null ? -1 : c;
+			let tmp;
+			if(c1 == 105 && pos + 1 < this.length) {
+				let c = HxOverrides.cca(this.input,pos + 1);
+				tmp = (c == null ? -1 : c) == 102;
+			} else {
+				tmp = false;
+			}
+			if(tmp) {
+				let tmp;
+				if(pos + 2 < this.length) {
+					let c = HxOverrides.cca(this.input,pos + 2);
+					let c1 = c == null ? -1 : c;
+					tmp = !(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95 || c1 >= 48 && c1 <= 57);
+				} else {
+					tmp = true;
+				}
+				if(tmp) {
+					return true;
+				}
+			}
 			if(c1 != 10 && c1 != 13 && c1 != 32 && c1 != 9 && c1 != 47) {
 				return false;
 			}
 		}
 		return true;
 	}
+	isChoiceOnceStart(pos) {
+		if(!this.inChoiceRoot()) {
+			return false;
+		}
+		let c = HxOverrides.cca(this.input,pos);
+		if((c == null ? -1 : c) != 45) {
+			return false;
+		}
+		++pos;
+		if(pos >= this.length) {
+			return false;
+		}
+		let c1 = HxOverrides.cca(this.input,pos);
+		if((c1 == null ? -1 : c1) != 32) {
+			return false;
+		}
+		return true;
+	}
 	isLabelStart(pos) {
 		pos = this._skipWhitespaceAndComments(pos,false);
 		let c = HxOverrides.cca(this.input,pos);
@@ -22212,7 +23423,7 @@ class loreline_Lexer {
 			if(!isEscape) {
 				if(c1 != 61) {
 					let c = HxOverrides.cca(this.input,pos + 1);
-					tmp = (c == null ? -1 : c) == 61 && (c1 == 43 || c1 == 45 || c1 == 42 || c1 == 47);
+					tmp = (c == null ? -1 : c) == 61 && (c1 == 43 || c1 == 45 || c1 == 42 || c1 == 47 || c1 == 58);
 				} else {
 					tmp = true;
 				}
@@ -22436,7 +23647,26 @@ class loreline_Lexer {
 			++pos;
 		}
 		if(!onlyTagsOnFirstLine) {
-			return -1;
+			while(true) {
+				let tmp;
+				let tmp1;
+				if(pos < this.length) {
+					let c = HxOverrides.cca(this.input,pos);
+					tmp1 = (c == null ? -1 : c) != 10;
+				} else {
+					tmp1 = false;
+				}
+				if(tmp1) {
+					let c = HxOverrides.cca(this.input,pos);
+					tmp = (c == null ? -1 : c) != 13;
+				} else {
+					tmp = false;
+				}
+				if(!tmp) {
+					break;
+				}
+				++pos;
+			}
 		}
 		let prevPos = pos;
 		let stopNextLine = true;
@@ -22638,6 +23868,20 @@ class loreline_Lexer {
 		}
 		return false;
 	}
+	followsUnquotedAssign() {
+		let i = this.tokenized.length - 1;
+		while(i >= 0) {
+			let token = this.tokenized[i];
+			if(loreline_TokenTypeHelpers.isComment(token.type) || token.type == loreline_TokenType.Indent || token.type == loreline_TokenType.Unindent) {
+				--i;
+			} else if(token.type == loreline_TokenType.OpUnquotedAssign) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+		return false;
+	}
 	followsOnlyLabelOrCommentsInLine() {
 		let foundLabel = false;
 		let i = this.tokenized.length - 1;
@@ -22677,12 +23921,29 @@ class loreline_Lexer {
 		}
 		return true;
 	}
-	hasNonSpecialChar(str) {
-		let _g = 0;
-		let _g1 = str.length;
-		while(_g < _g1) {
-			let i = _g++;
-			let found = false;
+	followsChoiceOncePrefix() {
+		if(!this.inChoiceRoot()) {
+			return false;
+		}
+		let i = this.tokenized.length - 1;
+		while(i >= 0) {
+			let token = this.tokenized[i];
+			if(loreline_TokenTypeHelpers.isComment(token.type) || token.type == loreline_TokenType.Indent || token.type == loreline_TokenType.Unindent) {
+				--i;
+			} else if(token.type == loreline_TokenType.OpMinus) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+		return false;
+	}
+	hasNonSpecialChar(str) {
+		let _g = 0;
+		let _g1 = str.length;
+		while(_g < _g1) {
+			let i = _g++;
+			let found = false;
 			let c = HxOverrides.cca(str,i);
 			let code = c == null ? -1 : c;
 			let _g1 = 0;
@@ -22780,19 +24041,19 @@ class loreline_Lexer {
 				let _g1 = _g.name;
 				this.strictExprs.push(1);
 				return;
-			case 46:case 48:
+			case 48:case 50:
 				this.strictExprs.push(1);
 				return;
-			case 49:
+			case 51:
 				let _g2 = _g.content;
 				break;
-			case 50:
+			case 52:
 				let _g3 = _g.content;
 				break;
-			case 51:
+			case 53:
 				let _g4 = _g.content;
 				break;
-			case 52:case 53:case 54:
+			case 54:case 55:case 56:
 				break;
 			default:
 				this.strictExprs.push(0);
@@ -22818,18 +24079,18 @@ class loreline_Lexer {
 			case 19:
 				let _g1 = _g.name;
 				return true;
-			case 46:case 48:
+			case 48:case 50:
 				return true;
-			case 49:
+			case 51:
 				let _g2 = _g.content;
 				break;
-			case 50:
+			case 52:
 				let _g3 = _g.content;
 				break;
-			case 51:
+			case 53:
 				let _g4 = _g.content;
 				break;
-			case 52:case 53:case 54:
+			case 54:case 55:case 56:
 				break;
 			default:
 				return false;
@@ -22858,6 +24119,20 @@ class loreline_Lexer {
 				if(cc == 10) {
 					break;
 				}
+				if(cc == 47 && this.pos + 1 < this.length) {
+					let c = HxOverrides.cca(this.input,this.pos + 1);
+					let next = c == null ? -1 : c;
+					if(next == 47 || next == 42) {
+						break;
+					}
+				}
+				if(cc == 35 && this.pos + 1 < this.length) {
+					let c = HxOverrides.cca(this.input,this.pos + 1);
+					let next = c == null ? -1 : c;
+					if(next >= 97 && next <= 122 || next >= 65 && next <= 90 || next == 95 || next >= 48 && next <= 57 || next == 45) {
+						break;
+					}
+				}
 				buf_b += String.fromCodePoint(cc);
 				this.pos++;
 			}
@@ -22872,6 +24147,272 @@ class loreline_Lexer {
 			return token;
 		}
 	}
+	scanStringEnd(startPos,allowTags) {
+		let p = startPos + 1;
+		let inTag = false;
+		while(p < this.length) {
+			let c = HxOverrides.cca(this.input,p);
+			let c1 = c == null ? -1 : c;
+			if(c1 == 92) {
+				p += 2;
+				continue;
+			}
+			if(c1 == 10) {
+				return -1;
+			}
+			if(c1 == 34 && !inTag) {
+				return p + 1;
+			}
+			if(allowTags && c1 == 60 && !inTag) {
+				let nc;
+				if(p + 1 < this.length) {
+					let c = HxOverrides.cca(this.input,p + 1);
+					nc = c == null ? -1 : c;
+				} else {
+					nc = 0;
+				}
+				let isClosing = nc == 47;
+				let checkPos = p + (isClosing ? 2 : 1);
+				if(checkPos < this.length) {
+					let c = HxOverrides.cca(this.input,checkPos);
+					let ns = c == null ? -1 : c;
+					if(ns >= 97 && ns <= 122 || ns >= 65 && ns <= 90 || ns == 95 || ns == 95 || ns == 36 || isClosing && ns == 62) {
+						inTag = true;
+					}
+				}
+			}
+			if(c1 == 62 && inTag) {
+				inTag = false;
+			}
+			if(c1 == 36 && p + 1 < this.length) {
+				let c = HxOverrides.cca(this.input,p + 1);
+				let next = c == null ? -1 : c;
+				if(next == 123) {
+					p += 2;
+					let depth = 1;
+					while(p < this.length && depth > 0) {
+						let c = HxOverrides.cca(this.input,p);
+						let ic = c == null ? -1 : c;
+						if(ic == 92) {
+							p += 2;
+							continue;
+						}
+						if(ic == 10) {
+							return -1;
+						}
+						let tmp;
+						if(ic == 47 && p + 1 < this.length) {
+							let c = HxOverrides.cca(this.input,p + 1);
+							tmp = (c == null ? -1 : c) == 47;
+						} else {
+							tmp = false;
+						}
+						if(tmp) {
+							return -1;
+						}
+						let tmp1;
+						if(ic == 47 && p + 1 < this.length) {
+							let c = HxOverrides.cca(this.input,p + 1);
+							tmp1 = (c == null ? -1 : c) == 42;
+						} else {
+							tmp1 = false;
+						}
+						if(tmp1) {
+							p += 2;
+							while(true) {
+								if(p >= this.length) {
+									return -1;
+								}
+								let c = HxOverrides.cca(this.input,p);
+								if((c == null ? -1 : c) == 10) {
+									return -1;
+								}
+								let tmp;
+								let tmp1;
+								if(p + 1 < this.length) {
+									let c = HxOverrides.cca(this.input,p);
+									tmp1 = (c == null ? -1 : c) == 42;
+								} else {
+									tmp1 = false;
+								}
+								if(tmp1) {
+									let c = HxOverrides.cca(this.input,p + 1);
+									tmp = (c == null ? -1 : c) == 47;
+								} else {
+									tmp = false;
+								}
+								if(tmp) {
+									p += 2;
+									break;
+								}
+								++p;
+							}
+							continue;
+						}
+						if(ic == 34) {
+							p = this.scanStringEnd(p,allowTags);
+							if(p == -1) {
+								return -1;
+							}
+							continue;
+						}
+						if(ic == 123) {
+							++depth;
+						} else if(ic == 125) {
+							--depth;
+						}
+						++p;
+					}
+					if(depth != 0) {
+						return -1;
+					}
+					continue;
+				}
+				if(next == 36) {
+					p += 2;
+					continue;
+				}
+				if(next >= 97 && next <= 122 || next >= 65 && next <= 90 || next == 95) {
+					++p;
+					while(true) {
+						let tmp;
+						if(p < this.length) {
+							let c = HxOverrides.cca(this.input,p);
+							let c1 = c == null ? -1 : c;
+							tmp = c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95 || c1 >= 48 && c1 <= 57;
+						} else {
+							tmp = false;
+						}
+						if(!tmp) {
+							break;
+						}
+						++p;
+					}
+					p = this.scanAccessorChain(p,allowTags);
+					if(p == -1) {
+						return -1;
+					}
+					continue;
+				}
+			}
+			++p;
+		}
+		return -1;
+	}
+	scanAccessorChain(p,allowTags) {
+		while(p < this.length) {
+			let c = HxOverrides.cca(this.input,p);
+			let c1 = c == null ? -1 : c;
+			let tmp;
+			if(c1 == 46 && p + 1 < this.length) {
+				let c = HxOverrides.cca(this.input,p + 1);
+				let c1 = c == null ? -1 : c;
+				tmp = c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95;
+			} else {
+				tmp = false;
+			}
+			if(tmp) {
+				++p;
+				while(true) {
+					let tmp;
+					if(p < this.length) {
+						let c = HxOverrides.cca(this.input,p);
+						let c1 = c == null ? -1 : c;
+						tmp = c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95 || c1 >= 48 && c1 <= 57;
+					} else {
+						tmp = false;
+					}
+					if(!tmp) {
+						break;
+					}
+					++p;
+				}
+			} else if(c1 == 91 || c1 == 40) {
+				let close = c1 == 91 ? 93 : 41;
+				++p;
+				let depth = 1;
+				while(p < this.length && depth > 0) {
+					let c = HxOverrides.cca(this.input,p);
+					let ic = c == null ? -1 : c;
+					if(ic == 92) {
+						p += 2;
+						continue;
+					}
+					if(ic == 10) {
+						return -1;
+					}
+					let tmp;
+					if(ic == 47 && p + 1 < this.length) {
+						let c = HxOverrides.cca(this.input,p + 1);
+						tmp = (c == null ? -1 : c) == 47;
+					} else {
+						tmp = false;
+					}
+					if(tmp) {
+						return -1;
+					}
+					let tmp1;
+					if(ic == 47 && p + 1 < this.length) {
+						let c = HxOverrides.cca(this.input,p + 1);
+						tmp1 = (c == null ? -1 : c) == 42;
+					} else {
+						tmp1 = false;
+					}
+					if(tmp1) {
+						p += 2;
+						while(true) {
+							if(p >= this.length) {
+								return -1;
+							}
+							let c = HxOverrides.cca(this.input,p);
+							if((c == null ? -1 : c) == 10) {
+								return -1;
+							}
+							let tmp;
+							let tmp1;
+							if(p + 1 < this.length) {
+								let c = HxOverrides.cca(this.input,p);
+								tmp1 = (c == null ? -1 : c) == 42;
+							} else {
+								tmp1 = false;
+							}
+							if(tmp1) {
+								let c = HxOverrides.cca(this.input,p + 1);
+								tmp = (c == null ? -1 : c) == 47;
+							} else {
+								tmp = false;
+							}
+							if(tmp) {
+								p += 2;
+								break;
+							}
+							++p;
+						}
+						continue;
+					}
+					if(ic == 34) {
+						p = this.scanStringEnd(p,allowTags);
+						if(p == -1) {
+							return -1;
+						}
+						continue;
+					}
+					if(ic == c1) {
+						++depth;
+					} else if(ic == close) {
+						--depth;
+					}
+					++p;
+				}
+				if(depth != 0) {
+					return -1;
+				}
+			} else {
+				break;
+			}
+		}
+		return p;
+	}
 	tryReadUnquotedString() {
 		if(this.isStrict()) {
 			return null;
@@ -22892,7 +24433,7 @@ class loreline_Lexer {
 				return null;
 			}
 		}
-		if(c1 == 123 || c1 == 125 || c1 == 91 || c1 == 93 || c1 == 34 || c1 == 58 || c1 == 35 || (c1 == 32 || c1 == 9)) {
+		if(c1 == 123 || c1 == 125 || c1 == 91 || c1 == 93 || c1 == 58 || c1 == 35 || (c1 == 32 || c1 == 9)) {
 			return null;
 		}
 		let parent = this.parentBlockType();
@@ -22900,7 +24441,7 @@ class loreline_Lexer {
 			return null;
 		}
 		let inBrackets = this.isInsideBrackets();
-		let isAssignValue = false;
+		let isAssignValue = this.followsUnquotedAssign();
 		let labelIdentifierIndex = this.afterLabelIdentifierToken(false);
 		if(labelIdentifierIndex != -1 && this.tokenized[labelIdentifierIndex].pos.line < this.line) {
 			if(this.tokenized[labelIdentifierIndex].pos.column >= this.column) {
@@ -22913,11 +24454,12 @@ class loreline_Lexer {
 		let multilineIndent = labelIdentifierIndex != -1 ? this.isStartingMultilineDialogue(labelIdentifierIndex) : -1;
 		let isAfterLabel = labelIdentifierIndex != -1;
 		let isValue = parent == loreline_TokenType.KwState || parent == loreline_TokenType.KwCharacter || inBrackets || isAssignValue;
+		let identifier = this.matchIdentifier(this.pos);
 		if(isValue) {
 			if(this.isCallStart(this.pos) || this.isLabelStart(this.pos)) {
 				return null;
 			}
-		} else if(!isAfterLabel && (this.isIdentifierExpressionStart(this.pos,true) || this.isIfStart(this.pos) || this.isCallStart(this.pos) || this.isAssignStart(this.pos,false))) {
+		} else if(!isAfterLabel && identifier != "true" && identifier != "false" && identifier != "null" && (this.isIdentifierExpressionStart(this.pos,true) || this.isIfStart(this.pos) || this.isCallStart(this.pos) || this.isAssignStart(this.pos,false))) {
 			return null;
 		}
 		if(!isValue) {
@@ -22929,8 +24471,10 @@ class loreline_Lexer {
 			if(this.isInsertionStart(this.pos)) {
 				return null;
 			}
+			if(this.isChoiceOnceStart(this.pos)) {
+				return null;
+			}
 		}
-		let identifier = this.matchIdentifier(this.pos);
 		if(identifier != null) {
 			if(identifier == "function") {
 				return null;
@@ -22939,30 +24483,181 @@ class loreline_Lexer {
 				if(identifier != "if" && identifier != "null" && identifier != "true" && identifier != "false" && identifier != "and" && identifier != "or" && Object.prototype.hasOwnProperty.call(loreline_Lexer.KEYWORDS.h,identifier)) {
 					return null;
 				}
-				if(this.isColon(this.pos + identifier.length)) {
+				if(this.isColon(this.pos + identifier.length)) {
+					return null;
+				}
+			}
+		}
+		let allowTags = !isValue;
+		let isDialogue = false;
+		if(isValue) {
+			if(inBrackets) {
+				if(!isAfterLabel && !this.followsOnlyWhitespacesOrCommentsInLine() && !this.isAfterComma() && !this.isAfterLBracket()) {
+					return null;
+				}
+			} else if(!isAssignValue && !isAfterLabel) {
+				return null;
+			}
+		} else {
+			isDialogue = this.followsOnlyLabelOrCommentsInLine();
+			if(!isDialogue && !this.followsOnlyWhitespacesOrCommentsInLine() && !this.followsChoiceOncePrefix()) {
+				return null;
+			}
+			if(!isDialogue) {
+				if(cc == 62 && c1 == 45) {
+					return null;
+				}
+			}
+		}
+		if(c1 == 34) {
+			let scanEndPos = this.scanStringEnd(this.pos,parent == loreline_TokenType.KwBeat);
+			if(scanEndPos == -1) {
+				return null;
+			}
+			let hasSameLineContent = false;
+			let eolPos = scanEndPos;
+			while(eolPos < this.length) {
+				let c = HxOverrides.cca(this.input,eolPos);
+				let sc = c == null ? -1 : c;
+				if(sc == 32 || sc == 9) {
+					++eolPos;
+					continue;
+				}
+				if(sc == 10 || sc == 13) {
+					break;
+				}
+				let tmp;
+				if(sc == 47 && eolPos + 1 < this.length) {
+					let c = HxOverrides.cca(this.input,eolPos + 1);
+					if((c == null ? -1 : c) != 47) {
+						let c = HxOverrides.cca(this.input,eolPos + 1);
+						tmp = (c == null ? -1 : c) == 42;
+					} else {
+						tmp = true;
+					}
+				} else {
+					tmp = false;
+				}
+				if(tmp) {
+					break;
+				}
+				if(sc == 93 || sc == 125 || sc == 41 || sc == 44) {
+					break;
+				}
+				if(sc == 35) {
+					break;
+				}
+				hasSameLineContent = true;
+				break;
+			}
+			if(!hasSameLineContent && !isValue) {
+				let stopNextLine = true;
+				if(stopNextLine == null) {
+					stopNextLine = false;
+				}
+				let nextLinePos = this._skipWhitespaceAndComments(eolPos,stopNextLine);
+				if(nextLinePos <= eolPos || nextLinePos >= this.length) {
+					return null;
+				}
+				let c = HxOverrides.cca(this.input,nextLinePos);
+				let nextChar = c == null ? -1 : c;
+				let tmp;
+				if(!(nextChar == 10 || nextChar == 13 || nextChar == 34)) {
+					if(nextChar == 47 && nextLinePos + 1 < this.length) {
+						let c = HxOverrides.cca(this.input,nextLinePos + 1);
+						if((c == null ? -1 : c) != 47) {
+							let c = HxOverrides.cca(this.input,nextLinePos + 1);
+							tmp = (c == null ? -1 : c) == 42;
+						} else {
+							tmp = true;
+						}
+					} else {
+						tmp = false;
+					}
+				} else {
+					tmp = true;
+				}
+				if(tmp) {
+					return null;
+				}
+				let nextIndent = 0;
+				let tmpPos = nextLinePos;
+				while(true) {
+					let tmp;
+					if(tmpPos > 0) {
+						let c = HxOverrides.cca(this.input,tmpPos - 1);
+						if((c == null ? -1 : c) != 32) {
+							let c = HxOverrides.cca(this.input,tmpPos - 1);
+							tmp = (c == null ? -1 : c) == 9;
+						} else {
+							tmp = true;
+						}
+					} else {
+						tmp = false;
+					}
+					if(!tmp) {
+						break;
+					}
+					++nextIndent;
+					--tmpPos;
+				}
+				let expectedIndent = multilineIndent != -1 ? multilineIndent : this.column - 1;
+				if(nextIndent != expectedIndent) {
+					return null;
+				}
+				let tmp1;
+				if(nextChar == 45 && nextLinePos + 1 < this.length) {
+					let c = HxOverrides.cca(this.input,nextLinePos + 1);
+					tmp1 = (c == null ? -1 : c) == 62;
+				} else {
+					tmp1 = false;
+				}
+				if(tmp1) {
 					return null;
 				}
-			}
-		}
-		let allowTags = !isValue;
-		let isDialogue = false;
-		if(isValue) {
-			if(inBrackets) {
-				if(!isAfterLabel && !this.followsOnlyWhitespacesOrCommentsInLine() && !this.isAfterComma() && !this.isAfterLBracket()) {
+				if(nextChar == 43) {
 					return null;
 				}
-			} else if(!isAssignValue && !isAfterLabel) {
-				return null;
-			}
-		} else {
-			isDialogue = this.followsOnlyLabelOrCommentsInLine();
-			if(!isDialogue && !this.followsOnlyWhitespacesOrCommentsInLine()) {
-				return null;
-			}
-			if(!isDialogue) {
-				if(cc == 62 && c1 == 45) {
+				if(this.isAssignStart(nextLinePos,false)) {
+					return null;
+				}
+				if(this.isCallStart(nextLinePos)) {
 					return null;
 				}
+				if(this.isLabelStart(nextLinePos)) {
+					return null;
+				}
+				if(this.isIfStart(nextLinePos)) {
+					return null;
+				}
+				if(this.isIdentifierExpressionStart(nextLinePos,true)) {
+					return null;
+				}
+				if(nextChar >= 97 && nextChar <= 122 || nextChar >= 65 && nextChar <= 90 || nextChar == 95) {
+					let wordEnd = nextLinePos;
+					while(true) {
+						let tmp;
+						if(wordEnd < this.length) {
+							let c = HxOverrides.cca(this.input,wordEnd);
+							let c1 = c == null ? -1 : c;
+							tmp = c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95 || c1 >= 48 && c1 <= 57;
+						} else {
+							tmp = false;
+						}
+						if(!tmp) {
+							break;
+						}
+						++wordEnd;
+					}
+					let str = this.input;
+					let len = wordEnd - nextLinePos;
+					let kw = len != null ? HxOverrides.substr(str,nextLinePos,len) : HxOverrides.substr(str,nextLinePos,null);
+					if(kw != "null" && kw != "true" && kw != "false" && Object.prototype.hasOwnProperty.call(loreline_Lexer.KEYWORDS.h,kw)) {
+						return null;
+					}
+				}
+			} else if(!hasSameLineContent) {
+				return null;
 			}
 		}
 		let start = new loreline_Position(this.startLine,this.startColumn,this.pos);
@@ -23489,7 +25184,7 @@ class loreline_Lexer {
 			content = StringTools.rtrim(content);
 			let contentLength = content.length;
 			let rtrimmedOffset = rawContentLength - contentLength;
-			if(contentLength > 0 && this.hasNonSpecialChar(content) && !this.isNumber(content) && content != "null" && content != "true" && content != "false") {
+			if(contentLength > 0 && this.hasNonSpecialChar(content) && (isValue ? !this.isNumber(content) && content != "null" && content != "true" && content != "false" : true)) {
 				if(multilineIndent == -1 && !isAfterLabel && !this.inChoiceRoot()) {
 					let savedLine = this.line;
 					let savedColumn = this.column;
@@ -23943,10 +25638,10 @@ class loreline_Lexer {
 				currentColumn += tokenLength;
 			}
 			switch(token.type._hx_index) {
-			case 43:
+			case 45:
 				++braceLevel;
 				break;
-			case 44:
+			case 46:
 				--braceLevel;
 				break;
 			default:
@@ -25736,6 +27431,9 @@ class loreline_Loreline {
 		let printer = new loreline_Printer(tmp != null ? tmp : "  ",tmp1 != null ? tmp1 : "\n");
 		return printer.print(script);
 	}
+	static update(delta) {
+		loreline_Timer.update(delta);
+	}
 }
 $hxClasses["loreline.Loreline"] = $hx_exports["loreline"]["Loreline"] = loreline_Loreline;
 loreline_Loreline.__name__ = "loreline.Loreline";
@@ -26065,6 +27763,9 @@ class loreline_Node {
 	}
 	each(handleNode) {
 	}
+	static fromJson(json) {
+		return loreline_JsonToAst.nodeFromJson(json);
+	}
 }
 $hxClasses["loreline.Node"] = $hx_exports["loreline"]["Node"] = loreline_Node;
 loreline_Node.__name__ = "loreline.Node";
@@ -26705,6 +28406,7 @@ class loreline_NChoiceOption extends loreline_AstNode {
 		this.conditionStyle = conditionStyle;
 		this.body = body;
 		this.style = 0;
+		this.once = false;
 	}
 	type() {
 		return "Option";
@@ -26757,6 +28459,9 @@ class loreline_NChoiceOption extends loreline_AstNode {
 		}
 		json.body = _g;
 		json.style = loreline_BlockStyle.toString(this.style);
+		if(this.once) {
+			json.once = true;
+		}
 		return json;
 	}
 }
@@ -26972,6 +28677,30 @@ class loreline_NAlternative extends loreline_AstNode {
 		}
 		json.items = _g;
 		json.style = loreline_BlockStyle.toString(this.style);
+		if(this.separatorComments != null) {
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = this.separatorComments;
+			while(_g1 < _g2.length) {
+				let comments = _g2[_g1];
+				++_g1;
+				let tmp;
+				if(comments != null) {
+					let _g = [];
+					let _g1 = 0;
+					while(_g1 < comments.length) {
+						let c = comments[_g1];
+						++_g1;
+						_g.push(c.toJson());
+					}
+					tmp = _g;
+				} else {
+					tmp = null;
+				}
+				_g.push(tmp);
+			}
+			json.separatorComments = _g;
+		}
 		return json;
 	}
 }
@@ -27372,6 +29101,45 @@ loreline_NUnary.__super__ = loreline_NExpr;
 Object.assign(loreline_NUnary.prototype, {
 	__class__: loreline_NUnary
 });
+class loreline_NTernary extends loreline_NExpr {
+	constructor(id,pos,condition,trueExpr,falseExpr,leadingComments,trailingComments) {
+		super(id,pos,leadingComments,trailingComments);
+		this.condition = condition;
+		this.trueExpr = trueExpr;
+		this.falseExpr = falseExpr;
+	}
+	type() {
+		return "Ternary";
+	}
+	each(handleNode) {
+		super.each(handleNode);
+		if(this.condition != null) {
+			handleNode(this.condition,this);
+			this.condition.each(handleNode);
+		}
+		if(this.trueExpr != null) {
+			handleNode(this.trueExpr,this);
+			this.trueExpr.each(handleNode);
+		}
+		if(this.falseExpr != null) {
+			handleNode(this.falseExpr,this);
+			this.falseExpr.each(handleNode);
+		}
+	}
+	toJson() {
+		let json = super.toJson();
+		json.condition = this.condition.toJson();
+		json.trueExpr = this.trueExpr.toJson();
+		json.falseExpr = this.falseExpr.toJson();
+		return json;
+	}
+}
+$hxClasses["loreline.NTernary"] = loreline_NTernary;
+loreline_NTernary.__name__ = "loreline.NTernary";
+loreline_NTernary.__super__ = loreline_NExpr;
+Object.assign(loreline_NTernary.prototype, {
+	__class__: loreline_NTernary
+});
 class loreline_NImportStatement extends loreline_AstNode {
 	constructor(id,pos,path,script,leadingComments,trailingComments) {
 		super(id,pos,leadingComments,trailingComments);
@@ -27391,6 +29159,9 @@ class loreline_NImportStatement extends loreline_AstNode {
 	toJson() {
 		let json = super.toJson();
 		json.path = this.path.toJson();
+		if(this.script != null) {
+			json.script = this.script.toJson();
+		}
 		return json;
 	}
 }
@@ -27485,6 +29256,9 @@ class loreline_Objects {
 	static getMapHelper(interpreter,name) {
 		return interpreter.mapHelpers.h[name];
 	}
+	static getBeatHelper(interpreter,name) {
+		return interpreter.beatHelpers.h[name];
+	}
 	static createFields(interpreter,type,node) {
 		if(interpreter != null && interpreter.customCreateFields != null) {
 			let customInstance = interpreter.customCreateFields(interpreter,type,node);
@@ -27599,19 +29373,19 @@ class loreline_Parser {
 		while(i < this.tokens.length) {
 			let _g = this.tokens[i].type;
 			switch(_g._hx_index) {
-			case 49:
+			case 51:
 				let _g1 = _g.content;
 				++i;
 				break;
-			case 50:
+			case 52:
 				let _g2 = _g.content;
 				++i;
 				break;
-			case 51:
+			case 53:
 				let _g3 = _g.content;
 				++i;
 				break;
-			case 54:
+			case 56:
 				++i;
 				break;
 			default:
@@ -27632,28 +29406,28 @@ class loreline_Parser {
 				this.current++;
 				let _g = this.tokens[this.current].type;
 				switch(_g._hx_index) {
-				case 49:
+				case 51:
 					let content = _g.content;
 					if(this.pendingComments == null) {
 						this.pendingComments = [];
 					}
 					this.pendingComments.push(new loreline_Comment(this.nextNodeId(4),this.currentPos(),content,false));
 					break;
-				case 50:
+				case 52:
 					let content1 = _g.content;
 					if(this.pendingComments == null) {
 						this.pendingComments = [];
 					}
 					this.pendingComments.push(new loreline_Comment(this.nextNodeId(4),this.currentPos(),content1,true));
 					break;
-				case 51:
+				case 53:
 					let content2 = _g.content;
 					if(this.pendingComments == null) {
 						this.pendingComments = [];
 					}
 					this.pendingComments.push(new loreline_Comment(this.nextNodeId(4),this.currentPos(),content2,false,true));
 					break;
-				case 54:
+				case 56:
 					this.lastLineBreak = this.currentPos();
 					this.lineBreakAfterToken = true;
 					break;
@@ -27694,16 +29468,16 @@ class loreline_Parser {
 		while(n >= 0) {
 			let _g = this.tokens[n].type;
 			switch(_g._hx_index) {
-			case 49:
+			case 51:
 				let _g1 = _g.content;
 				break;
-			case 50:
+			case 52:
 				let _g2 = _g.content;
 				break;
-			case 51:
+			case 53:
 				let _g3 = _g.content;
 				break;
-			case 52:case 53:case 54:
+			case 54:case 55:case 56:
 				break;
 			default:
 				return this.tokens[n];
@@ -27717,16 +29491,16 @@ class loreline_Parser {
 		while(n < this.tokens.length) {
 			let _g = this.tokens[n].type;
 			switch(_g._hx_index) {
-			case 49:
+			case 51:
 				let _g1 = _g.content;
 				break;
-			case 50:
+			case 52:
 				let _g2 = _g.content;
 				break;
-			case 51:
+			case 53:
 				let _g3 = _g.content;
 				break;
-			case 52:case 53:case 54:
+			case 54:case 55:case 56:
 				break;
 			default:
 				return this.tokens[n];
@@ -27740,16 +29514,16 @@ class loreline_Parser {
 		while(n < this.tokens.length) {
 			let _g = this.tokens[n].type;
 			switch(_g._hx_index) {
-			case 49:
+			case 51:
 				let _g1 = _g.content;
 				break;
-			case 50:
+			case 52:
 				let _g2 = _g.content;
 				break;
-			case 51:
+			case 53:
 				let _g3 = _g.content;
 				break;
-			case 54:
+			case 56:
 				break;
 			default:
 				return this.tokens[n];
@@ -27783,7 +29557,7 @@ class loreline_Parser {
 		if(this.isAtEnd()) {
 			return false;
 		}
-		if(type._hx_index == 40) {
+		if(type._hx_index == 41) {
 			return this.tokens[this.current].type == loreline_TokenType.Colon;
 		} else {
 			return loreline_TokenTypeHelpers.equals(this.tokens[this.current].type,type);
@@ -27809,13 +29583,13 @@ class loreline_Parser {
 	}
 	isComment(type) {
 		switch(type._hx_index) {
-		case 49:
+		case 51:
 			let _g = type.content;
 			return true;
-		case 50:
+		case 52:
 			let _g1 = type.content;
 			return true;
-		case 51:
+		case 53:
 			let _g2 = type.content;
 			return true;
 		default:
@@ -27837,15 +29611,15 @@ class loreline_Parser {
 				let _g = this.tokens[this.current].type;
 				let tmp3;
 				switch(_g._hx_index) {
-				case 49:
+				case 51:
 					let content = _g.content;
 					tmp3 = content;
 					break;
-				case 50:
+				case 52:
 					let content1 = _g.content;
 					tmp3 = content1;
 					break;
-				case 51:
+				case 53:
 					let content2 = _g.content;
 					tmp3 = content2;
 					break;
@@ -27854,7 +29628,7 @@ class loreline_Parser {
 				}
 				let _g1 = this.tokens[this.current].type;
 				let tmp4;
-				if(_g1._hx_index == 50) {
+				if(_g1._hx_index == 52) {
 					let _g = _g1.content;
 					tmp4 = true;
 				} else {
@@ -27862,7 +29636,7 @@ class loreline_Parser {
 				}
 				let _g2 = this.tokens[this.current].type;
 				let tmp5;
-				if(_g2._hx_index == 51) {
+				if(_g2._hx_index == 53) {
 					let _g = _g2.content;
 					tmp5 = true;
 				} else {
@@ -27992,7 +29766,7 @@ class loreline_Parser {
 				}
 			}
 			break;
-		case 25:
+		case 26:
 			let node7 = this.parseInsertion();
 			if(topLevel) {
 				return _gthis.wrapInRootBeat(node7);
@@ -28000,7 +29774,7 @@ class loreline_Parser {
 				return node7;
 			}
 			break;
-		case 18:case 26:case 38:case 43:case 45:case 47:
+		case 18:case 27:case 39:case 45:case 47:case 49:
 			let node8 = this.parseExpressionStatement();
 			if(topLevel) {
 				return _gthis.wrapInRootBeat(node8);
@@ -28008,7 +29782,7 @@ class loreline_Parser {
 				return node8;
 			}
 			break;
-		case 39:
+		case 40:
 			let node9 = this.parseTransition();
 			if(topLevel) {
 				return _gthis.wrapInRootBeat(node9);
@@ -28364,6 +30138,9 @@ class loreline_Parser {
 				isInsertion = true;
 				choiceOption.insertion = this.parseInsertion();
 			} else {
+				if(this.match(loreline_TokenType.OpMinus)) {
+					choiceOption.once = true;
+				}
 				choiceOption.text = this.parseStringLiteral();
 			}
 		} catch( _g ) {
@@ -28380,30 +30157,30 @@ class loreline_Parser {
 				throw _g;
 			}
 		}
-		if(!isInsertion) {
-			if(this.match(loreline_TokenType.KwIf)) {
-				let ifPos = this.previous().pos;
-				let offset = this.currentPos().offset;
-				try {
-					if(this.check(loreline_TokenType.LParen)) {
-						choiceOption.conditionStyle = 2;
-					}
-					choiceOption.condition = this.parseConditionExpression();
-					choiceOption.conditionPos = ifPos.extendedTo(this.prevNonWhitespaceOrComment().pos);
-				} catch( _g ) {
-					let _g1 = haxe_Exception.caught(_g).unwrap();
-					if(((_g1) instanceof loreline_ParseError)) {
-						let e = _g1;
-						this.addError(e);
-						errorPos = this.currentPos();
-						if(this.currentPos().offset == offset) {
-							this.advance();
-						}
-					} else {
-						throw _g;
+		if(this.match(loreline_TokenType.KwIf)) {
+			let ifPos = this.previous().pos;
+			let offset = this.currentPos().offset;
+			try {
+				if(this.check(loreline_TokenType.LParen)) {
+					choiceOption.conditionStyle = 2;
+				}
+				choiceOption.condition = this.parseConditionExpression();
+				choiceOption.conditionPos = ifPos.extendedTo(this.prevNonWhitespaceOrComment().pos);
+			} catch( _g ) {
+				let _g1 = haxe_Exception.caught(_g).unwrap();
+				if(((_g1) instanceof loreline_ParseError)) {
+					let e = _g1;
+					this.addError(e);
+					errorPos = this.currentPos();
+					if(this.currentPos().offset == offset) {
+						this.advance();
 					}
+				} else {
+					throw _g;
 				}
 			}
+		}
+		if(!isInsertion) {
 			if(this.checkBlockStart()) {
 				choiceOption.body = [];
 				let offset = this.currentPos().offset;
@@ -28477,7 +30254,7 @@ class loreline_Parser {
 				return true;
 			}
 			break;
-		case 18:case 26:case 38:case 43:case 45:case 47:
+		case 18:case 27:case 39:case 45:case 47:case 49:
 			return true;
 		default:
 			return false;
@@ -28485,7 +30262,7 @@ class loreline_Parser {
 	}
 	parseExpressionStatement() {
 		let expr = this.parseExpression();
-		if(this.match(loreline_TokenType.OpAssign) || this.match(loreline_TokenType.OpPlusAssign) || this.match(loreline_TokenType.OpMinusAssign) || this.match(loreline_TokenType.OpMultiplyAssign) || this.match(loreline_TokenType.OpDivideAssign)) {
+		if(this.match(loreline_TokenType.OpAssign) || this.match(loreline_TokenType.OpPlusAssign) || this.match(loreline_TokenType.OpMinusAssign) || this.match(loreline_TokenType.OpMultiplyAssign) || this.match(loreline_TokenType.OpDivideAssign) || this.match(loreline_TokenType.OpUnquotedAssign)) {
 			let op = this.previous().type;
 			let assignment = this.attachComments(new loreline_NAssign(this.nextNodeId(4),expr.pos,expr,op,null));
 			assignment.value = this.parseExpression();
@@ -28512,7 +30289,7 @@ class loreline_Parser {
 				return false;
 			}
 			break;
-		case 1:case 2:case 3:case 4:case 5:case 39:
+		case 1:case 2:case 3:case 4:case 5:case 40:
 			return true;
 		default:
 			return false;
@@ -28648,8 +30425,8 @@ class loreline_Parser {
 	}
 	parseExpression() {
 		try {
-			let expr = this.parseLogicalOr();
-			if(this.check(loreline_TokenType.OpAssign) || this.check(loreline_TokenType.OpPlusAssign) || this.check(loreline_TokenType.OpMinusAssign) || this.check(loreline_TokenType.OpMultiplyAssign) || this.check(loreline_TokenType.OpDivideAssign)) {
+			let expr = this.parseTernary();
+			if(this.check(loreline_TokenType.OpAssign) || this.check(loreline_TokenType.OpPlusAssign) || this.check(loreline_TokenType.OpMinusAssign) || this.check(loreline_TokenType.OpMultiplyAssign) || this.check(loreline_TokenType.OpDivideAssign) || this.check(loreline_TokenType.OpUnquotedAssign)) {
 				let op = this.tokens[this.current].type;
 				this.advance();
 				let assignment = this.attachComments(new loreline_NAssign(this.nextNodeId(4),expr.pos,expr,op,null));
@@ -28666,6 +30443,17 @@ class loreline_Parser {
 			return new loreline_NLiteral(this.nextNodeId(4),this.currentPos(),null,loreline_LiteralType.Null);
 		}
 	}
+	parseTernary() {
+		let expr = this.parseLogicalOr();
+		if(this.match(loreline_TokenType.Question)) {
+			let trueExpr = this.parseTernary();
+			this.expect(loreline_TokenType.Colon);
+			let falseExpr = this.parseTernary();
+			expr = this.attachComments(new loreline_NTernary(this.nextNodeId(4),expr.pos,expr,trueExpr,falseExpr));
+			expr.pos = expr.pos.extendedTo(falseExpr.pos);
+		}
+		return expr;
+	}
 	parseLogicalOr() {
 		let expr = this.parseLogicalAnd();
 		while(this.match(loreline_TokenType.OpOr(false))) {
@@ -28772,14 +30560,14 @@ class loreline_Parser {
 				return this.parseIdentifierExpression(startPos,name);
 			}
 			break;
-		case 43:
-			return this.parsePostfix(startPos,this.parseObjectLiteral());
 		case 45:
+			return this.parsePostfix(startPos,this.parseObjectLiteral());
+		case 47:
 			this.advance();
 			let expr = this.parseExpression();
 			this.expect(loreline_TokenType.RParen);
 			return this.parsePostfix(startPos,expr);
-		case 47:
+		case 49:
 			return this.parsePostfix(startPos,this.parseArrayLiteral());
 		default:
 			throw haxe_Exception.thrown(new loreline_ParseError("Unexpected token in expression",this.currentPos()));
@@ -28958,7 +30746,7 @@ class loreline_Parser {
 					}
 					prevIsDot = false;
 					break;
-				case 42:
+				case 44:
 					if(target == null) {
 						this.addError(new loreline_ParseError("Leading dot in field access",token.pos));
 						let tmp = this.nextNodeId(4);
@@ -28969,7 +30757,7 @@ class loreline_Parser {
 					}
 					prevIsDot = true;
 					break;
-				case 45:
+				case 47:
 					if(target == null) {
 						this.addError(new loreline_ParseError("Function call without target",token.pos));
 						let tmp = this.nextNodeId(4);
@@ -28986,7 +30774,7 @@ class loreline_Parser {
 						let t = tokens[i];
 						++i;
 						switch(t.type._hx_index) {
-						case 41:
+						case 43:
 							if(parenLevel == 1) {
 								if(currentArgTokens.length > 0) {
 									argTokens.push(currentArgTokens);
@@ -28996,11 +30784,11 @@ class loreline_Parser {
 								currentArgTokens.push(t);
 							}
 							break;
-						case 45:
+						case 47:
 							++parenLevel;
 							currentArgTokens.push(t);
 							break;
-						case 46:
+						case 48:
 							--parenLevel;
 							if(parenLevel > 0) {
 								currentArgTokens.push(t);
@@ -29034,7 +30822,7 @@ class loreline_Parser {
 					target = this.attachComments(new loreline_NCall(this.nextNodeId(4),callStart.extendedTo(tokens[i - 1].pos),target,args));
 					prevIsDot = false;
 					break;
-				case 47:
+				case 49:
 					if(target == null) {
 						this.addError(new loreline_ParseError("Array access without target",token.pos));
 						let tmp = this.nextNodeId(4);
@@ -29051,11 +30839,11 @@ class loreline_Parser {
 						let t = tokens[i];
 						++i;
 						switch(t.type._hx_index) {
-						case 47:
+						case 49:
 							++bracketLevel;
 							arrayTokens.push(t);
 							break;
-						case 48:
+						case 50:
 							--bracketLevel;
 							if(bracketLevel > 0) {
 								arrayTokens.push(t);
@@ -29358,7 +31146,7 @@ class loreline_Parser {
 		} else {
 			let error = new loreline_ParseError("Expected " + loreline_TokenTypeHelpers.toCodeString(type) + ", got " + (this.isAtEnd() ? "end of file" : this.currentTokenTypeToString()),this.tokens[Math.min(this.current,this.tokens.length - 1) | 0].pos);
 			switch(type._hx_index) {
-			case 44:case 46:case 53:
+			case 46:case 48:case 55:
 				this.addError(error);
 				return new loreline_Token(type,this.currentPos());
 			default:
@@ -29457,13 +31245,13 @@ class loreline_Parser {
 				}
 				this.advance();
 				break;
-			case 39:
+			case 40:
 				this.advance();
 				if(this.check(loreline_TokenType.Dot) || loreline_TokenTypeHelpers.isIdentifier(this.tokens[this.current].type)) {
 					this.advance();
 				}
 				return;
-			case 1:case 2:case 3:case 4:case 5:case 44:case 52:
+			case 1:case 2:case 3:case 4:case 5:case 46:case 54:
 				return;
 			default:
 				this.advance();
@@ -29472,7 +31260,7 @@ class loreline_Parser {
 	}
 	requiresNewLine() {
 		switch(this.tokens[this.current].type._hx_index) {
-		case 6:case 39:case 44:
+		case 6:case 40:case 46:
 			return false;
 		default:
 			return true;
@@ -29843,6 +31631,9 @@ class loreline_Printer {
 		case loreline_NStringLiteral:
 			this.printStringLiteral(node);
 			break;
+		case loreline_NTernary:
+			this.printTernary(node);
+			break;
 		case loreline_NTextStatement:
 			this.printTextStatement(node);
 			break;
@@ -30126,6 +31917,9 @@ class loreline_Printer {
 		this.newline();
 		this._noLn = 0;
 		this.printLeadingComments(option);
+		if(option.once) {
+			this.write("- ");
+		}
 		if(option.insertion != null) {
 			this.printNode(option.insertion);
 		} else {
@@ -30478,20 +32272,53 @@ class loreline_Printer {
 			this.write("null");
 			break;
 		case 3:
-			let first = true;
-			this.write("[");
+			let hasMultilineUnquoted = false;
 			let _g1 = 0;
 			let _g2 = lit.value;
 			while(_g1 < _g2.length) {
 				let elem = _g2[_g1];
 				++_g1;
-				if(!first) {
-					this.write(", ");
+				if(this.hasRealNewlines(elem)) {
+					hasMultilineUnquoted = true;
+					break;
 				}
-				first = false;
-				this.printNode(elem);
 			}
-			this.write("]");
+			if(hasMultilineUnquoted) {
+				this.write("[");
+				this.newline();
+				this._level++;
+				let first = true;
+				let _g = 0;
+				let _g1 = lit.value;
+				while(_g < _g1.length) {
+					let elem = _g1[_g];
+					++_g;
+					if(!first) {
+						this.write(",");
+						this.newline();
+					}
+					first = false;
+					this.printNode(elem);
+				}
+				this.newline();
+				this._level--;
+				this.write("]");
+			} else {
+				let first = true;
+				this.write("[");
+				let _g = 0;
+				let _g1 = lit.value;
+				while(_g < _g1.length) {
+					let elem = _g1[_g];
+					++_g;
+					if(!first) {
+						this.write(", ");
+					}
+					first = false;
+					this.printNode(elem);
+				}
+				this.write("]");
+			}
 			break;
 		case 4:
 			let style = _g.style;
@@ -30502,18 +32329,18 @@ class loreline_Printer {
 				this.newline();
 			}
 			this._level++;
-			let first1 = true;
+			let first = true;
 			let _g3 = 0;
 			let _g4 = lit.value;
 			while(_g3 < _g4.length) {
 				let field = _g4[_g3];
 				++_g3;
-				if(!first1) {
+				if(!first) {
 					if(this._beginLine == 0) {
 						this.newline();
 					}
 				}
-				first1 = false;
+				first = false;
 				this.printLeadingComments(field);
 				this.write("" + field.name + ": ");
 				this.printTrailingComments(field);
@@ -30573,11 +32400,11 @@ class loreline_Printer {
 		if(!skipParen) {
 			let _g = binary.op;
 			switch(_g._hx_index) {
-			case 36:
+			case 37:
 				let word = _g.word;
 				needsParens = true;
 				break;
-			case 37:
+			case 38:
 				let word1 = _g.word;
 				needsParens = true;
 				break;
@@ -30604,6 +32431,15 @@ class loreline_Printer {
 		this.printTrailingComments(unary);
 		this.printNode(unary.operand);
 	}
+	printTernary(ternary) {
+		this.printLeadingComments(ternary);
+		this.printNode(ternary.condition);
+		this.write(" ? ");
+		this.printNode(ternary.trueExpr);
+		this.write(" : ");
+		this.printNode(ternary.falseExpr);
+		this.printTrailingComments(ternary);
+	}
 	printAssignment(assign) {
 		this.printLeadingComments(assign);
 		this.printNode(assign.target);
@@ -30678,42 +32514,44 @@ class loreline_Printer {
 		case 24:
 			return "/=";
 		case 25:
-			return "+";
+			return ":=";
 		case 26:
-			return "-";
+			return "+";
 		case 27:
-			return "*";
+			return "-";
 		case 28:
-			return "/";
+			return "*";
 		case 29:
-			return "%";
+			return "/";
 		case 30:
-			return "==";
+			return "%";
 		case 31:
-			return "!=";
+			return "==";
 		case 32:
-			return ">";
+			return "!=";
 		case 33:
-			return "<";
+			return ">";
 		case 34:
-			return ">=";
+			return "<";
 		case 35:
-			return "<=";
+			return ">=";
 		case 36:
+			return "<=";
+		case 37:
 			if(op.word) {
 				return "and";
 			} else {
 				return "&&";
 			}
 			break;
-		case 37:
+		case 38:
 			if(op.word) {
 				return "or";
 			} else {
 				return "||";
 			}
 			break;
-		case 38:
+		case 39:
 			return "!";
 		default:
 			throw haxe_Exception.thrown("Unsupported operator: " + Std.string(op));
@@ -30790,6 +32628,7 @@ class loreline_Script extends loreline_AstNode {
 			_g.push(decl.toJson());
 		}
 		json.body = _g;
+		json.indentSize = this.indentSize;
 		return json;
 	}
 	type() {
@@ -30826,6 +32665,9 @@ class loreline_Script extends loreline_AstNode {
 	iterator() {
 		return new loreline__$Script_ScriptBodyIterator(this.body);
 	}
+	static fromJson(json) {
+		return loreline_JsonToAst.scriptFromJson(json);
+	}
 }
 $hxClasses["loreline.Script"] = $hx_exports["loreline"]["Script"] = loreline_Script;
 loreline_Script.__name__ = "loreline.Script";
@@ -30869,6 +32711,38 @@ loreline__$Script_ScriptBodyIterator.__name__ = "loreline._Script.ScriptBodyIter
 Object.assign(loreline__$Script_ScriptBodyIterator.prototype, {
 	__class__: loreline__$Script_ScriptBodyIterator
 });
+class loreline__$Timer_PendingTimer {
+	constructor(remaining,done) {
+		this.remaining = remaining;
+		this.done = done;
+	}
+}
+$hxClasses["loreline._Timer.PendingTimer"] = loreline__$Timer_PendingTimer;
+loreline__$Timer_PendingTimer.__name__ = "loreline._Timer.PendingTimer";
+Object.assign(loreline__$Timer_PendingTimer.prototype, {
+	__class__: loreline__$Timer_PendingTimer
+});
+class loreline_Timer {
+	static register(seconds,done) {
+		loreline_Timer.timers.push(new loreline__$Timer_PendingTimer(seconds,done));
+	}
+	static update(delta) {
+		if(loreline_Timer.timers.length == 0) {
+			return;
+		}
+		let i = loreline_Timer.timers.length;
+		while(--i >= 0) {
+			let t = loreline_Timer.timers[i];
+			t.remaining -= delta;
+			if(t.remaining <= 0.0) {
+				loreline_Timer.timers.splice(i,1);
+				t.done();
+			}
+		}
+	}
+}
+$hxClasses["loreline.Timer"] = loreline_Timer;
+loreline_Timer.__name__ = "loreline.Timer";
 class loreline_Utf8 {
 	static uLength(str) {
 		return str.length;
@@ -31020,6 +32894,7 @@ loreline_AlternativeMode.Pick = 3;
 loreline_AlternativeMode.Shuffle = 4;
 loreline_Quotes.Unquoted = 0;
 loreline_Quotes.DoubleQuotes = 1;
+loreline_Timer.timers = [];
 loreline_lib_Library.main();
 })(runtime, globals);