Almost back to working.

This commit is contained in:
Curtis Yarvin 2018-08-16 14:39:39 -07:00
parent 45cdcbdbbd
commit 8f45f30afa
3 changed files with 48 additions and 9 deletions

View File

@ -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
:- ~

View File

@ -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: {<p.hon>} {<q.hon>}"]~)

View File

@ -865,7 +865,7 @@
{$fscb p/horn} :: /_ homo map
{$fssm p/hoon q/horn} :: /; operate on
{$fscl p/hops q/horn} :: /: relative to
{$fskt p/hoon q/horn} :: /^ cast
{$fskt p/spec q/horn} :: /^ cast
{$fszp q/mark} :: /!mark/ eval value
{$fszy q/mark} :: /mark/ static/grow
== ::
@ -1535,7 +1535,7 @@
%fskt
:: mold: evaluates to a mold to be applied to :crane
::
mold=hoon
=spec
=crane
==
$: :: %fszp: `/!mark/` evaluate as hoon, then pass through mark
@ -5789,6 +5789,7 @@
::
++ zuse %309 :: hoon+zuse kelvin
++ gift-arvo :: out result <-$
$~ [%init ~zod]
$% gift:able:ames
gift:able:behn
gift:able:clay
@ -5809,6 +5810,7 @@
task:able:ford-api
==
++ note-arvo :: out request $->
$~ [%a %init ~zod]
$% {@tas $meta vase}
$% {$a task:able:ames}
{$b task:able:behn}