Various fixes and improvements.

This commit is contained in:
C. Guy Yarvin 2015-05-14 16:27:45 -07:00
parent ce53f4c5f1
commit 9a60d48e21
6 changed files with 16 additions and 6 deletions

View File

@ -96,6 +96,10 @@
|= [then @uvH (each gage tang)] |= [then @uvH (each gage tang)]
(ably (take-made:(kiln-work [hid ost src] (able %kiln)) way +<+)) (ably (take-made:(kiln-work [hid ost src] (able %kiln)) way +<+))
:: ::
++ note-helm ::
|= [then (pair ,@tD tank)]
(ably (take-note:(helm-work [hid ost src] (able %helm)) way +<+))
::
++ coup-kiln-fancy :: ++ coup-kiln-fancy ::
|= [then saw=(unit tang)] |= [then saw=(unit tang)]
(ably (take-coup-fancy:(kiln-work [hid ost src] (able %kiln)) way +<+)) (ably (take-coup-fancy:(kiln-work [hid ost src] (able %kiln)) way +<+))

View File

@ -1549,7 +1549,7 @@
== ==
== ==
++ ta-best :: most relevant ++ ta-best :: most relevant
|=(two=partner ?:((ta-beat two) one two)) |=(two=partner ?:((ta-beat two) two one))
:: ::
++ ta-full (ta-show ~) :: render full width ++ ta-full (ta-show ~) :: render full width
++ ta-show :: render partner ++ ta-show :: render partner
@ -1609,6 +1609,7 @@
== ==
:: ::
++ te-whom :: render sender ++ te-whom :: render sender
~& [%te-whom man lix te-best te-maud]
(~(ta-show ta man (need te-best)) ~ te-maud) (~(ta-show ta man (need te-best)) ~ te-maud)
-- --
:: ::
@ -1658,6 +1659,7 @@
++ peer :: accept subscription ++ peer :: accept subscription
|= [from pax=path] |= [from pax=path]
^- [(list move) _+>] ^- [(list move) _+>]
:: ~& [%talk-peer src ost pax]
?: ?=([%sole *] pax) ?: ?=([%sole *] pax)
?> =(our.hid src) ?> =(our.hid src)
?< (~(has by shells) ost) ?< (~(has by shells) ost)
@ -1714,9 +1716,9 @@
ra-abet:(~(ra-quit ra ost ~) man cuz) ra-abet:(~(ra-quit ra ost ~) man cuz)
:: ::
++ pull :: ++ pull ::
|= [from *] |= [from pax=path]
^- [(list move) _+>] ^- [(list move) _+>]
:: ~& [%talk-pull `*`ost] :: ~& [%talk-pull src ost pax]
=^ moz +>.$ ra-abet:ra-ever:~(ra-cancel ra ost ~) =^ moz +>.$ ra-abet:ra-ever:~(ra-cancel ra ost ~)
[moz +>.$(shells (~(del by shells) ost))] [moz +>.$(shells (~(del by shells) ost))]
:: ::

View File

@ -1648,7 +1648,6 @@
== ==
:: ::
%cake %cake
~& [%cake p.bon q.bon r.bon]
:_ fox :_ fox
:~ [s.bon %give %woot q.p.bon r.bon] :~ [s.bon %give %woot q.p.bon r.bon]
== ==

View File

@ -1133,6 +1133,7 @@
:: ::
++ del-subs :: XX per path? ++ del-subs :: XX per path?
|= [a=dock %json b=wire c=path] ^+ ..ix |= [a=dock %json b=wire c=path] ^+ ..ix
~& [%eyre-del-subs +< hen]
=. ..ix (hurl-note [a b] [%g %deal [him -.a] +.a %pull ~]) =. ..ix (hurl-note [a b] [%g %deal [him -.a] +.a %pull ~])
(nice-json:pop-duct:(ire-ix ire)) :: XX gall ack (nice-json:pop-duct:(ire-ix ire)) :: XX gall ack
:: ::

View File

@ -575,10 +575,10 @@
++ ap-fill :: add to queue ++ ap-fill :: add to queue
^- [? _.] ^- [? _.]
=+ suy=(fall (~(get by qel.ged) ost) 0) =+ suy=(fall (~(get by qel.ged) ost) 0)
?: =(8 suy) ?: =(20 suy)
~& [%ap-fill-full [our dap] q.q.pry ost] ~& [%ap-fill-full [our dap] q.q.pry ost]
[%| +] [%| +]
:: ~? !=(8 suy) [%ap-fill-add [[our dap] q.q.pry ost] +(suy)] :: ~? !=(20 suy) [%ap-fill-add [[our dap] q.q.pry ost] +(suy)]
[%& +(qel.ged (~(put by qel.ged) ost +(suy)))] [%& +(qel.ged (~(put by qel.ged) ost +(suy)))]
:: ::
++ ap-find :: general arm ++ ap-find :: general arm

View File

@ -149,6 +149,10 @@
%& [%flog ~ %text "<{<p.saw>}>"] %& [%flog ~ %text "<{<p.saw>}>"]
== ==
:: ::
++ take-note :: result of %init
|= [way=wire chr=@tD tan=tank] =< abet
(emit %flog ~ %text chr ' ' ~(ram re tan))
::
++ take-went :: result of %want ++ take-went :: result of %want
|= [way=path her=ship kay=cape] =< abet |= [way=path her=ship kay=cape] =< abet
(emit %flog ~ %text "went: {<[way kay]>}") (emit %flog ~ %text "went: {<[way kay]>}")