diff --git a/arvo/batz.hoon b/arvo/batz.hoon index ce4993327a..9d7fa96b58 100644 --- a/arvo/batz.hoon +++ b/arvo/batz.hoon @@ -1152,6 +1152,7 @@ ++ beat :: process move |= [tea=wire hen=duct fav=card] ^- [p=(list move) q=vane] + :: ~& [%batz-beat -.fav [%tea tea] [%hen hen]] =+ wru=*(unit writ) =+ sky=|=(* `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) ?: ?=([%crud *] fav) @@ -1193,7 +1194,6 @@ == |- ^- [p=(list move) q=vane] =+ dus=(~(get by dez) hen) - :: ~& [%beat -.fav hen (mug dez) =(~ dus)] ?~ dus ?+ -.fav ~& [%beat-none -.fav tea hen] @@ -1222,13 +1222,6 @@ == ?> ?=(^ u.dus) ?+ -.fav - => ?. ?=(%writ -.fav) . - :: ~& [%batz-writ tea] - . - :: ?~ wru - :: =+ ade=(adit hen) - :: =+ hem=?-(ade %lead [%lead p.i.u.dus], %iron %iron, %gold %gold) - :: [[[[~ hem p.i.u.dus] [[%b tea] hen] fav] ~] ..^^$] =+ beg=`brat`[[p.i.u.dus bred] q.i.u.dus] =+ yub=(leap:((be beg) now eny sky) tea hen fav) :- p.yub diff --git a/arvo/clay.hoon b/arvo/clay.hoon index a7b1ff6388..1b4cc96c0f 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -443,7 +443,7 @@ :_ ..^$ :~ :+ wru [/a [%c ~] hen] - `card`[%want [our him] [%r %re %c t.tea] p.fav] + `card`[%want [our him] [%r %re %c t.t.tea] p.fav] == :: %went :: XX should actually propagate @@ -492,6 +492,17 @@ ++ scry :: inspect |= [our=ship ren=@tas his=ship syd=desk lot=coin tyl=path] ^- (unit (unit)) + =+ ^= whu ^- (unit ,@p) :: XX HEINOUS + ?: (~(has by fat.ruf) his) + `his + =+ foo=`(list ,[p=ship q=room])`(~(tap by fat.ruf) ~) + |- ^- (unit ,@p) + ?~ foo ~ + ?: (~(has by rid.q.i.foo) his) `p.i.foo + $(foo t.foo) + ?~ whu ~ + =. our u.whu + :: ~? !=(`our whu) [%clay-scry whu our ren his syd lot tyl] =+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot)) ?~ luk [~ ~] =+ une=(un our now ruf)