diff --git a/base/ape/hood/core.hook b/base/ape/hood/core.hook index a037be6ae..41b21a879 100644 --- a/base/ape/hood/core.hook +++ b/base/ape/hood/core.hook @@ -2,7 +2,7 @@ :::: /hook/core/hood/ape :: :: :: :: :: /? 314 :: zuse version -/+ sole, talk, helm, kiln :: libraries +/+ sole, talk, helm, kiln, drum :: libraries :: :: :: :::: :: :: !: :: :: @@ -44,58 +44,6 @@ :: :: :: :::: :: :: :: :: :: -++ poke-hood-begin :: - |= [from hood-begin] - (ably (poke-begin:(helm-work [hid +<-] (able %helm)) +<+)) -:: -++ poke-hood-init :: - |= [from hood-init] - (ably (poke-init:(helm-work [hid +<-] (able %helm)) +<+)) -:: -++ poke-hood-reload :: - |= [from hood-reload] - (ably (poke-reload:(helm-work [hid +<-] (able %helm)) +<+)) -:: -++ poke-hood-reset :: - |= [from ~] - (ably (poke-reset:(helm-work [hid +<-] (able %helm)) +<+)) -:: -++ poke-hood-verb :: - |= [from ~] - (ably (poke-verb:(helm-work [hid +<-] (able %helm)) +<+)) -:: -++ poke-hood-start :: - |= [from hood-start] - (ably (poke-start:(helm-work [hid +<-] (able %helm)) +<+)) -:: -++ poke-will :: - |= [from (unit will)] - (ably (poke-will:(helm-work [hid +<-] (able %helm)) +<+)) -:: -++ poke-hood-merge :: - |= [from hood-merge] - (ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+)) -:: -++ poke-hood-sync :: - |= [from hood-sync] - (ably (poke-sync:(kiln-work [hid +<-] (able %kiln)) +<+)) -:: -++ poke-hood-unix :: - |= [from hood-unix] - (ably (poke-unix:(kiln-work [hid +<-] (able %kiln)) +<+)) -:: -++ onto-helm :: - |= [then saw=(each ,[term @tas @da] tang)] - (ably (take-onto:(helm-work [hid ost src] (able %helm)) +<+)) -:: -++ mere-kiln :: - |= [then are=(each (set path) (pair term tang))] - (ably (take-mere:(kiln-work [hid ost src] (able %kiln)) way +<+)) -:: -++ made-kiln :: - |= [then @uvH (each gage tang)] - (ably (take-made:(kiln-work [hid ost src] (able %kiln)) way +<+)) -:: ++ coup-kiln-fancy :: |= [then saw=(unit tang)] (ably (take-coup-fancy:(kiln-work [hid ost src] (able %kiln)) way +<+)) @@ -105,7 +53,89 @@ ~? ?=(^ saw) [%kiln-spam-lame u.saw] [~ +>] :: +++ coup-drum :: + |= [then saw=(unit tang)] + =+ gyl=(drum-phat way) + ?: (drum-stop ost gyl) [~ +>.$] + (ably (take-coup:(drum-work [hid ost src] (able %drum)) gyl +<+)) +:: +++ poke-hood-begin :: + |= [from hood-begin] + (ably (poke-begin:(helm-work [hid +<-] (able %helm)) +<+)) +:: +++ poke-hood-init :: + |= [from hood-init] + (ably (poke-init:(helm-work [hid +<-] (able %helm)) +<+)) +:: +++ poke-hood-merge :: + |= [from hood-merge] + (ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+)) +:: +++ poke-hood-reload :: + |= [from hood-reload] + (ably (poke-reload:(helm-work [hid +<-] (able %helm)) +<+)) +:: +++ poke-hood-reset :: + |= [from ~] + (ably (poke-reset:(helm-work [hid +<-] (able %helm)) +<+)) +:: +++ poke-hood-sync :: + |= [from hood-sync] + (ably (poke-sync:(kiln-work [hid +<-] (able %kiln)) +<+)) +:: +++ poke-hood-unix :: + |= [from hood-unix] + (ably (poke-unix:(kiln-work [hid +<-] (able %kiln)) +<+)) +:: +++ poke-hood-verb :: + |= [from ~] + (ably (poke-verb:(helm-work [hid +<-] (able %helm)) +<+)) +:: +++ poke-will :: + |= [from (unit will)] + (ably (poke-will:(helm-work [hid +<-] (able %helm)) +<+)) +:: +++ reap-drum + |= [then saw=(unit tang)] + (ably (reap:(helm-work [hid ost src] (able %drum)) (drum-phat way) +<+)) +:: +++ onto-drum :: + |= [then saw=(each ,[term @tas @da] tang)] + (ably (take-onto:(helm-work [hid ost src] (able %drum)) (drum-phat way) +<+)) +:: +++ mere-kiln :: + |= [then are=(each (set path) (pair term tang))] + (ably (take-mere:(kiln-work [hid ost src] (able %kiln)) way +<+)) +:: +++ made-kiln :: + |= [then @uvH (each gage tang)] + (ably (take-made:(kiln-work [hid ost src] (able %kiln)) way +<+)) +:: ++ went-helm :: |= [then her=ship kay=cape] (ably (take-went:(helm-work [hid ost src] (able %helm)) way +<+)) +:: +++ peer-drum + |= [from pax=path] + (ably (peer:(drum-work [hid +<-] (able %drum)) +<+)) +:: +++ poke-hood-start :: + |= [from drum-start] + (ably (poke-start:(drum-work [hid +<-] (able %drum)) +<+)) +:: +++ poke-dill-belt + |= [from dill-belt] + (ably (poke-dill-belt:(drum-work [hid +<-] (able %drum)) +<+)) +:: +++ diff-sole-effect-drum + |= [then sole-effect] + =+ gyl=(drum-phat way) + ?: (drum-stop ost gyl) [~ +>.$] + (ably (diff-sole-effect:(drum-work [hid +<-] (able %drum)) gyl +<+)) +:: +++ quit-drum + |= then + =+ gyl=(drum-phat way) + ?: (drum-stop ost gyl) [~ +>.$] + (ably (quit:(drum-work [hid +<-] (able %drum)) gyl)) -- diff --git a/base/arvo/dill.hoon b/base/arvo/dill.hoon index 98426399c..849d64e3d 100644 --- a/base/arvo/dill.hoon +++ b/base/arvo/dill.hoon @@ -185,7 +185,7 @@ =. tem ~ =. moz :_(moz [hen %pass / %c %font our %home our %base]) =. moz :_(moz [hen %pass ~ %g %conf [[our ram] %load our %base]]) - =. moz :_(moz [hen %pass ~ %g %deal [our our] ram %peer ~]) + =. moz :_(moz [hen %pass ~ %g %deal [our our] ram %peer /drum]) |- ^+ +> ?~ myt +> $(myt t.myt, +> (send i.myt)) diff --git a/base/arvo/zuse.hoon b/base/arvo/zuse.hoon index f8fadd68c..0a131ba37 100644 --- a/base/arvo/zuse.hoon +++ b/base/arvo/zuse.hoon @@ -2521,6 +2521,7 @@ ++ cush (pair term club) :: internal kiss ++ dude term :: server identity ++ scup (pair ship desk) :: autoupdate +++ well (pair desk term) ++ suss (trel dude ,@tas ,@da) :: config report :::: :: ++ kiss-gall :: incoming request diff --git a/base/lib/kiln/core.hook b/base/lib/kiln/core.hook index 3212f7bf7..46f084efa 100644 --- a/base/lib/kiln/core.hook +++ b/base/lib/kiln/core.hook @@ -60,16 +60,6 @@ $% [%talk-command command:talk] :: [%hood-merge hood-merge] :: == :: - ++ suss ,[term @tas @da] :: config report - ++ milk (trel ship desk silk) :: - ++ silk :: - $& [p=silk q=silk] :: cons - $% [%diff p=silk q=silk] :: diff - [%done p=(set beam) q=gage] :: literal - [%file p=beam] :: from clay - [%mash p=mark q=milk r=milk] :: merge - [%tabl p=(list (pair silk silk))] :: list - == :: ++ tage :: %tabl gage ,[[%tabl p=(list (pair marc marc))] q=vase] :: ++ move (pair bone card) :: user-level move