Merge commit '935f8922b' into pittyp

ape/dojo.hoon

@@ -209,14 +209,10 @@
         (star ;~(pfix ace dp-value))
         %+  cook
           ~(gas by *(map term (unit dojo-source)))
-        %+  more  
-          ;~(plug com ace)
+        %+  more  com
         ;~  plug 
-          ;~(pfix tis sym)
-          ;~  pose 
-            ;~(pfix ace (stag ~ dp-value)) 
-            (easy ~)
-          ==
+          ;~(pfix ace tis sym)
+          (punt ;~(pfix ace dp-value))
         ==
       ==
     --

arvo/ames.hoon

@@ -413,7 +413,7 @@
             vix=(bex +((cut 0 [25 2] mag)))             ::  width of sender
             tay=(cut 0 [27 5] mag)                      ::  message type
         ==
-    ?>  =(2 vez)
+    ?>  =(3 vez)
     ?>  =(chk (end 0 20 (mug bod)))
     :+  [(end 3 wix bod) (cut 3 [wix vix] bod)]
       (kins tay)
@@ -433,7 +433,7 @@
     =+  tay=(ksin q.kec)
     %+  mix
       %+  can  0
-      :~  [3 2]
+      :~  [3 3]
           [20 (mug bod)]
           [2 yax]
           [2 qax]
@@ -1018,7 +1018,7 @@
     ++  gnaw                                            ::    gnaw:am
       |=  [kay=cape ryn=lane pac=rock]                  ::  process packet
       ^-  [p=(list boon) q=fort]
-      ?.  =(2 (end 0 3 pac))  [~ fox]
+      ?.  =(3 (end 0 3 pac))  [~ fox]
       =+  kec=(bite pac)
       ?:  (goop p.p.kec)  [~ fox]
       ?.  (~(has by urb.ton.fox) q.p.kec)

arvo/gall.hoon

@@ -333,7 +333,9 @@
     ::
         %red                                            ::  diff ack
       ?>  ?=([@ @ @ ~] t.pax)
-      ?>  ?=([%a %woot *] sih)
+      ?.  ?=([%a %woot *] sih)
+        ~&  [%red-went pax]
+        +>.$
       =+  :*  him=(slav %p i.t.pax)
               dap=i.t.t.pax
               num=(slav %ud i.t.t.t.pax)

cat/hood/merge.hoon

@@ -11,12 +11,11 @@
 ::::
   !:
 |=  $:  [now=@da eny=@uvI bek=beak]
-        [arg=[?(sorc [syd=$|(desk beaky) sorc])] opt=(map ,%gem germ)]
+        [arg=[?(sorc [syd=$|(desk beaky) sorc])] gem=?(%auto germ)]
     ==
 =*  our  p.bek
 |^  :-  %kiln-merge
-    ^-  [syd=desk her=ship sud=desk gem=?(germ %auto)]
-    =+  gem=(fall (~(get by opt) %gem) %auto)
+    ^-  [syd=desk her=ship sud=desk gem=?(%auto germ)]
     ?-  arg
       [@ @ ~]    =+(arg [sud ?.(=(our her) her (sein her)) sud gem])
       [^ ~]      =+((pars bek.arg) [dez ?.(=(our who) who (sein who)) dez gem])