Creating and testing macro

examples/duchess_party.html

@@ -100,7 +100,7 @@ var saveAs=saveAs||navigator.msSaveBlob&&navigator.msSaveBlob.bind(navigator)||f
 		<div id="init-lacking">Your browser lacks required capabilities. Please upgrade it or switch to another to continue.</div>
 		<div id="init-loading"><div>Loading&hellip;</div></div>
 	</div>
-	<!-- UUID://BE18C022-A213-466C-8DD1-DCCD5CB1DF48// --><tw-storydata name="At the Duchess&#39;s Party" startnode="2" creator="Tweego" creator-version="2.1.0+9ea2fab" ifid="BE18C022-A213-466C-8DD1-DCCD5CB1DF48" zoom="1" format="SugarCube" format-version="2.30.0" options="" hidden><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style><script role="script" id="twine-user-script" type="text/twine-javascript">/* twine-user-script #1: "storymanager.js" */
+	<!-- UUID://BE18C022-A213-466C-8DD1-DCCD5CB1DF48// --><tw-storydata name="At the Duchess&#39;s Party" startnode="1" creator="Tweego" creator-version="2.1.0+9ea2fab" ifid="BE18C022-A213-466C-8DD1-DCCD5CB1DF48" zoom="1" format="SugarCube" format-version="2.30.0" options="" hidden><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style><script role="script" id="twine-user-script" type="text/twine-javascript">/* twine-user-script #1: "storymanager.js" */
 
 // Set up the general narrative manager
 // -----------------------------------------------------------------------
@@ -166,6 +166,24 @@ StoryManager.getStorylets = function(n=null, tag=null, respect_interrupt=true) {
 	return selectedStorylets;
 }
 
+// Set up macros
+
+Macro.add("getStoryletLinks", {
+	handler: function() {
+		let n, tag;
+		[n=null, tag=null] = this.args;
+		State.temporary.nextStorylets = StoryManager.getStorylets(n, tag);
+		$(this.output).wiki(`
+		<<for _storylet range _nextStorylets>> \
+			<<capture _storylet>> \
+				[[_storylet.description|_storylet.passage][$currentStorylet=_storylet]]<br>
+			<</capture>> \
+		<</for>> \
+		`);
+	}
+})
+
+
 window.SM = StoryManager;
 /* twine-user-script #2: "duchess_party.js" */
 
@@ -298,22 +316,14 @@ StoryManager.storylets["Seeing the duchess"] = {
   }
 };
 /* twine-user-script #3: "Story JavaScript" */
-Config.passages.nobr = true; // Deal with linebreaks.</script><tw-passagedata pid="1" name="StoryManager Widgets" tags="widget" position="100,100" size="100,100">&lt;&lt;widget ShowStoryletLinks&gt;&gt;
+Config.passages.nobr = true; // Deal with linebreaks.</script><tw-passagedata pid="1" name="Start" tags="" position="100,100" size="100,100">The footmen at the door to the duchess&#39;s city residence bows over your forged invitation, seemingly not examining at all. The uniform you wear is authentic, at least, though Frin had found a tailor who would accept some extra florins to not demand to see a letter of appointment before sewing on captain&#39;s bars. And just like that, you&#39;re in. Could it be that easy, you wonder? &lt;br&gt; &lt;br&gt;
-    &lt;&lt;for _storylet range $args[0]&gt;&gt;
-        &lt;&lt;capture _storylet&gt;&gt;
-        [[_storylet.description|_storylet.passage][$currentStorylet=_storylet]]&lt;br&gt;
-        &lt;&lt;/capture&gt;&gt;
-    &lt;&lt;/for&gt;&gt;
-&lt;&lt;/widget&gt;&gt;</tw-passagedata><tw-passagedata pid="2" name="Start" tags="" position="225,100" size="100,100">The footmen at the door to the duchess&#39;s city residence bows over your forged invitation, seemingly not examining at all. The uniform you wear is authentic, at least, though Frin had found a tailor who would accept some extra florins to not demand to see a letter of appointment before sewing on captain&#39;s bars. And just like that, you&#39;re in. Could it be that easy, you wonder? &lt;br&gt; &lt;br&gt;
 
-Of course it isn&#39;t. The hall is filled with aristocrats in evening-wear, making small talk in an ever-shifting constellation. Across the room, the doors to the duchess&#39;s private rooms are firmly closed. No way to sneak in without being seen. You&#39;re going to have to find a way to [[talk your way in | Circulating]].</tw-passagedata><tw-passagedata pid="3" name="Circulating" tags="" position="350,100" size="100,100">You mingle through the crowd, keeping a wary eye around you.&lt;br&gt;
+Of course it isn&#39;t. The hall is filled with aristocrats in evening-wear, making small talk in an ever-shifting constellation. Across the room, the doors to the duchess&#39;s private rooms are firmly closed. No way to sneak in without being seen. You&#39;re going to have to find a way to [[talk your way in | Circulating]].</tw-passagedata><tw-passagedata pid="2" name="Circulating" tags="" position="225,100" size="100,100">You mingle through the crowd, keeping a wary eye around you.&lt;br&gt;
-&lt;&lt;set _possibleStories = window.SM.getStorylets(3, &quot;circulating&quot;)&gt;&gt;
+&lt;&lt;getStoryletLinks 3 &quot;circulating&quot;&gt;&gt;</tw-passagedata><tw-passagedata pid="3" name="Conversation" tags="" position="350,100" size="100,100">&lt;&lt;set $talkingTo = $currentStorylet.character&gt;&gt;
-&lt;&lt;ShowStoryletLinks _possibleStories&gt;&gt;</tw-passagedata><tw-passagedata pid="4" name="Conversation" tags="" position="475,100" size="100,100">&lt;&lt;set $talkingTo = $currentStorylet.character&gt;&gt;
 You talk with $talkingTo.name. &lt;br&gt;
-&lt;&lt;set _possibleStories = window.SM.getStorylets(3, &quot;during conversation&quot;)&gt;&gt;
+&lt;&lt;getStoryletLinks 3 &quot;during conversation&quot;&gt;&gt;
-&lt;&lt;ShowStoryletLinks _possibleStories&gt;&gt;
+[[Keep circulating | Circulating]]</tw-passagedata><tw-passagedata pid="4" name="Being approached" tags="" position="475,100" size="100,100">$currentStorylet.character.name is coming toward you to talk. &lt;br&gt;
-[[Keep circulating | Circulating]]</tw-passagedata><tw-passagedata pid="5" name="Being approached" tags="" position="600,100" size="100,100">$currentStorylet.character.name is coming toward you to talk. &lt;br&gt;
+You can [[talk to them | Conversation]], or risk snubbing them by [[trying to get away | Circulating][$reputation = $reputation - 1]].</tw-passagedata><tw-passagedata pid="5" name="Conversation topic" tags="" position="600,100" size="100,100">&lt;&lt;set $topic = $currentStorylet.topic&gt;&gt;
-You can [[talk to them | Conversation]], or risk snubbing them by [[trying to get away | Circulating][$reputation = $reputation - 1]].</tw-passagedata><tw-passagedata pid="6" name="Conversation topic" tags="" position="725,100" size="100,100">&lt;&lt;set $topic = $currentStorylet.topic&gt;&gt;
 &lt;&lt;if $playerKnowledge[$topic] &lt; $talkingTo[$topic] &gt;&gt;
 $talkingTo.name tells you about &lt;&lt;print $conversationTopics[$topic][$playerKnowledge[$topic]]&gt;&gt;.
 &lt;&lt;set $playerKnowledge[$topic] = $playerKnowledge[$topic] + 1&gt;&gt;
@@ -328,12 +338,12 @@ They listen intently, and seem impressed.
 &lt;&lt;set $reputation = $reputation + 2&gt;&gt;
 &lt;&lt;/if&gt;&gt;&lt;br&gt;&lt;br&gt;
 
-[[Keep circulating | Circulating]]</tw-passagedata><tw-passagedata pid="7" name="Asked to leave" tags="" position="850,100" size="100,100">The footman demands to see your invitation. 
+[[Keep circulating | Circulating]]</tw-passagedata><tw-passagedata pid="6" name="Asked to leave" tags="" position="725,100" size="100,100">The footman demands to see your invitation. 
 Before you know it, you are firmly escorted through a back hallway, past the kitchens, and finally 
 out through the servant&#39;s entrance. A single guard glares at you, as of committing your face 
 to memory to make sure you&#39;ll never be able to come back.&lt;br&gt;&lt;br&gt;
 
-FAILURE</tw-passagedata><tw-passagedata pid="8" name="Invited to see the Duchess" tags="" position="975,100" size="100,100">The footman discreetly bows his head under his high cap. &quot;Her grace wishes to speak with you,&quot; he says. &lt;br&gt;
+FAILURE</tw-passagedata><tw-passagedata pid="7" name="Invited to see the Duchess" tags="" position="850,100" size="100,100">The footman discreetly bows his head under his high cap. &quot;Her grace wishes to speak with you,&quot; he says. &lt;br&gt;
 You follow him as he leads you away from the main hall, and toward the Duchess&#39;s private rooms. &lt;br&gt;&lt;br&gt;
 
 VICTORY</tw-passagedata></tw-storydata>

examples/duchess_party.tw

@@ -16,15 +16,12 @@ Of course it isn't. The hall is filled with aristocrats in evening-wear, making
 
 :: Circulating
 You mingle through the crowd, keeping a wary eye around you.<br>
-<<set _possibleStories = window.SM.getStorylets(3, "circulating")>>
+<<getStoryletLinks 3 "circulating">>
-<<ShowStoryletLinks _possibleStories>>
-
 
 :: Conversation
 <<set $talkingTo = $currentStorylet.character>>
 You talk with $talkingTo.name. <br>
-<<set _possibleStories = window.SM.getStorylets(3, "during conversation")>>
+<<getStoryletLinks 3 "during conversation">>
-<<ShowStoryletLinks _possibleStories>>
 [[Keep circulating | Circulating]]
 
 :: Being approached

examples/simple_space_example.html

@@ -100,7 +100,7 @@ var saveAs=saveAs||navigator.msSaveBlob&&navigator.msSaveBlob.bind(navigator)||f
 		<div id="init-lacking">Your browser lacks required capabilities. Please upgrade it or switch to another to continue.</div>
 		<div id="init-loading"><div>Loading&hellip;</div></div>
 	</div>
-	<!-- UUID://2EE3728E-B079-4539-9A9C-97CD8474B4C5// --><tw-storydata name="Simple Space Example" startnode="2" creator="Tweego" creator-version="2.1.0+9ea2fab" ifid="2EE3728E-B079-4539-9A9C-97CD8474B4C5" zoom="1" format="SugarCube" format-version="2.30.0" options="" hidden><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style><script role="script" id="twine-user-script" type="text/twine-javascript">/* twine-user-script #1: "storymanager.js" */
+	<!-- UUID://2EE3728E-B079-4539-9A9C-97CD8474B4C5// --><tw-storydata name="Simple Space Example" startnode="1" creator="Tweego" creator-version="2.1.0+9ea2fab" ifid="2EE3728E-B079-4539-9A9C-97CD8474B4C5" zoom="1" format="SugarCube" format-version="2.30.0" options="" hidden><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style><script role="script" id="twine-user-script" type="text/twine-javascript">/* twine-user-script #1: "storymanager.js" */
 
 // Set up the general narrative manager
 // -----------------------------------------------------------------------
@@ -166,6 +166,24 @@ StoryManager.getStorylets = function(n=null, tag=null, respect_interrupt=true) {
 	return selectedStorylets;
 }
 
+// Set up macros
+
+Macro.add("getStoryletLinks", {
+	handler: function() {
+		let n, tag;
+		[n=null, tag=null] = this.args;
+		State.temporary.nextStorylets = StoryManager.getStorylets(n, tag);
+		$(this.output).wiki(`
+		<<for _storylet range _nextStorylets>>
+			<<capture _storylet>>
+				[[_storylet.description|_storylet.passage][$currentStorylet=_storylet]]<br>
+			<</capture>>
+		<</for>>
+		`);
+	}
+})
+
+
 window.SM = StoryManager;
 /* twine-user-script #2: "Story JavaScript" */
 Config.passages.nobr = true; // No unspecified linebreaks.
@@ -187,18 +205,11 @@ StoryManager.storylets["Go somewhere"] = {
             yield storylet;
         }
     }
-}</script><tw-passagedata pid="1" name="StoryManager Widgets" tags="widget" position="100,100" size="100,100">&lt;&lt;widget ShowStoryletLinks&gt;&gt;
+}</script><tw-passagedata pid="1" name="Start" tags="" position="100,100" size="100,100">You find yourself in $currentLocation. You should probably [[jump | Jump]].</tw-passagedata><tw-passagedata pid="2" name="Jump" tags="" position="225,100" size="100,100">You prep your ship to jump.
-    &lt;&lt;for _storylet range $args[0]&gt;&gt;
+&lt;&lt;getStoryletLinks&gt;&gt;</tw-passagedata><tw-passagedata pid="3" name="Orbit" tags="" position="350,100" size="100,100">&lt;&lt;set $currentLocation = $currentStorylet.planet&gt;&gt;
-        &lt;&lt;capture _storylet&gt;&gt;
-        [[_storylet.description|_storylet.passage][$currentStorylet=_storylet]]&lt;br&gt;
-        &lt;&lt;/capture&gt;&gt;
-    &lt;&lt;/for&gt;&gt;
-&lt;&lt;/widget&gt;&gt;</tw-passagedata><tw-passagedata pid="2" name="Start" tags="" position="225,100" size="100,100">You find yourself in $currentLocation. You should probably [[jump | Jump]].</tw-passagedata><tw-passagedata pid="3" name="Jump" tags="" position="350,100" size="100,100">You prep your ship to jump.
-&lt;&lt;set _possibleStorylets = window.SM.getStorylets()&gt;&gt;
-&lt;&lt;ShowStoryletLinks _possibleStorylets&gt;&gt;</tw-passagedata><tw-passagedata pid="4" name="Orbit" tags="" position="475,100" size="100,100">&lt;&lt;set $currentLocation = $currentStorylet.planet&gt;&gt;
 You orbit around $currentLocation.
 
-[[Explore the surface]] or [[Jump]] somewhere else.</tw-passagedata><tw-passagedata pid="5" name="Explore the surface" tags="" position="600,100" size="100,100">You take your shuttle down to the surface of $currentLocation.
+[[Explore the surface]] or [[Jump]] somewhere else.</tw-passagedata><tw-passagedata pid="4" name="Explore the surface" tags="" position="475,100" size="100,100">You take your shuttle down to the surface of $currentLocation.
 
 Return to [[Orbit]]</tw-passagedata></tw-storydata>
 	<script id="script-sugarcube" type="text/javascript">

examples/simple_space_example.tw

@@ -34,8 +34,7 @@ You find yourself in $currentLocation. You should probably [[jump | Jump]].
 
 :: Jump
 You prep your ship to jump.
-<<set _possibleStorylets = window.SM.getStorylets()>>
+<<getStoryletLinks>>
-<<ShowStoryletLinks _possibleStorylets>>
 
 :: Orbit
 <<set $currentLocation = $currentStorylet.planet>>

examples/tutorial.html

@@ -100,7 +100,7 @@ var saveAs=saveAs||navigator.msSaveBlob&&navigator.msSaveBlob.bind(navigator)||f
 		<div id="init-lacking">Your browser lacks required capabilities. Please upgrade it or switch to another to continue.</div>
 		<div id="init-loading"><div>Loading&hellip;</div></div>
 	</div>
-	<!-- UUID://BE18C022-A213-466C-8DD1-DCCD5CB1DF48// --><tw-storydata name="At the Duchess&#39;s Party" startnode="2" creator="Tweego" creator-version="2.1.0+9ea2fab" ifid="BE18C022-A213-466C-8DD1-DCCD5CB1DF48" zoom="1" format="SugarCube" format-version="2.30.0" options="" hidden><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style><script role="script" id="twine-user-script" type="text/twine-javascript">/* twine-user-script #1: "storymanager.js" */
+	<!-- UUID://BE18C022-A213-466C-8DD1-DCCD5CB1DF48// --><tw-storydata name="At the Duchess&#39;s Party" startnode="1" creator="Tweego" creator-version="2.1.0+9ea2fab" ifid="BE18C022-A213-466C-8DD1-DCCD5CB1DF48" zoom="1" format="SugarCube" format-version="2.30.0" options="" hidden><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style><script role="script" id="twine-user-script" type="text/twine-javascript">/* twine-user-script #1: "storymanager.js" */
 
 // Set up the general narrative manager
 // -----------------------------------------------------------------------
@@ -166,6 +166,24 @@ StoryManager.getStorylets = function(n=null, tag=null, respect_interrupt=true) {
 	return selectedStorylets;
 }
 
+// Set up macros
+
+Macro.add("getStoryletLinks", {
+	handler: function() {
+		let n, tag;
+		[n=null, tag=null] = this.args;
+		State.temporary.nextStorylets = StoryManager.getStorylets(n, tag);
+		$(this.output).wiki(`
+		<<for _storylet range _nextStorylets>>
+			<<capture _storylet>>
+				[[_storylet.description|_storylet.passage][$currentStorylet=_storylet]]<br>
+			<</capture>>
+		<</for>>
+		`);
+	}
+})
+
+
 window.SM = StoryManager;
 /* twine-user-script #2: "Story JavaScript" */
 Config.passages.nobr = true; // Deal with linebreaks.
@@ -188,6 +206,12 @@ State.variables.characters = [
     }
 ]
 
+// Choose one of an array
+var randomChoice = function(vals) {
+	return vals[Math.floor(Math.random() * vals.length)];
+};
+
+
 StoryManager.storylets["Conversation"] = {
     name: "Conversation",
     tags: ["circulating"],
@@ -238,20 +262,12 @@ StoryManager.storylets["Conversation topic"] = {
                 };
         }
     }
-};</script><tw-passagedata pid="1" name="StoryManager Widgets" tags="widget" position="100,100" size="100,100">&lt;&lt;widget ShowStoryletLinks&gt;&gt;
+};</script><tw-passagedata pid="1" name="Start" tags="" position="100,100" size="100,100">You stand at the edge of the grand ballroom in the Duchess&#39;s palace.&lt;br&gt;
-    &lt;&lt;for _storylet range $args[0]&gt;&gt;
+&lt;&lt;getStoryletLinks 3 &quot;circulating&quot;&gt;&gt;</tw-passagedata><tw-passagedata pid="2" name="Conversation" tags="" position="225,100" size="100,100">&lt;&lt;set $talkingTo = $currentStorylet.character&gt;&gt;
-        &lt;&lt;capture _storylet&gt;&gt;
-        [[_storylet.description|_storylet.passage][$currentStorylet=_storylet]]&lt;br&gt;
-        &lt;&lt;/capture&gt;&gt;
-    &lt;&lt;/for&gt;&gt;
-&lt;&lt;/widget&gt;&gt;</tw-passagedata><tw-passagedata pid="2" name="Start" tags="" position="225,100" size="100,100">You stand at the edge of the grand ballroom in the Duchess&#39;s palace.&lt;br&gt;
-&lt;&lt;set _possibleStories = window.SM.getStorylets(3, &quot;circulating&quot;)&gt;&gt;
-&lt;&lt;ShowStoryletLinks _possibleStories&gt;&gt;</tw-passagedata><tw-passagedata pid="3" name="Conversation" tags="" position="350,100" size="100,100">&lt;&lt;set $talkingTo = $currentStorylet.character&gt;&gt;
 You talk with $talkingTo.name. &lt;br&gt;
-&lt;&lt;set _possibleStories = window.SM.getStorylets(3, &quot;during conversation&quot;)&gt;&gt;
+&lt;&lt;getStoryletLinks 3 &quot;during conversation&quot;&gt;&gt;
-&lt;&lt;ShowStoryletLinks _possibleStories&gt;&gt;
+[[Keep circulating | Start]]</tw-passagedata><tw-passagedata pid="3" name="Being approached" tags="" position="350,100" size="100,100">$currentStorylet.character.name is coming toward you to talk. &lt;br&gt;
-[[Keep circulating | Start]]</tw-passagedata><tw-passagedata pid="4" name="Being approached" tags="" position="475,100" size="100,100">$currentStorylet.character.name is coming toward you to talk. &lt;br&gt;
+You can [[talk to them | Conversation]], or risk snubbing them by [[trying to get away | Start]].</tw-passagedata><tw-passagedata pid="4" name="Conversation topic" tags="" position="475,100" size="100,100">&lt;&lt;set $topic = $currentStorylet.topic&gt;&gt;
-You can [[talk to them | Conversation]], or risk snubbing them by [[trying to get away | Start]].</tw-passagedata><tw-passagedata pid="5" name="Conversation topic" tags="" position="600,100" size="100,100">&lt;&lt;set $topic = $currentStorylet.topic&gt;&gt;
 &lt;&lt;if $playerKnowledge[$topic] &lt; $talkingTo[$topic] &gt;&gt;
 &lt;&lt;set $playerKnowledge[$topic] = $playerKnowledge[$topic] + 1&gt;&gt;
 (They tell you about $topic) (Knowledge of $topic goes up)

examples/tutorial.tw

@@ -27,6 +27,12 @@ State.variables.characters = [
     }
 ]
 
+// Choose one of an array
+var randomChoice = function(vals) {
+	return vals[Math.floor(Math.random() * vals.length)];
+};
+
+
 StoryManager.storylets["Conversation"] = {
     name: "Conversation",
     tags: ["circulating"],
@@ -82,15 +88,12 @@ StoryManager.storylets["Conversation topic"] = {
 
 :: Start
 You stand at the edge of the grand ballroom in the Duchess's palace.<br>
-<<set _possibleStories = window.SM.getStorylets(3, "circulating")>>
+<<getStoryletLinks 3 "circulating">>
-<<ShowStoryletLinks _possibleStories>>
-
 
 :: Conversation
 <<set $talkingTo = $currentStorylet.character>>
 You talk with $talkingTo.name. <br>
-<<set _possibleStories = window.SM.getStorylets(3, "during conversation")>>
+<<getStoryletLinks 3 "during conversation">>
-<<ShowStoryletLinks _possibleStories>>
 [[Keep circulating | Start]]
 
 :: Being approached

storymanager.js

@@ -63,4 +63,22 @@ StoryManager.getStorylets = function(n=null, tag=null, respect_interrupt=true) {
 	return selectedStorylets;
 }
 
+// Set up macros
+
+Macro.add("getStoryletLinks", {
+	handler: function() {
+		let n, tag;
+		[n=null, tag=null] = this.args;
+		State.temporary.nextStorylets = StoryManager.getStorylets(n, tag);
+		$(this.output).wiki(`
+		<<for _storylet range _nextStorylets>> \
+			<<capture _storylet>> \
+				[[_storylet.description|_storylet.passage][$currentStorylet=_storylet]]<br>
+			<</capture>> \
+		<</for>> \
+		`);
+	}
+})
+
+
 window.SM = StoryManager;