diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon index 93c6f3f4c2..c549caacd5 100644 --- a/sys/vane/ames.hoon +++ b/sys/vane/ames.hoon @@ -1,10 +1,12 @@ :: :: ames (4a), networking :: +!: |= pit=vase => =~ :: structures =, ames -=+ protocol-version=2 +:: this number needs to be below 8 +=+ protocol-version=0 |% += move [p=duct q=(wind note:able gift:able)] :: local move -- @@ -445,6 +447,7 @@ +>.$(hoc.saf (~(put by hoc.saf) her [[~31337.1.1 ~ wil] ~ *clot])) :: ++ lax :: lax:as:go + =| rov=(unit lane) :: maybe lane change |_ [her=ship dur=dore] :: per client ++ cluy :: cluy:lax:as:go ^- [p=life q=gens r=acru] :: client crypto @@ -518,6 +521,25 @@ [~ ryn] lun.wod.dur [~ ryn] + :: + rov + |- ^- (unit lane) + :: XX check will + ?: ?| !=(our (sein:title her)) + ?=(?(%earl %pawn) (clan:title her)) + == + ~ + ?- ryn + [%if *] ?. ?=([~ %if *] lun.wod.dur) + `ryn + ?:(=(r.u.lun.wod.dur r.ryn) ~ `ryn) + :: + [%ix *] ?. ?=([~ %ix *] lun.wod.dur) + `ryn + ?:(=(r.u.lun.wod.dur r.ryn) ~ `ryn) + :: + [%is *] ?~(q.ryn ~ $(ryn u.q.ryn)) + == == :: ++ wist :: wist:lax:as:go @@ -1471,8 +1493,10 @@ == :: ++ zank :: zank:ho:um:am + =? bin ?=(^ rov.diz) + [[%maze her u.rov.diz] bin] %= +>.$ :: resolve - gus (nux:gus diz) + gus (nux:gus diz(rov ~)) wab.weg (~(put by wab.weg) her bah(sop abet:puz)) == -- :: --ho:um:am @@ -1554,7 +1578,6 @@ :: ++ load |= old=fort - ~& %ames-reload ..^$(fox old) :: ++ scry @@ -1604,6 +1627,11 @@ :_ fox :~ [s.bon %give %woot q.p.bon r.bon] == + :: + %maze + :_ fox + %+ turn ~(tap in ten.fox) + |=(hen=duct [hen %give %rove p.bon q.bon]) :: %mead :_(fox [[hen [%give %hear p.bon q.bon]] ~]) %milk @@ -1713,6 +1741,14 @@ :: %sith (~(czar am [now fox]) p.kyz q.kyz r.kyz) + :: + %tend + :: XX exclude comets and moons? and planets? + :: ?> &(?=(^ hen) ?=([@ @ *] i.hen)) + :: =/ who=@p (slav %p i.t.i.hen) + :: ?: ?=((%earl %pawn) (clan:title who)) + :: [~ fox] + [~ fox(ten (~(put in ten.fox) hen))] :: %nuke :- ~ diff --git a/sys/vane/ford.hoon b/sys/vane/ford.hoon index 1a9c759ce6..4aeaad0581 100644 --- a/sys/vane/ford.hoon +++ b/sys/vane/ford.hoon @@ -838,7 +838,7 @@ (stag %fscb ;~(pfix cab horn:read)) :: /_ homo map (stag %fssm ;~(pfix mic gate:read)) :: /; operate on (stag %fscl ;~(pfix col path:read)) :: /: relative to - (stag %fskt ;~(pfix ket cast:read)) :: /^ cast + :: (stag %fskt ;~(pfix ket cast:read)) :: /^ cast (stag %fszp ;~(pfix zap ;~(sfix sym net))):: /!mark/ run to mark (stag %fszy ;~(sfix sym net)) :: /mark/ render file == @@ -897,8 +897,8 @@ :: ++ cast %+ rail - ;~(plug ;~(sfix wide:vez ket) horn) - ;~(pfix gap ;~(plug tall:vez horn)) + ;~(plug ;~(sfix wyde:vez ket) horn) + ;~(pfix gap ;~(plug till:vez horn)) -- -- -- @@ -1597,6 +1597,7 @@ |= {cof/cafe bax/vase hon/horn} ^- (bolt cage) ?- -.hon + $fspt !! $fssg (cope (wrapped-slap cof bax p.hon) (flux |=(a/vase [%noun a]))) :: @@ -1686,7 +1687,7 @@ $fskt %+ cope $(hon q.hon) |= {cof/cafe mar/mark vax/vase} - %+ cope (wrapped-slap cof bax [%kttr %bsmc p.hon]) + %+ cope (wrapped-slap cof bax [%kttr p.hon]) |= {cof/cafe tug/vase} ?. (~(nest ut p.tug) | p.vax) (flaw cof [%leaf "type error: {