ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-10 18:21:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jfranklin9000/master' into rc

Browse Source
This commit is contained in:
Philip Monk 2019-12-03 15:10:32 -08:00
commit 98b886acf2
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/arvo/gen/trouble.hoon
View File

@ -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
==
--

30
pkg/arvo/sys/vane/jael.hoon
View File

@ -990,6 +990,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) [~ ~]
@ -1004,6 +1020,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) [~ ~]