diff --git a/pkg/arvo/gen/trouble.hoon b/pkg/arvo/gen/trouble.hoon index 13fea59f40..cec4ed8722 100644 --- a/pkg/arvo/gen/trouble.hoon +++ b/pkg/arvo/gen/trouble.hoon @@ -24,14 +24,18 @@ =/ o=@ta (scot %p our) =/ n=@ta (scot %da now) ?~ b ~[o a n] - ~[o a n (scot %p u.b)] + ~[o a n (scot %p u.b)] :: ++ info |= [=term =ship] + :: unitized life and rift + =/ lyfe .^((unit @ud) %j (pathify ~.lyfe `ship)) + =/ ryft .^((unit @ud) %j (pathify ~.ryft `ship)) :* term ship=ship point=(crip (slag 2 (scow %ui ship))) - life=.^(* %j (pathify ~.life `ship)) - rift=.^(* %j (pathify ~.rift `ship)) + :: report as units + life=lyfe + rift=ryft == -- diff --git a/pkg/arvo/sys/vane/jael.hoon b/pkg/arvo/sys/vane/jael.hoon index 88cb92d771..3f5a4c6d2e 100644 --- a/pkg/arvo/sys/vane/jael.hoon +++ b/pkg/arvo/sys/vane/jael.hoon @@ -996,6 +996,22 @@ =/ pub (~(get by pos.zim.pki.lex) u.who) ?~ pub ~ ``[%atom !>(life.u.pub)] + :: + %lyfe :: unitized %life + ?. ?=([@ ~] tyl) [~ ~] + ?. =([%& our] why) + [~ ~] + =/ who (slaw %p i.tyl) + ?~ who [~ ~] + :: fake ships always have life=1 + :: + ?: fak.own.pki.lex + ``[%noun !>((some 1))] + ?: =(u.who p.why) + ``[%noun !>((some lyf.own.pki.lex))] + =/ pub (~(get by pos.zim.pki.lex) u.who) + ?~ pub ``[%noun !>(~)] + ``[%noun !>((some life.u.pub))] :: %rift ?. ?=([@ ~] tyl) [~ ~] @@ -1010,6 +1026,20 @@ =/ pos (~(get by pos.zim.pki.lex) u.who) ?~ pos ~ ``[%atom !>(rift.u.pos)] + :: + %ryft :: unitized %rift + ?. ?=([@ ~] tyl) [~ ~] + ?. =([%& our] why) + [~ ~] + =/ who (slaw %p i.tyl) + ?~ who [~ ~] + :: fake ships always have rift=1 + :: + ?: fak.own.pki.lex + ``[%noun !>((some 1))] + =/ pos (~(get by pos.zim.pki.lex) u.who) + ?~ pos ``[%noun !>(~)] + ``[%noun !>((some rift.u.pos))] :: %vein ?. ?=([@ ~] tyl) [~ ~]