aqua: support using real moons

Only "shortmoons" though, due to some ames lane size limitation which
makes encoding longer ships difficult.

Notably the -ph-moon-az test does not pass, the moon cannot talk to a
non-sponsor galaxy.
This commit is contained in:
fang 2022-04-06 14:51:02 +02:00
parent 14f518ef4a
commit fa1a04ea6e
No known key found for this signature in database
GPG Key ID: EB035760C1BBA972
2 changed files with 28 additions and 12 deletions

View File

@ -788,24 +788,37 @@
1 1
lyfe lyfe
== ==
state ::NOTE if you use this separately, add spam-logs call here maybe?
:: =/ =pass pub:ex:(get-keys:aqua-azimuth who lyfe)
:: (inject-udiffs [who [0x0 0] %keys [lyfe 1 pass] |] ~)
[~ state]
:: ::
++ breach ++ breach
|= who=@p |= who=@p
^- _state ^- (quip card:agent:gall _state)
=. state (cycle-keys who) ~& [%aqua-breach who]
=^ * state (cycle-keys who)
=/ prev (~(got by lives.azi.piers) who) =/ prev (~(got by lives.azi.piers) who)
=/ rut +(rut.prev) =/ rut +(rut.prev)
=. lives.azi.piers (~(put by lives.azi.piers) who [lyfe.prev rut]) =. lives.azi.piers (~(put by lives.azi.piers) who [lyfe.prev rut])
=. logs.azi.piers =. logs.azi.piers
%+ weld logs.azi.piers %+ weld logs.azi.piers
[(broke-continuity:lo:aqua-azimuth who rut) ~] [(broke-continuity:lo:aqua-azimuth who rut) ~]
(spam-logs 10) :: =. state (spam-logs 10)
=/ lyfe lyfe:(~(got by lives.azi.piers) who)
=/ =pass pub:ex:(get-keys:aqua-azimuth who lyfe)
::TODO i think we're misinterpreting the boot flag, but it dont matter anyway
:: %- inject-udiffs
:: :~ [who [0x0 0] %keys [lyfe 1 pass] &]
:: [who [0x0 0] %rift rut &]
:: ==
[~ (spam-logs 10)]
:: ::
++ dawn ++ dawn
|= who=ship |= who=ship
^- dawn-event:jael ^- dawn-event:jael
?> ?=(?(%czar %king %duke) (clan:title who)) =/ clan (clan:title who)
?> ?=(?(%czar %king %duke %earl) clan)
=/ spon=(list [ship point:azimuth]) =/ spon=(list [ship point:azimuth])
%- flop %- flop
|- ^- (list [ship point:azimuth]) |- ^- (list [ship point:azimuth])
@ -828,7 +841,9 @@
[a-point]~ [a-point]~
[a-point $(who ship)] [a-point $(who ship)]
=/ =seed:jael =/ =seed:jael
=/ life-rift (~(got by lives.azi.piers) who) =/ life-rift=[lyfe=life rut=rift]
?: =(%earl clan) [1 0]
(~(got by lives.azi.piers) who)
=/ =life lyfe.life-rift =/ =life lyfe.life-rift
[who life sec:ex:(get-keys:aqua-azimuth who life) ~] [who life sec:ex:(get-keys:aqua-azimuth who life) ~]
:* seed :* seed

View File

@ -12,12 +12,13 @@
;< ~ bind:m (init-ship ~bud |) ;< ~ bind:m (init-ship ~bud |)
;< ~ bind:m (init-ship ~marbud |) ;< ~ bind:m (init-ship ~marbud |)
;< ~ bind:m (init-ship ~linnup-torsyx |) ;< ~ bind:m (init-ship ~linnup-torsyx |)
::TODO real moons not supported! ::NOTE only shortmoons supported, see also /ted/aqua/ames +lane-to-ship
;< ~ bind:m (init-ship ~linnup-torsyx-linnup-torsyx |) ;< ~ bind:m (init-moon ~torsyx-linnup-torsyx |)
;< ~ bind:m (send-hi ~bud ~linnup-torsyx-linnup-torsyx) ;< ~ bind:m (send-hi ~bud ~torsyx-linnup-torsyx)
;< ~ bind:m (send-hi ~linnup-torsyx-linnup-torsyx ~marbud) ;< ~ bind:m (send-hi ~torsyx-linnup-torsyx ~marbud)
;< ~ bind:m (init-ship ~dev |) ;< ~ bind:m (init-ship ~dev |)
;< ~ bind:m (send-hi ~linnup-torsyx-linnup-torsyx ~dev) ::TODO these hi's never come through!
;< ~ bind:m (send-hi ~dev ~linnup-torsyx-linnup-torsyx) ;< ~ bind:m (send-hi ~torsyx-linnup-torsyx ~dev)
;< ~ bind:m (send-hi ~dev ~torsyx-linnup-torsyx)
;< ~ bind:m end ;< ~ bind:m end
(pure:m *vase) (pure:m *vase)