mirror of
https://github.com/urbit/shrub.git
synced 2024-12-14 01:08:54 +03:00
Merge branch 'master' of https://github.com/urbit/urbit
This commit is contained in:
commit
a7758e55e4
@ -1096,7 +1096,8 @@
|
||||
++ rack :: rack:am
|
||||
|= [soq=sock cha=path cop=coop] :: e2e ack
|
||||
=+ oh=(ho:(um p.soq) q.soq)
|
||||
=. oh (cook:oh cop cha ~)
|
||||
=^ gud oh (cook:oh cop cha ~)
|
||||
?. gud oh
|
||||
(cans:oh cha)
|
||||
::
|
||||
++ wake :: wake:am
|
||||
@ -1170,11 +1171,14 @@
|
||||
::
|
||||
++ cook :: cook:ho:um:am
|
||||
|= [cop=coop cha=path ram=(unit ,[ryn=lane dam=flap])]
|
||||
^+ +> :: acknowledgment
|
||||
^- [gud=? con=_+>] :: acknowledgment
|
||||
:: ~& [%cook cop num cha ram]
|
||||
=+ rum=(need (~(get by raz.bah) cha))
|
||||
=+ lat=(~(get by mis.rum) did.rum)
|
||||
?: &(?=(~ lat) ?=(~ ram)) ~&(%ack-late-or-redundant +>.$)
|
||||
?: &(?=(~ lat) ?=(~ ram))
|
||||
~& %ack-late-or-redundant
|
||||
[%| +>.$]
|
||||
:- %&
|
||||
=+ ^- [ryn=lane dam=flap]
|
||||
?^ ram [ryn.u.ram dam.u.ram]
|
||||
?< ?=(~ lat)
|
||||
@ -1322,7 +1326,7 @@
|
||||
+>
|
||||
?. (gte num did.rum) :: always ack a dup
|
||||
:: ~& [%deer-1 num]
|
||||
(cook (~(get by bum.rum) num) cha ~ ryn dam)
|
||||
con:(cook (~(get by bum.rum) num) cha ~ ryn dam)
|
||||
?: dod.rum
|
||||
:: ~& [%deer-2 num]
|
||||
(coat cha rum(mis (~(put by mis.rum) num [kay ryn dam dut])))
|
||||
|
@ -407,7 +407,7 @@
|
||||
=+ ^= lum
|
||||
^- (unit (unit mizu))
|
||||
%^ ~(construct-merge ze now dom ran)
|
||||
?:(=(0 let.dom) %init %mate)
|
||||
?:(=(0 let.dom) %init %meld)
|
||||
who
|
||||
:+ syd
|
||||
`saba`[her sud [0 let.der] der]
|
||||
|
@ -466,7 +466,7 @@
|
||||
%init !!
|
||||
%logo !!
|
||||
%logo !!
|
||||
%mean [%give %mean p.+.sih]
|
||||
%mean [%pass [%r pax] (rod %e p.+.sih)]
|
||||
%nice [%give %nice ~]
|
||||
%rush [%pass [%r pax] (rod %d p.+.sih q.+.sih)]
|
||||
%rust [%pass [%r pax] (rod %f p.+.sih q.+.sih)]
|
||||
@ -1010,9 +1010,8 @@
|
||||
?: =(~ q.vud) [~ mow]
|
||||
=+ sud=(sump (slot 2 vud))
|
||||
=+ res=$(vud (slot 3 vud))
|
||||
?: ?=(%& -.sud)
|
||||
[-.res [p.sud +.res]]
|
||||
[[p.sud -.res] +.res]
|
||||
:- ?~(-.sud -.res [u.-.sud -.res])
|
||||
?~(+.sud +.res [u.+.sud +.res])
|
||||
::
|
||||
++ show :: subscribe
|
||||
|= [you=ship pax=path] :: subscription
|
||||
@ -1025,24 +1024,26 @@
|
||||
::
|
||||
++ sump
|
||||
|= wec=vase
|
||||
^- (each move toil)
|
||||
^- [(unit toil) (unit move)]
|
||||
=+ hon=(need (~(get by r.zam.sat) ((hard bone) -.q.wec)))
|
||||
=+ caq=(spec (slot 3 wec))
|
||||
?+ q.caq ~&(%sump-bad !!)
|
||||
::
|
||||
[%pass p=* q=@tas r=[p=@tas q=*]]
|
||||
=+ wir=(away %u ((hard path) p.q.caq))
|
||||
?: ?=(%cide p.r.q.caq) [%| (deff wir hon caq)]
|
||||
?: ?=(%sire p.r.q.caq) [%& (birf wir hon caq)]
|
||||
:+ %& hon
|
||||
?: ?=(%cide p.r.q.caq) [`(deff wir hon caq) ~]
|
||||
?: ?=(%sire p.r.q.caq) [~ `(birf wir hon caq)]
|
||||
:^ ~ ~ hon
|
||||
:^ %pass wir
|
||||
(need ((sand %tas) ((hard ,@) q.q.caq)))
|
||||
[%meta (spec (slot 15 caq))]
|
||||
::
|
||||
[%give p=[p=@tas q=*]]
|
||||
:+ %& hon
|
||||
?: ?=(%mean p.p.q.caq)
|
||||
:- `[hon %nuke our]
|
||||
`[hon %give %mean (ares q.p.q.caq)]
|
||||
:^ ~ ~ hon
|
||||
:- %give
|
||||
?: ?=(%mean p.p.q.caq) [%mean (ares q.p.q.caq)]
|
||||
?: ?=(%nice p.p.q.caq) [%nice ~]
|
||||
(sumo (spec (slot 3 caq)))
|
||||
==
|
||||
|
@ -323,10 +323,18 @@
|
||||
(send /out %give %rush %tang (zong-to-tank & p.p.sih) ~)
|
||||
::
|
||||
?(%radi-a %radi-m)
|
||||
?: ?=(?(%nice %mean) +<.sih)
|
||||
?: ?=(%nice +<.sih)
|
||||
:_ +>.$
|
||||
?: ?=(%radi-a i.pax) ~
|
||||
[ost %give +.sih]~
|
||||
?: ?=(%mean +<.sih)
|
||||
:_ +>.$ :_ ~
|
||||
=- ~& [%trying-again -] -
|
||||
:* ost %pass pax %g %show
|
||||
[pad.fal /radio] our.hid
|
||||
?-(i.pax %radi-a %amigos, %radi-m %mensajes)
|
||||
sat.fal
|
||||
==
|
||||
=+ ya=(grab t.pax)
|
||||
=. ya
|
||||
?- i.pax
|
||||
|
13
main/app/radio-wipe/core.hook
Normal file
13
main/app/radio-wipe/core.hook
Normal file
@ -0,0 +1,13 @@
|
||||
!:
|
||||
|_ [hid=hide ~]
|
||||
++ poke-radio-wipe-args
|
||||
|= [ost=bone you=ship ~]
|
||||
:_ +>.$
|
||||
:~ [ost %pass / %g %mess [our.hid /radio] our.hid %bit !>(~)]
|
||||
[ost %give %nice ~]
|
||||
==
|
||||
++ peer
|
||||
|=
|
||||
*
|
||||
`+>
|
||||
--
|
@ -65,6 +65,14 @@
|
||||
:- [ost %give %nice ~]
|
||||
(send mensajes/p.zig %give %rush %zong zog)
|
||||
::
|
||||
++ poke-bit
|
||||
|= [ost=bone you=ship ~]
|
||||
^- [(list move) _+>]
|
||||
:_ +>.$
|
||||
%+ turn (~(tap by sup.hid))
|
||||
|= [ost=bone her=ship pax=path]
|
||||
[ost %give %mean ~ %reload leaf/"please quit chat and re-enter" ~]
|
||||
::
|
||||
++ pull
|
||||
|= ost=bone
|
||||
^- [(list move) _+>]
|
||||
|
Loading…
Reference in New Issue
Block a user