Merge branch 'test' into do

demo/commands.txt

@@ -79,37 +79,37 @@ Commands
 
   Helper files needed for version 2:
   
-    The %tictactoe-game mark, for game update diffs:
+    The %octo-game mark, for game update diffs:
 
-        /=demo=/mar/tictactoe-game/door/hook
-        urbit/$X/$X/in/$DEMO/mar/tictactoe-game/door.hook
-        $DEMO/files/mar-tictactoe-game.hoon 
+        /=demo=/mar/octo-game/door/hook
+        urbit/$X/$X/in/$DEMO/mar/octo-game/door.hook
+        $DEMO/files/mar-octo-game.hoon 
    
   Helper files needed for version 3:
 
-    The %tictactoe-move mark, for moves from the web:
+    The %octo-move mark, for moves from the web:
 
-        /=demo=/mar/tictactoe-move/door/hook
-        urbit/$X/$X/in/$DEMO/mar/tictactoe-move/door.hook
-        $DEMO/files/mar-tictactoe-move.hoon 
+        /=demo=/mar/octo-move/door/hook
+        urbit/$X/$X/in/$DEMO/mar/octo-move/door.hook
+        $DEMO/files/mar-octo-move.hoon 
  
     The HTML generator:
     
-        /=demo=/pub/tictactoe/fab/hymn/hook
-        urbit/$X/$X/in/$DEMO/pub/tictactoe/fab/hymn.hook
-        $DEMO/files/pub-tictactoe-hymn.hoon
+        /=demo=/pub/octo/fab/hymn/hook
+        urbit/$X/$X/in/$DEMO/pub/octo/fab/hymn.hook
+        $DEMO/files/pub-octo-hymn.hoon
 
     The CSS:
 
-        /=demo=/pub/tictactoe/src/main/css
-        urbit/$X/$X/in/$DEMO/pub/tictactoe/src/main.css
-        $DEMO/files/pub-tictactoe-main.css
+        /=demo=/pub/octo/src/main/css
+        urbit/$X/$X/in/$DEMO/pub/octo/src/main.css
+        $DEMO/files/pub-octo-main.css
 
     The JS:
 
-        /=demo=/pub/tictactoe/src/main/js
-        urbit/$X/$X/in/$DEMO/pub/tictactoe/src/main.js
-        $DEMO/files/pub-tictactoe-main.js
+        /=demo=/pub/octo/src/main/js
+        urbit/$X/$X/in/$DEMO/pub/octo/src/main.js
+        $DEMO/files/pub-octo-main.js
 
 [from tictactoe]
   

demo/files/1-ape-tictactoe.hoon

@@ -89,7 +89,7 @@
             ?-(lev %0 +>, %1 line, %2 line:show:prom)   ::
   ++  plow  |=  [lev=?(%0 %1 %2) mus=(unit tape)]       ::  complete print
             abet:(mean:(play lev) mus)                  ::
-  ++  prom  %^  emit  %pro  %&  :-  %acto               ::  update prompt
+  ++  prom  %^  emit  %pro  %&  :-  %tictactoe          ::  update prompt
             ": {~[(icon who.gam)]} to move (row/col): " ::  
   ++  rend  (turn `wall`~(tab go gam) |=(tape txt/+<))  ::  table print
   ++  show  (emit %mor rend)                            ::  update board

demo/files/2-ape-tictactoe.hoon

@@ -118,7 +118,7 @@
 ++  dish  |=(cad=card (dump 0 cad))                     ::  forward move
 ++  flet  |=(from ~(. et +< (~(got by q.eye) ost)))     ::  in old client
 ++  fret  |=(from ~(. et +< *sole-share))               ::  in new client
-++  like  |=(xir=ship |*(* [/octo [xir %octo] +<]))     ::  to friend
+++  like  |=(a=ship |*(* [/octo [a %tictactoe] +<]))    ::  to friend
 ++  link  |=  mot=mote  %+  dish(but `[| mot])  %peer   ::  subscribe to friend
           ((like p.mot) /octo/net/[?:(q.mot %x %o)])    ::  
 ++  pals  %+  turn  (pale hid (prix /sole))  |=  sink   ::  per console 

demo/files/3-ape-tictactoe.hoon

@@ -118,7 +118,7 @@
 ++  dish  |=(cad=card (dump 0 cad))                     ::  forward move
 ++  flet  |=(from ~(. et +< (~(got by q.eye) ost)))     ::  in old client
 ++  fret  |=(from ~(. et +< *sole-share))               ::  in new client
-++  like  |=(xir=ship |*(* [/octo [xir %octo] +<]))     ::  to friend
+++  like  |=(a=ship |*(* [/octo [a %tictactoe] +<]))    ::  to friend
 ++  link  |=  mot=mote  %+  dish(but `[| mot])  %peer   ::  subscribe to friend
           ((like p.mot) /octo/net/[?:(q.mot %x %o)])    ::  
 ++  pals  %+  turn  (pale hid (prix /sole))  |=  sink   ::  per console 

demo/install2.sh

@@ -8,5 +8,5 @@ DESK=urbit/$X/$X/in/$DEMO
 echo "cp -f $COLD/2-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook"
 cp -f $COLD/1-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook
 
-echo "cp -f $COLD/mar-tictactoe-game.hoon $DESK/mar/tictactoe-game/door.hook"
-cp -f $COLD/mar-tictactoe-game.hoon $DESK/mar/tictactoe-game/door.hook
+echo "cp -f $COLD/mar-octo-game.hoon $DESK/mar/octo-game/door.hook"
+cp -f $COLD/mar-octo-game.hoon $DESK/mar/octo-game/door.hook

demo/install3.sh

@@ -8,14 +8,14 @@ DESK=urbit/$X/$X/in/$DEMO
 echo "cp -f $COLD/3-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook"
 cp -f $COLD/3-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook
 
-echo "cp -f $COLD/mar-tictactoe-game.hoon $DESK/mar/tictactoe-game/door.hook"
-cp -f $COLD/mar-tictactoe-game.hoon $DESK/mar/tictactoe-game/door.hook
+echo "cp -f $COLD/mar-octo-game.hoon $DESK/mar/octo-game/door.hook"
+cp -f $COLD/mar-octo-game.hoon $DESK/mar/octo-game/door.hook
 
-echo "cp -f $COLD/pub-tictactoe-hymn.hoon $DESK/pub/tictactoe/fab/hymn.hook"
-cp -f $COLD/pub-tictactoe-hymn.hoon $DESK/pub/tictactoe/fab/hymn.hook
+echo "cp -f $COLD/pub-octo-hymn.hoon $DESK/pub/octo/fab/hymn.hook"
+cp -f $COLD/pub-octo-hymn.hoon $DESK/pub/octo/fab/hymn.hook
 
-echo "cp -f $COLD/pub-tictactoe-main.css $DESK/pub/tictactoe/src/main.css"
-cp -f $COLD/pub-tictactoe-main.css $DESK/pub/tictactoe/src/main.css
+echo "cp -f $COLD/pub-octo-main.css $DESK/pub/octo/src/main.css"
+cp -f $COLD/pub-octo-main.css $DESK/pub/octo/src/main.css
 
-echo "cp -f $COLD/pub-tictactoe-main.js $DESK/pub/tictactoe/src/main.js"
-cp -f $COLD/pub-tictactoe-main.js $DESK/pub/tictactoe/src/main.js
+echo "cp -f $COLD/pub-octo-main.js $DESK/pub/octo/src/main.js"
+cp -f $COLD/pub-octo-main.js $DESK/pub/octo/src/main.js

demo/script-3.txt

@@ -160,4 +160,3 @@ close:
 
     ~, huge
 
-