NQN/hank
1
0
Fork 0
Code Issues 25 Pull Requests Actions Packages Projects Releases Wiki Activity

WIP choices and gathers

Browse Source
This commit is contained in:
Nat Quayle Nelson
2019-03-27 22:26:42 -06:00
parent d81304b3c7
commit a2886dbea1
4 changed files with 154 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hank/HInterface.hx
View File

@@ -107,7 +107,7 @@ class HInterface {
interp.execute(expr);
}
public function evaluateExpr(h: String, scope: Array<Dynamic>): String {
public function expr(h: String, scope: Array<Dynamic>) {
interp.variables['scope'] = scope;
var expr = parser.parseString(h);
@@ -118,8 +118,10 @@ class HInterface {
throw 'Expression ${h} evaluated to null';
}
return Std.string(valueOf(viewCounts, val));
return valueOf(viewCounts, val);
}
public function evaluateExpr(h: String, scope: Array<Dynamic>): String {
return Std.string(expr(h, scope));
}
static function valueOf(viewCounts: Map<StoryNode, Int>, val: Dynamic): Dynamic {

41
hank/HankAST.hx
View File

@@ -42,4 +42,45 @@ class ASTExtension {
return -1;
}
public static function findEOF(ast: HankAST, path: String) {
for (i in 0... ast.length) {
var expr = ast[ast.length-1-i];
if (expr.position.file == path) {
return ast.length-1-i+1;
}
}
return -1;
}
/**
Collect every choice in the choice point starting at the given index.
**/
public static function collectChoices(ast: HankAST, startingIndex: Int, depth: Int): Array<Choice> {
var choices = [];
var currentFile = ast[startingIndex].position.file;
trace(currentFile);
trace(findEOF(ast, currentFile));
for (i in startingIndex... findEOF(ast, currentFile)) {
trace('checking');
switch (ast[i].expr) {
// Gather choices of the current depth
case EChoice(choice):
if (choice.depth != depth) continue;
else choices.push(choice);
// Stop at the next gather of this depth
case EGather(_, d, _) if (d == depth):
break;
//Stop at knot or stitch declarations
case EKnot(_) | EStitch(_):
break;
default:
}
}
return choices;
}
}

4
hank/Output.hx
View File

@@ -27,6 +27,10 @@ class Output {
};
}
public function isEmpty() {
return parts.length == 0;
}
public static function parse(buffer: HankBuffer): Output {
var parts = [];

118
hank/Story.hx
View File

@@ -4,6 +4,7 @@ import haxe.ds.Option;
using hank.Extensions;
using HankAST.ASTExtension;
using HankAST.Choice;
import hank.HankAST.ExprType;
import hank.StoryTree;
@@ -36,6 +37,11 @@ class Story {
var embeddedBlocks: Array<Story> = [];
var parent: Option<Story> = None;
var choicesTaken: Array<Int> = [];
var weaveDepth = 0;
var storedFrame: Option<StoryFrame> = None;
function new(r: Random, p: Parser, ast: HankAST, st: StoryNode, sc: Array<StoryNode>, vc: Map<StoryNode, Int>, hi: HInterface) {
this.random = r;
this.parser = p;
@@ -75,6 +81,12 @@ class Story {
}
public function nextFrame(): StoryFrame {
switch (storedFrame) {
case Some(f):
storedFrame = None;
return f;
default:
}
while (embeddedBlocks.length > 0) {
var nf = embeddedBlocks[0].nextFrame();
if(nf == Finished) {
@@ -89,7 +101,7 @@ class Story {
return processExpr(ast[exprIndex].expr);
}
private function processExpr(expr: ExprType) {
private function processExpr(expr: ExprType): StoryFrame {
switch (expr) {
case EOutput(output):
exprIndex += 1;
@@ -104,7 +116,8 @@ class Story {
hInterface.runEmbeddedHaxe(h, nodeScopes);
return nextFrame();
case EDivert(target):
return divertTo(target);
divertTo(target);
return nextFrame();
case EGather(label, depth, nextExpr):
// gathers need to update their view counts
@@ -114,9 +127,24 @@ class Story {
viewCounts[node] += 1;
case None:
}
// TODO update current weave depth
weaveDepth = depth;
return processExpr(nextExpr);
case EChoice(choice):
if (choice.depth > weaveDepth) {
weaveDepth = choice.depth;
} else if (choice.depth < weaveDepth) {
gotoNextGather();
return nextFrame();
}
var optionsText = [for(c in availableChoices()) c.output.format(hInterface, nodeScopes, false)];
if (optionsText.length > 0) {
return HasChoices(optionsText);
} else {
var fallback = fallbackChoice();
return HasText(evaluateChoice(fallback));
}
default:
trace('$expr is not implemented');
return Finished;
@@ -124,6 +152,39 @@ class Story {
return Finished;
}
private function availableChoices(): Array<Choice> {
var choices = [];
var allChoices = ast.collectChoices(exprIndex, weaveDepth);
for (choice in allChoices) {
if (choicesTaken.indexOf(choice.id) == -1 || !choice.onceOnly) {
switch (choice.condition) {
case Some(expr):
if (hInterface.expr(expr, nodeScopes)) {
choices.push(choice);
}
case None:
choices.push(choice);
}
}
}
return choices;
}
private function fallbackChoice(): Choice {
var choices = ast.collectChoices(exprIndex, weaveDepth);
var lastChoice = choices[choices.length-1];
if (lastChoice.output.isEmpty()) {
return lastChoice;
} else {
throw 'there is no fallback choice!';
}
}
private function gotoNextGather() {
}
private function resolveNodeInScope(label: String, ?whichScope: Array<StoryNode>): Array<StoryNode> {
if (whichScope == null) whichScope = nodeScopes;
@@ -158,20 +219,25 @@ class Story {
public function divertTo(target: String) {
switch (parent) {
case Some(p):
p.embeddedBlocks = []; //
return p.divertTo(target); // A divert from inside embedded hank, ends the embedding
// A divert from inside embedded hank, must leave the embedded context
p.embeddedBlocks = [];
p.divertTo(target);
exprIndex = ast.length; // Must return finished
return;
default:
}
trace('diverting to $target');
var newScopes = resolveNodeInScope(target);
var targetIdx = newScopes[0].astIndex;
trace('diverting to $target');
if (targetIdx == -1) {
throw 'Divert target not found: $target';
}
// update the expression index
exprIndex = targetIdx;
var target = newScopes[0];
weaveDepth = 0;
// Update the view count
switch (ast[exprIndex].expr) {
@@ -200,30 +266,54 @@ class Story {
}
exprIndex += 1;
// TODO if it's a choice, choose it, and return HasText(output).
case EChoice(_):
return Finished;
case EChoice(c):
storedFrame = Some(HasText(evaluateChoice(c)));
return;
// Choices and gathers update their own view counts
default:
}
// Update nodeScopes to point to the new scope
nodeScopes = newScopes;
return nextFrame();
}
public function choose(choiceIndex: Int): String {
// If embedded, let the embedded section evaluate the choice
if (embeddedBlocks.length > 0) {
return embeddedBlocks[0].choose(choiceIndex);
} else {
// if not embedded, actually make the choice
// TODO if the choice has a label, increment its view count
// TODO update the weave depth
// TODO collect the available choices, pick the one with the given index
// call evaluateChoice() and return that
return '';
}
}
function evaluateChoice(choice: Choice): String {
// if the choice has a label, increment its view count
switch (choice.label) {
case Some(l):
var node = resolveNodeInScope(l)[0];
viewCounts[node] += 1;
case None:
}
weaveDepth = choice.depth + 1;
// if the choice is onceOnly, add its id to the shit list
if (choice.onceOnly) {
choicesTaken.push(choice.id);
}
switch (choice.divertTarget) {
case Some(t):
divertTo(t);
case None:
}
var output = choice.output.format(hInterface, nodeScopes, true);
return output;
}
/** Parse and run embedded Hank script on the fly. **/
public function runEmbeddedHank(h: String) {
embeddedBlocks.push(embeddedStory(h));